[#216] Update neofs components

Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
This commit is contained in:
Evgenii Stratonikov 2022-09-15 14:31:56 +03:00 committed by Alex Vanin
parent baea15f554
commit edc6513991
3 changed files with 28 additions and 38 deletions

12
.env
View file

@ -9,11 +9,11 @@ CHAIN_URL="https://github.com/nspcc-dev/neofs-contract/releases/download/v0.15.5
NEOGO_VERSION=0.99.2
# NeoFS InnerRing nodes
IR_VERSION=0.31.0
IR_VERSION=0.32.0
IR_IMAGE=nspccdev/neofs-ir
# NeoFS Storage nodes
NODE_VERSION=0.31.0
NODE_VERSION=0.32.0
NODE_IMAGE=nspccdev/neofs-storage
# NATS Server
@ -21,11 +21,11 @@ NATS_VERSION=2.7.2
NATS_IMAGE=nats
# HTTP Gate
HTTP_GW_VERSION=0.23.0
HTTP_GW_VERSION=0.24.0
HTTP_GW_IMAGE=nspccdev/neofs-http-gw
# S3 Gate
S3_GW_VERSION=0.23.0
S3_GW_VERSION=0.24.0
S3_GW_IMAGE=nspccdev/neofs-s3-gw
# Coredns
@ -37,11 +37,11 @@ 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.31.0/neofs-cli-amd64.tar.gz
NEOFS_CLI_URL=https://github.com/nspcc-dev/neofs-node/releases/download/v0.32.0/neofs-cli-amd64.tar.gz
#NEOFS_CLI_PATH=/path/to/neofs-cli-binary
# NeoFS ADM tool binary
NEOFS_ADM_VERSION=v0.31.0
NEOFS_ADM_VERSION=v0.32.0
NEOFS_ADM_URL=https://github.com/nspcc-dev/neofs-node/releases/download/${NEOFS_ADM_VERSION}/neofs-adm-amd64.tar.gz
#NEOFS_ADM_PATH=/path/to/neofs-adm-binary

View file

@ -22,12 +22,12 @@ services:
stop_signal: SIGKILL
env_file: [ ".env", ".s3.env", ".int_test.env" ]
environment:
- S3_GW_WALLET=/wallet.json
- S3_GW_WALLET_PATH=/wallet.json
- S3_GW_WALLET_PASSPHRASE=s3
- S3_GW_TLS_KEY_FILE=/tls.key
- S3_GW_TLS_CERT_FILE=/tls.crt
- S3_GW_LISTEN_ADDRESS=s3.${LOCAL_DOMAIN}:8080
- S3_GW_LISTEN_DOMAINS_0=s3.${LOCAL_DOMAIN}
- S3_GW_LISTEN_DOMAINS=s3.${LOCAL_DOMAIN}
- S3_GW_TREE_SERVICE=s01.${LOCAL_DOMAIN}:8080
- S3_GW_PEERS_0_ADDRESS=s01.${LOCAL_DOMAIN}:8080
- S3_GW_PEERS_0_WEIGHT=0.2

View file

@ -64,36 +64,26 @@ NEOFS_TREE_ENABLED=True
#NEOFS_REPLICATOR_PUT_TIMEOUT=1m
# Storage engine configuration
## Default config for all shards
### Write cache config
NEOFS_STORAGE_SHARD_DEFAULT_WRITECACHE_ENABLED=false
### Metabase config
NEOFS_STORAGE_SHARD_DEFAULT_METABASE_PERM=0700
### Blobstor config
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_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_SHARD_DEFAULT_GC_REMOVER_BATCH_SIZE=100
#### Sleep interval between data remover tacts
NEOFS_STORAGE_SHARD_DEFAULT_GC_REMOVER_SLEEP_INTERVAL=1m
## First shard
### Metabase config
NEOFS_STORAGE_SHARD_0_WRITECACHE_ENABLED=false
NEOFS_STORAGE_SHARD_0_WRITECACHE_PATH=/storage/wc0
NEOFS_STORAGE_SHARD_0_METABASE_PATH=/storage/meta0
### Blobstor config
NEOFS_STORAGE_SHARD_0_BLOBSTOR_PATH=/storage/blobstor0
NEOFS_STORAGE_SHARD_0_BLOBSTOR_0_TYPE=blobovnicza
NEOFS_STORAGE_SHARD_0_BLOBSTOR_0_PATH=/storage/blobovnicza0
NEOFS_STORAGE_SHARD_0_BLOBSTOR_0_DEPTH=2
NEOFS_STORAGE_SHARD_0_BLOBSTOR_0_WIDTH=4
NEOFS_STORAGE_SHARD_0_BLOBSTOR_1_TYPE=fstree
NEOFS_STORAGE_SHARD_0_BLOBSTOR_1_PATH=/storage/fstree0
NEOFS_STORAGE_SHARD_0_BLOBSTOR_1_DEPTH=2
NEOFS_STORAGE_SHARD_0_PILORAMA_PATH=/storage/pilorama0
## Second shard
### Metabase config
NEOFS_STORAGE_SHARD_1_WRITECACHE_ENABLED=false
NEOFS_STORAGE_SHARD_1_WRITECACHE_PATH=/storage/wc1
NEOFS_STORAGE_SHARD_1_METABASE_PATH=/storage/meta1
### Blobstor config
NEOFS_STORAGE_SHARD_1_BLOBSTOR_PATH=/storage/blobstor1
NEOFS_STORAGE_SHARD_1_BLOBSTOR_0_TYPE=blobovnicza
NEOFS_STORAGE_SHARD_1_BLOBSTOR_0_PATH=/storage/blobovnicza1
NEOFS_STORAGE_SHARD_1_BLOBSTOR_0_DEPTH=2
NEOFS_STORAGE_SHARD_1_BLOBSTOR_0_WIDTH=4
NEOFS_STORAGE_SHARD_1_BLOBSTOR_1_TYPE=fstree
NEOFS_STORAGE_SHARD_1_BLOBSTOR_1_PATH=/storage/fstree1
NEOFS_STORAGE_SHARD_1_BLOBSTOR_1_DEPTH=2
NEOFS_STORAGE_SHARD_1_PILORAMA_PATH=/storage/pilorama1