From aa0b284573f7f6f4c50f99ccd0238b848141939b Mon Sep 17 00:00:00 2001 From: Leonard Lyubich Date: Wed, 9 Nov 2022 14:46:37 +0400 Subject: [PATCH 1/3] [#xxx] Upgrade aio version to v0.34.0 Signed-off-by: Leonard Lyubich --- .env | 2 +- sn/config.yaml | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.env b/.env index 172a0fa..dcb06d6 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ NEOGO_VERSION=0.99.3 -AIO_VERSION=0.32.0 +AIO_VERSION=0.34.0 HTTPGW_VERSION=0.24.0 RESTGW_VERSION=0.5.0 diff --git a/sn/config.yaml b/sn/config.yaml index 1aa4530..bb8cebc 100644 --- a/sn/config.yaml +++ b/sn/config.yaml @@ -24,6 +24,9 @@ grpc: tls: enables: false +tree: + enabled: true + logger: level: debug @@ -46,11 +49,15 @@ storage: perm: 0770 blobstor: - type: blobovnicza - path: /data/blob + path: /data/blob/blobovniczas perm: 0660 opened_cache_capacity: 32 depth: 1 width: 1 + - type: fstree + path: /data/blob + pilorama: + path: /data/blob/pilorama.db gc: remover_batch_size: 100 remover_sleep_interval: 5m From 356ec3b2c3641cdaec8f619e90e12927eeb1a45a Mon Sep 17 00:00:00 2001 From: Leonard Lyubich Date: Wed, 9 Nov 2022 14:47:24 +0400 Subject: [PATCH 2/3] [#xxx] Add NeoFS S3 gateway image Signed-off-by: Leonard Lyubich --- .env | 1 + docker-compose.cross.yml | 20 ++++++++++++++++++++ docker-compose.yml | 14 ++++++++++++++ s3/s3.env | 24 ++++++++++++++++++++++++ s3/wallet.json | 32 ++++++++++++++++++++++++++++++++ 5 files changed, 91 insertions(+) create mode 100644 s3/s3.env create mode 100644 s3/wallet.json diff --git a/.env b/.env index dcb06d6..e650b8a 100644 --- a/.env +++ b/.env @@ -2,3 +2,4 @@ NEOGO_VERSION=0.99.3 AIO_VERSION=0.34.0 HTTPGW_VERSION=0.24.0 RESTGW_VERSION=0.5.0 +S3GW_VERSION=0.25.0 diff --git a/docker-compose.cross.yml b/docker-compose.cross.yml index f6e1f1e..2defaab 100644 --- a/docker-compose.cross.yml +++ b/docker-compose.cross.yml @@ -134,6 +134,26 @@ services: depends_on: - http_gw + s3_gw: + image: nspccdev/neofs-s3-gw:${S3GW_VERSION} + domainname: neofs + hostname: s3_gw + container_name: s3_gw + restart: on-failure + stop_signal: SIGKILL + env_file: [ "./s3/s3.env" ] + environment: + - S3_GW_LISTEN_ADDRESS=:9000 + - S3_GW_PEERS_0_ADDRESS=sn:8080 + - S3_GW_RPC_ENDPOINT=http://morph:30333 + - S3_GW_TREE_SERVICE=sn:8080 + volumes: + - ./s3/wallet.json:/config/wallet.json + ports: + - "9000:9000" # S3 Gateway endpoint + depends_on: + - sn + volumes: data: cache: diff --git a/docker-compose.yml b/docker-compose.yml index c7482fe..3d2b492 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -115,6 +115,20 @@ services: depends_on: - http_gw + s3_gw: + image: nspccdev/neofs-s3-gw:${S3GW_VERSION} + domainname: neofs + hostname: s3_gw + container_name: s3_gw + restart: on-failure + network_mode: host + volumes: + - ./s3/wallet.json:/config/wallet.json + stop_signal: SIGKILL + env_file: [ "./s3/s3.env" ] + depends_on: + - sn + volumes: data: cache: diff --git a/s3/s3.env b/s3/s3.env new file mode 100644 index 0000000..4769310 --- /dev/null +++ b/s3/s3.env @@ -0,0 +1,24 @@ +S3_GW_LISTEN_ADDRESS=localhost:9000 +S3_GW_RPC_ENDPOINT=http://localhost:30333 + +S3_GW_LOGGER_LEVEL=debug + +S3_GW_REBALANCE_INTERVAL=5m +S3_GW_CONNECT_TIMEOUT=1m +S3_GW_HEALTHCHECK_TIMEOUT=5m + +S3_GW_RESOLVE_ORDER=nns dns + +S3_GW_DEFAULT_POLICY=REP 1 + +S3_GW_PPROF_ENABLED=false +S3_GW_PROMETHEUS_ENABLED=false + +S3_GW_WALLET_PATH=/config/wallet.json +S3_GW_WALLET_ADDRESS=NUUb82KR2JrVByHs2YSKgtK29gKnF5q6Vt +S3_GW_WALLET_PASSPHRASE=s3 + +S3_GW_TREE_SERVICE=localhost:8080 + +S3_GW_PEERS_0_ADDRESS=localhost:8080 +S3_GW_PEERS_0_PRIORITY=1 diff --git a/s3/wallet.json b/s3/wallet.json new file mode 100644 index 0000000..ed84c47 --- /dev/null +++ b/s3/wallet.json @@ -0,0 +1,32 @@ +{ + "version": "3.0", + "name": null, + "accounts": [ + { + "address": "NUUb82KR2JrVByHs2YSKgtK29gKnF5q6Vt", + "key": "6PYSPET41jKtqie2cfkqgy7q9ueeucH8bX9Gotm2HwdNEDptj6aBe8dDg8", + "label": "NeoFS S3 Gate", + "contract": { + "script": "DCEDE7GsOoB24VWn55eyTwtlDMytWUHqWdfP1RoCSosqBr9BVuezJw==", + "parameters": [ + { + "name": "parameter0", + "type": "Signature" + } + ], + "deployed": false + }, + "lock": false, + "extra": null, + "isDefault": false + } + ], + "scrypt": { + "n": 16384, + "r": 8, + "p": 8 + }, + "extra": { + "Tokens": null + } +} From d0c4cae5db91cc22dc3084409ecc40154f051037 Mon Sep 17 00:00:00 2001 From: Leonard Lyubich Date: Thu, 8 Dec 2022 14:16:18 +0300 Subject: [PATCH 3/3] [#45] Store sidechain db in the volume Use `sidechain` volume to store sidechain data and make it accessible after restarts. Signed-off-by: Leonard Lyubich --- docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 3d2b492..fee9b92 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,6 +16,7 @@ services: - ./vendor/morph_chain.gz:/config/morph_chain.gz - ./morph/protocol.privnet.yml:/config/protocol.privnet.yml - ./morph/node-wallet.json:/config/node-wallet.json + - sidechain:/chain healthcheck: test: [ "CMD-SHELL", "neo-go query committee -r http://127.0.0.1:30333 | grep 02b3622bf4017bdfe317c58aed5f4c753f206b7db896046fa7d774bbc4bf7f8dc2" ] interval: 2s @@ -132,3 +133,4 @@ services: volumes: data: cache: + sidechain: