From 652934bc09fcaf2a26e58d377abea50760f5d1a8 Mon Sep 17 00:00:00 2001 From: Pavel Karpy Date: Wed, 20 Jul 2022 15:36:43 +0300 Subject: [PATCH] [#194] Update neofs-* to v0.30.0 Signed-off-by: Pavel Karpy --- .env | 10 ++++----- services/ir/.ir.env | 16 +++++++------- services/storage/.storage.env | 40 +++++++++++++++-------------------- 3 files changed, 30 insertions(+), 36 deletions(-) diff --git a/.env b/.env index 8239605..3d832ac 100644 --- a/.env +++ b/.env @@ -5,19 +5,19 @@ CA_CERTS_TRUSTED_STORE=/etc/ssl/certs # NeoGo privnet #CHAIN_PATH="/path/to/devenv.dump.gz" -CHAIN_URL="https://github.com/nspcc-dev/neofs-contract/releases/download/v0.15.2/devenv_mainchain_notary_disabled.gz" +CHAIN_URL="https://github.com/nspcc-dev/neofs-contract/releases/download/v0.15.3/devenv_mainchain_notary_disabled.gz" NEOGO_VERSION=0.99.0 # NeoGo sidechain #MORPH_CHAIN_PATH="/path/to/morph-devenv.dump.gz" -MORPH_CHAIN_URL="https://github.com/nspcc-dev/neofs-contract/releases/download/v0.15.2/devenv_sidechain.gz" +MORPH_CHAIN_URL="https://github.com/nspcc-dev/neofs-contract/releases/download/v0.15.3/devenv_sidechain.gz" # NeoFS InnerRing nodes -IR_VERSION=0.28.3 +IR_VERSION=0.30.0 IR_IMAGE=nspccdev/neofs-ir # NeoFS Storage nodes -NODE_VERSION=0.28.3 +NODE_VERSION=0.30.0 NODE_IMAGE=nspccdev/neofs-storage # NATS Server @@ -41,5 +41,5 @@ LOCODE_DB_URL=https://github.com/nspcc-dev/neofs-locode-db/releases/download/v0. #LOCODE_DB_PATH=/path/to/locode_db # NeoFS CLI binary -NEOFS_CLI_URL=https://github.com/nspcc-dev/neofs-node/releases/download/v0.28.3/neofs-cli-amd64.tar.gz +NEOFS_CLI_URL=https://github.com/nspcc-dev/neofs-node/releases/download/v0.30.0/neofs-cli-amd64.tar.gz #NEOFS_CLI_PATH=/path/to/neofs-cli-binary diff --git a/services/ir/.ir.env b/services/ir/.ir.env index 682588f..f7601c4 100644 --- a/services/ir/.ir.env +++ b/services/ir/.ir.env @@ -1,17 +1,17 @@ NEOFS_IR_LOGGER_LEVEL=debug # Profiler section +NEOFS_IR_PPROF_ENABLED=true ## Server address. Empty value disables profiler -## Default: (disabled) -NEOFS_IR_PROFILER_ADDRESS=:6060 +NEOFS_IR_PPROF_ADDRESS=:6060 ## Timeout to shut down the HTTP server ## Default: 30s #NEOFS_IR_PROFILER_SHUTDOWN_TIMEOUT=1m # Application metrics section +NEOFS_IR_PROMETHEUS_ENABLED=true ## Server address. Empty value disables metrics gathering -## Default: (disabled) -NEOFS_IR_METRICS_ADDRESS=:9090 +NEOFS_IR_PROMETHEUS_ADDRESS=:9090 ## Timeout to shut down the HTTP server ## Default: 30s #NEOFS_IR_METRICS_SHUTDOWN_TIMEOUT=1m @@ -19,8 +19,8 @@ NEOFS_IR_METRICS_ADDRESS=:9090 # Toggling the sidechain-only mode NEOFS_IR_WITHOUT_MAINNET=false -NEOFS_IR_MAINNET_ENDPOINT_CLIENT=ws://main-chain:30333/ws -NEOFS_IR_MORPH_ENDPOINT_CLIENT=ws://morph-chain:30333/ws +NEOFS_IR_MAINNET_ENDPOINT_CLIENT_0_ADDRESS=ws://main-chain:30333/ws +NEOFS_IR_MORPH_ENDPOINT_CLIENT_0_ADDRESS=ws://morph-chain:30333/ws NEOFS_IR_TIMERS_EMIT=50 NEOFS_IR_TIMERS_STOP_ESTIMATION_DIV=4 NEOFS_IR_TIMERS_COLLECT_BASIC_INCOME_DIV=2 @@ -30,8 +30,8 @@ NEOFS_IR_TIMERS_DISTRIBUTE_BASIC_INCOME_DIV=4 NEOFS_IR_EMIT_STORAGE_AMOUNT=1000000000 NEOFS_IR_NETMAP_CLEANER_ENABLED=true -NEOFS_IR_CONTRACTS_NEOFS=d07ec2a43d2f8638934d340bfb60b6c23afce106 -NEOFS_IR_CONTRACTS_PROCESSING=181ea9b9db85f91601634d21a0dcba59aace17f0 +NEOFS_IR_CONTRACTS_NEOFS=d01a381aae45f1ed181db9d554cc5ccc69c69f4e +NEOFS_IR_CONTRACTS_PROCESSING=52eb8d0b794430e7d37d7650961d6dcd0ec40cd1 NEOFS_IR_MORPH_VALIDATORS=02b3622bf4017bdfe317c58aed5f4c753f206b7db896046fa7d774bbc4bf7f8dc2 NEOFS_IR_AUDIT_PDP_MAX_SLEEP_INTERVAL=100ms diff --git a/services/storage/.storage.env b/services/storage/.storage.env index d4880f7..fd6e479 100644 --- a/services/storage/.storage.env +++ b/services/storage/.storage.env @@ -4,28 +4,25 @@ NEOFS_LOGGER_LEVEL=debug # Profiler section +NEOFS_PPROF_ENABLED=true ## Server address. Empty value disables profiler -## Default: (disabled) -NEOFS_PROFILER_ADDRESS=:6060 +NEOFS_PPROF_ADDRESS=:6060 ## Timeout to shut down the HTTP server ## Default: 30s #NEOFS_PROFILER_SHUTDOWN_TIMEOUT=1m # Application metrics section +NEOFS_PROMETHEUS_ENABLED=true ## Server address. Empty value disables metrics gathering -## Default: (disabled) -NEOFS_METRICS_ADDRESS=:9090 +NEOFS_PROMETHEUS_ADDRESS=:9090 ## Timeout to shut down the HTTP server ## Default: 30s #NEOFS_METRICS_SHUTDOWN_TIMEOUT=1m -# GRPC Transport Section -NEOFS_GRPC_NUM=1 - # Morph section ## Endpoints of sidechain RPC nodes (comma-separated) ## Default: empty list (invalid) -NEOFS_MORPH_RPC_ENDPOINT=ws://morph-chain:30333/ws +NEOFS_MORPH_RPC_ENDPOINT_0_ADDRESS=ws://morph-chain:30333/ws ## Dial timeout to connect to notification endpoint ## Default: 5s #NEOFS_MORPH_DIAL_TIMEOUT=1m @@ -64,30 +61,27 @@ NEOFS_NODE_NOTIFICATION_CA=/etc/neofs-node/nats.ca.crt #NEOFS_REPLICATOR_PUT_TIMEOUT=1m # Storage engine configuration -## Number of shards -## Default: 0 (invalid) -NEOFS_STORAGE_SHARD_NUM=2 ## Default config for all shards ### Write cache config -NEOFS_STORAGE_DEFAULT_WRITECACHE_ENABLED=false +NEOFS_STORAGE_SHARD_DEFAULT_WRITECACHE_ENABLED=false ### Metabase config -NEOFS_STORAGE_DEFAULT_METABASE_PERM=0700 +NEOFS_STORAGE_SHARD_DEFAULT_METABASE_PERM=0700 ### Blobstor config -NEOFS_STORAGE_DEFAULT_BLOBSTOR_PERM=0700 -NEOFS_STORAGE_DEFAULT_BLOBSTOR_DEPTH=4 -NEOFS_STORAGE_DEFAULT_BLOBSTOR_COMPRESS=true -NEOFS_STORAGE_DEFAULT_BLOBSTOR_SMALL_OBJECT_SIZE=102400 +NEOFS_STORAGE_SHARD_DEFAULT_BLOBSTOR_PERM=0700 +NEOFS_STORAGE_SHARD_DEFAULT_BLOBSTOR_DEPTH=4 +NEOFS_STORAGE_SHARD_DEFAULT_BLOBSTOR_COMPRESS=true +NEOFS_STORAGE_SHARD_DEFAULT_BLOBSTOR_SMALL_OBJECT_SIZE=102400 ### Blobovnicza config -NEOFS_STORAGE_DEFAULT_BLOBSTOR_BLOBOVNICZA_SIZE=134217728 # 128 * 1024 *1024 -NEOFS_STORAGE_DEFAULT_BLOBSTOR_BLOBOVNICZA_DEPTH=1 -NEOFS_STORAGE_DEFAULT_BLOBSTOR_BLOBOVNICZA_WIDTH=2 -NEOFS_STORAGE_DEFAULT_BLOBSTOR_BLOBOVNICZA_OPENED_CACHE_CAPACITY=50 +NEOFS_STORAGE_SHARD_DEFAULT_BLOBSTOR_BLOBOVNICZA_SIZE=134217728 # 128 * 1024 *1024 +NEOFS_STORAGE_SHARD_DEFAULT_BLOBSTOR_BLOBOVNICZA_DEPTH=1 +NEOFS_STORAGE_SHARD_DEFAULT_BLOBSTOR_BLOBOVNICZA_WIDTH=2 +NEOFS_STORAGE_SHARD_DEFAULT_BLOBSTOR_BLOBOVNICZA_OPENED_CACHE_CAPACITY=50 ### GC config #### Limit of the single data remover's batching operation in number of objects -NEOFS_STORAGE_DEFAULT_GC_REMOVER_BATCH_SIZE=100 +NEOFS_STORAGE_SHARD_DEFAULT_GC_REMOVER_BATCH_SIZE=100 #### Sleep interval between data remover tacts -NEOFS_STORAGE_DEFAULT_GC_REMOVER_SLEEP_INTERVAL=1m +NEOFS_STORAGE_SHARD_DEFAULT_GC_REMOVER_SLEEP_INTERVAL=1m ## First shard ### Metabase config