From 887ecd200dd96b4618514880ca7c135494fd6b55 Mon Sep 17 00:00:00 2001 From: Alex Vanin Date: Tue, 2 Nov 2021 18:29:20 +0300 Subject: [PATCH] Update neofs-node to v0.26.1 Use latest LOCODE base. Use default section of storage config. Signed-off-by: Alex Vanin --- .env | 8 +++--- services/storage/.storage.env | 52 ++++++++++++++--------------------- 2 files changed, 25 insertions(+), 35 deletions(-) diff --git a/.env b/.env index b28833a..6fd710b 100644 --- a/.env +++ b/.env @@ -11,11 +11,11 @@ NEOGO_VERSION=0.97.3 MORPH_CHAIN_URL="https://github.com/nspcc-dev/neofs-contract/releases/download/v0.12.1/devenv_sidechain.gz" # NeoFS InnerRing nodes -IR_VERSION=0.26.0 +IR_VERSION=0.26.1 IR_IMAGE=nspccdev/neofs-ir # NeoFS Storage nodes -NODE_VERSION=0.26.0 +NODE_VERSION=0.26.1 NODE_IMAGE=nspccdev/neofs-storage # HTTP Gate @@ -27,9 +27,9 @@ S3_GW_VERSION=0.17.0 S3_GW_IMAGE=nspccdev/neofs-s3-gw # NeoFS LOCODE database -LOCODE_DB_URL=https://github.com/nspcc-dev/neofs-locode-db/releases/download/v0.1.0/locode_db.gz +LOCODE_DB_URL=https://github.com/nspcc-dev/neofs-locode-db/releases/download/v0.2.1/locode_db.gz #LOCODE_DB_PATH=/path/to/locode_db # NeoFS CLI binary -NEOFS_CLI_URL=https://github.com/nspcc-dev/neofs-node/releases/download/v0.26.0/neofs-cli-amd64.tar.gz +NEOFS_CLI_URL=https://github.com/nspcc-dev/neofs-node/releases/download/v0.26.1/neofs-cli-amd64.tar.gz #NEOFS_CLI_PATH=/path/to/neofs-cli-binary diff --git a/services/storage/.storage.env b/services/storage/.storage.env index eb777c7..4a9ec1a 100644 --- a/services/storage/.storage.env +++ b/services/storage/.storage.env @@ -41,7 +41,7 @@ NEOFS_MORPH_NOTIFICATION_ENDPOINT=ws://morph_chain:30333/ws #NEOFS_APICLIENT_DIAL_TIMEOUT=1m # Common storage node attribute -NEOFS_NODE_ATTRIBUTE_0=User-Agent:NeoFS\/0.24 +NEOFS_NODE_ATTRIBUTE_0=User-Agent:NeoFS\/0.26 # Object section ## Worker pool capacity of API Object.Put client calls @@ -63,46 +63,36 @@ NEOFS_NODE_ATTRIBUTE_0=User-Agent:NeoFS\/0.24 ## Number of shards ## Default: 0 (invalid) NEOFS_STORAGE_SHARD_NUM=2 -## First shard + +## Default config for all shards ### Write cache config -NEOFS_STORAGE_SHARD_0_USE_WRITE_CACHE=false +NEOFS_STORAGE_DEFAULT_USE_WRITE_CACHE=false ### Metabase config -NEOFS_STORAGE_SHARD_0_METABASE_PATH=/storage/meta0 -NEOFS_STORAGE_SHARD_0_METABASE_PERM=0700 +NEOFS_STORAGE_DEFAULT_METABASE_PERM=0700 ### Blobstor config -NEOFS_STORAGE_SHARD_0_BLOBSTOR_PATH=/storage/blobstor0 -NEOFS_STORAGE_SHARD_0_BLOBSTOR_PERM=0700 -NEOFS_STORAGE_SHARD_0_BLOBSTOR_SHALLOW_DEPTH=4 -NEOFS_STORAGE_SHARD_0_BLOBSTOR_COMPRESS=true -NEOFS_STORAGE_SHARD_0_BLOBSTOR_SMALL_SIZE_LIMIT=102400 +NEOFS_STORAGE_DEFAULT_BLOBSTOR_PERM=0700 +NEOFS_STORAGE_DEFAULT_BLOBSTOR_SHALLOW_DEPTH=4 +NEOFS_STORAGE_DEFAULT_BLOBSTOR_COMPRESS=true +NEOFS_STORAGE_DEFAULT_BLOBSTOR_SMALL_SIZE_LIMIT=102400 ### Blobovnicza config -NEOFS_STORAGE_SHARD_0_BLOBSTOR_BLOBOVNICZA_SIZE=4194304 -NEOFS_STORAGE_SHARD_0_BLOBSTOR_BLOBOVNICZA_SHALLOW_DEPTH=2 -NEOFS_STORAGE_SHARD_0_BLOBSTOR_BLOBOVNICZA_SHALLOW_WIDTH=4 -NEOFS_STORAGE_SHARD_0_BLOBSTOR_BLOBOVNICZA_OPENED_CACHE_SIZE=50 +NEOFS_STORAGE_DEFAULT_BLOBSTOR_BLOBOVNICZA_SIZE=4194304 +NEOFS_STORAGE_DEFAULT_BLOBSTOR_BLOBOVNICZA_SHALLOW_DEPTH=2 +NEOFS_STORAGE_DEFAULT_BLOBSTOR_BLOBOVNICZA_SHALLOW_WIDTH=4 +NEOFS_STORAGE_DEFAULT_BLOBSTOR_BLOBOVNICZA_OPENED_CACHE_SIZE=50 ### GC config #### Limit of the single data remover's batching operation in number of objects -NEOFS_STORAGE_SHARD_0_GC_REMOVER_BATCH_SIZE=100 +NEOFS_STORAGE_DEFAULT_GC_REMOVER_BATCH_SIZE=100 #### Sleep interval between data remover tacts -NEOFS_STORAGE_SHARD_0_GC_REMOVER_SLEEP_INTERVAL=1m +NEOFS_STORAGE_DEFAULT_GC_REMOVER_SLEEP_INTERVAL=1m + +## First shard +### Metabase config +NEOFS_STORAGE_SHARD_0_METABASE_PATH=/storage/meta0 +### Blobstor config +NEOFS_STORAGE_SHARD_0_BLOBSTOR_PATH=/storage/blobstor0 ## Second shard -### Write cache config -NEOFS_STORAGE_SHARD_1_USE_WRITE_CACHE=false ### Metabase config NEOFS_STORAGE_SHARD_1_METABASE_PATH=/storage/meta1 -NEOFS_STORAGE_SHARD_1_METABASE_PERM=0700 ### Blobstor config NEOFS_STORAGE_SHARD_1_BLOBSTOR_PATH=/storage/blobstor1 -NEOFS_STORAGE_SHARD_1_BLOBSTOR_PERM=0700 -NEOFS_STORAGE_SHARD_1_BLOBSTOR_COMPRESS=true -NEOFS_STORAGE_SHARD_1_BLOBSTOR_SHALLOW_DEPTH=4 -NEOFS_STORAGE_SHARD_1_BLOBSTOR_SMALL_SIZE_LIMIT=102400 -### Blobovnicza config -NEOFS_STORAGE_SHARD_1_BLOBSTOR_BLOBOVNICZA_SIZE=4194304 -NEOFS_STORAGE_SHARD_1_BLOBSTOR_BLOBOVNICZA_SHALLOW_DEPTH=2 -NEOFS_STORAGE_SHARD_1_BLOBSTOR_BLOBOVNICZA_SHALLOW_WIDTH=4 -NEOFS_STORAGE_SHARD_1_BLOBSTOR_BLOBOVNICZA_OPENED_CACHE_SIZE=50 -### GC config -NEOFS_STORAGE_SHARD_1_GC_REMOVER_BATCH_SIZE=100 -NEOFS_STORAGE_SHARD_1_GC_REMOVER_SLEEP_INTERVAL=1m