achuprov/frostfs-dev-env
1
0
Fork 0
forked from TrueCloudLab/frostfs-dev-env
Code Pull requests Activity

[#179] Fix helathchecks in storage nodes (#183)

Browse source 
Signed-off-by: Alex Vanin <alexey@nspcc.ru>
This commit is contained in:
Alex Vanin 2022-06-08 16:32:49 +03:00 committed by GitHub
parent c8d48c9053
commit 6e9236c8c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/storage/cli-cfg.yml Normal file
View file

@ -0,0 +1,2 @@
wallet: /wallet.json
password: ""

20
services/storage/docker-compose.yml
View file

@ -13,10 +13,11 @@ services:
internet: internet:
ipv4_address: ${IPV4_PREFIX}.71 ipv4_address: ${IPV4_PREFIX}.71
volumes: volumes:
- ./wallet01.json:/wallet01.json - ./wallet01.json:/wallet.json
- ./../../vendor/hosts:/etc/hosts - ./../../vendor/hosts:/etc/hosts
- storage_s01:/storage - storage_s01:/storage
- ./../../vendor/neofs-cli:/neofs-cli - ./../../vendor/neofs-cli:/neofs-cli
- ./cli-cfg.yml:/cli-cfg.yml
- ./healthcheck.sh:/healthcheck.sh - ./healthcheck.sh:/healthcheck.sh
- ./s04tls.crt:/etc/ssl/certs/s04tls.crt - ./s04tls.crt:/etc/ssl/certs/s04tls.crt
- ../nats/client-cert.pem:/etc/neofs-node/nats.tls.cert - ../nats/client-cert.pem:/etc/neofs-node/nats.tls.cert
@ -25,7 +26,7 @@ services:
stop_signal: SIGKILL stop_signal: SIGKILL
env_file: [ ".env", ".storage.env", ".int_test.env" ] env_file: [ ".env", ".storage.env", ".int_test.env" ]
environment: environment:
- NEOFS_NODE_WALLET_PATH=./wallet01.json - NEOFS_NODE_WALLET_PATH=./wallet.json
- NEOFS_NODE_WALLET_ADDRESS=NejLbQpojKJWec4NQRMBhzsrmCyhXfGJJe - NEOFS_NODE_WALLET_ADDRESS=NejLbQpojKJWec4NQRMBhzsrmCyhXfGJJe
- NEOFS_NODE_WALLET_PASSWORD= - NEOFS_NODE_WALLET_PASSWORD=
- NEOFS_NODE_ADDRESSES=s01.${LOCAL_DOMAIN}:8080 - NEOFS_NODE_ADDRESSES=s01.${LOCAL_DOMAIN}:8080
@ -51,10 +52,11 @@ services:
internet: internet:
ipv4_address: ${IPV4_PREFIX}.72 ipv4_address: ${IPV4_PREFIX}.72
volumes: volumes:
- ./wallet02.json:/wallet02.json - ./wallet02.json:/wallet.json
- ./../../vendor/hosts:/etc/hosts - ./../../vendor/hosts:/etc/hosts
- storage_s02:/storage - storage_s02:/storage
- ./../../vendor/neofs-cli:/neofs-cli - ./../../vendor/neofs-cli:/neofs-cli
- ./cli-cfg.yml:/cli-cfg.yml
- ./healthcheck.sh:/healthcheck.sh - ./healthcheck.sh:/healthcheck.sh
- ./s04tls.crt:/etc/ssl/certs/s04tls.crt - ./s04tls.crt:/etc/ssl/certs/s04tls.crt
- ../nats/client-cert.pem:/etc/neofs-node/nats.tls.cert - ../nats/client-cert.pem:/etc/neofs-node/nats.tls.cert
@ -63,7 +65,7 @@ services:
stop_signal: SIGKILL stop_signal: SIGKILL
env_file: [ ".env", ".storage.env", ".int_test.env" ] env_file: [ ".env", ".storage.env", ".int_test.env" ]
environment: environment:
- NEOFS_NODE_WALLET_PATH=./wallet02.json - NEOFS_NODE_WALLET_PATH=./wallet.json
- NEOFS_NODE_WALLET_ADDRESS=NVXXy3hNTvwVEZa2dAibALyJB3Q86aiHvL - NEOFS_NODE_WALLET_ADDRESS=NVXXy3hNTvwVEZa2dAibALyJB3Q86aiHvL
- NEOFS_NODE_WALLET_PASSWORD= - NEOFS_NODE_WALLET_PASSWORD=
- NEOFS_NODE_ADDRESSES=s02.${LOCAL_DOMAIN}:8080 - NEOFS_NODE_ADDRESSES=s02.${LOCAL_DOMAIN}:8080
@ -89,10 +91,11 @@ services:
internet: internet:
ipv4_address: ${IPV4_PREFIX}.73 ipv4_address: ${IPV4_PREFIX}.73
volumes: volumes:
- ./wallet03.json:/wallet03.json - ./wallet03.json:/wallet.json
- ./../../vendor/hosts:/etc/hosts - ./../../vendor/hosts:/etc/hosts
- storage_s03:/storage - storage_s03:/storage
- ./../../vendor/neofs-cli:/neofs-cli - ./../../vendor/neofs-cli:/neofs-cli
- ./cli-cfg.yml:/cli-cfg.yml
- ./healthcheck.sh:/healthcheck.sh - ./healthcheck.sh:/healthcheck.sh
- ./s04tls.crt:/etc/ssl/certs/s04tls.crt - ./s04tls.crt:/etc/ssl/certs/s04tls.crt
- ../nats/client-cert.pem:/etc/neofs-node/nats.tls.cert - ../nats/client-cert.pem:/etc/neofs-node/nats.tls.cert
@ -101,7 +104,7 @@ services:
stop_signal: SIGKILL stop_signal: SIGKILL
env_file: [ ".env", ".storage.env", ".int_test.env" ] env_file: [ ".env", ".storage.env", ".int_test.env" ]
environment: environment:
- NEOFS_NODE_WALLET_PATH=./wallet03.json - NEOFS_NODE_WALLET_PATH=./wallet.json
- NEOFS_NODE_WALLET_ADDRESS=NPTmih9X14Y7xLvmD6RVtDHdH1Y9qJwoTe - NEOFS_NODE_WALLET_ADDRESS=NPTmih9X14Y7xLvmD6RVtDHdH1Y9qJwoTe
- NEOFS_NODE_WALLET_PASSWORD= - NEOFS_NODE_WALLET_PASSWORD=
- NEOFS_NODE_ADDRESSES=s03.${LOCAL_DOMAIN}:8080 - NEOFS_NODE_ADDRESSES=s03.${LOCAL_DOMAIN}:8080
@ -127,10 +130,11 @@ services:
internet: internet:
ipv4_address: ${IPV4_PREFIX}.74 ipv4_address: ${IPV4_PREFIX}.74
volumes: volumes:
- ./wallet04.json:/wallet04.json - ./wallet04.json:/wallet.json
- ./../../vendor/hosts:/etc/hosts - ./../../vendor/hosts:/etc/hosts
- storage_s04:/storage - storage_s04:/storage
- ./../../vendor/neofs-cli:/neofs-cli - ./../../vendor/neofs-cli:/neofs-cli
- ./cli-cfg.yml:/cli-cfg.yml
- ./healthcheck.sh:/healthcheck.sh - ./healthcheck.sh:/healthcheck.sh
- ./s04tls.crt:/tls.crt - ./s04tls.crt:/tls.crt
- ./s04tls.key:/tls.key - ./s04tls.key:/tls.key
@ -140,7 +144,7 @@ services:
stop_signal: SIGKILL stop_signal: SIGKILL
env_file: [ ".env", ".storage.env", ".int_test.env" ] env_file: [ ".env", ".storage.env", ".int_test.env" ]
environment: environment:
- NEOFS_NODE_WALLET_PATH=./wallet04.json - NEOFS_NODE_WALLET_PATH=./wallet.json
- NEOFS_NODE_WALLET_ADDRESS=Ne2DAQbWvP1s7TbtFc7BStKMnjKJdBaVRm - NEOFS_NODE_WALLET_ADDRESS=Ne2DAQbWvP1s7TbtFc7BStKMnjKJdBaVRm
- NEOFS_NODE_WALLET_PASSWORD= - NEOFS_NODE_WALLET_PASSWORD=
- NEOFS_NODE_ADDRESSES=s04.${LOCAL_DOMAIN}:8080 grpcs://s04.${LOCAL_DOMAIN}:8082 - NEOFS_NODE_ADDRESSES=s04.${LOCAL_DOMAIN}:8080 grpcs://s04.${LOCAL_DOMAIN}:8082

5
services/storage/healthcheck.sh
View file

@ -1,6 +1,5 @@
#!/bin/sh #!/bin/sh
/neofs-cli control healthcheck \ /neofs-cli control healthcheck -c /cli-cfg.yml \
--endpoint "$NEOFS_CONTROL_GRPC_ENDPOINT" \ --endpoint "$NEOFS_CONTROL_GRPC_ENDPOINT" |
--wallet "$NEOFS_NODE_KEY" |
grep "Health status: READY" grep "Health status: READY"