From a4cb92016fcfa4de0ca7e1e71a88a3ee42230001 Mon Sep 17 00:00:00 2001
From: Stanislav Bogatyrev <stanislav@nspcc.ru>
Date: Thu, 24 Sep 2020 13:48:42 +0300
Subject: [PATCH] Restart IR and Storage on failures

Removing useless container health checks and just making IR and Storage nodes to
restart on failure. NeoFS daemons should do all they can to survive.

Signed-off-by: Stanislav Bogatyrev <stanislav@nspcc.ru>
---
 services/chain/docker-compose.yml       | 12 ------------
 services/ir/docker-compose.yml          |  8 ++++++++
 services/morph_chain/docker-compose.yml | 12 ------------
 services/storage/docker-compose.yml     |  5 ++++-
 4 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/services/chain/docker-compose.yml b/services/chain/docker-compose.yml
index e8430d5..eaf7a65 100644
--- a/services/chain/docker-compose.yml
+++ b/services/chain/docker-compose.yml
@@ -11,11 +11,6 @@ services:
       chain_int:
       internet:
         ipv4_address: ${IPV4_PREFIX}.50
-    healthcheck:
-      interval: 5s
-      retries: 15
-      test: ['CMD', 'sh', '-c', 'echo | nc 127.0.0.1 30333']
-      timeout: 10s
     stop_signal: SIGKILL
     environment:
     - ACC=/chain.gz
@@ -25,13 +20,6 @@ services:
     - ./node-wallet.json:/wallets/node-wallet.json
     - ./../../vendor/hosts:/etc/hosts
 
-  neofs_main_chain-healthy:
-    image: alpine
-    container_name: neofs_main_chain-healthy
-    depends_on:
-      neofs_main_chain:
-        condition: service_healthy
-
 networks:
   chain_int:
   internet:
diff --git a/services/ir/docker-compose.yml b/services/ir/docker-compose.yml
index 6ea2bd6..c0344d0 100644
--- a/services/ir/docker-compose.yml
+++ b/services/ir/docker-compose.yml
@@ -2,11 +2,13 @@
 
 version: "2.4"
 services:
+
   ir01:
     image: ${IR_IMAGE}:${IR_VERSION}
     domainname: ${LOCAL_DOMAIN}
     hostname: ir01
     container_name: ir01
+    restart: on-failure
     networks:
       ir_int:
       internet:
@@ -24,6 +26,7 @@ services:
     domainname: ${LOCAL_DOMAIN}
     hostname: ir02
     container_name: ir02
+    restart: on-failure
     networks:
       ir_int:
       internet:
@@ -41,6 +44,7 @@ services:
     domainname: ${LOCAL_DOMAIN}
     hostname: ir03
     container_name: ir03
+    restart: on-failure
     networks:
       ir_int:
       internet:
@@ -58,6 +62,7 @@ services:
     domainname: ${LOCAL_DOMAIN}
     hostname: ir04
     container_name: ir04
+    restart: on-failure
     networks:
       ir_int:
       internet:
@@ -75,6 +80,7 @@ services:
     domainname: ${LOCAL_DOMAIN}
     hostname: ir05
     container_name: ir05
+    restart: on-failure
     networks:
       ir_int:
       internet:
@@ -92,6 +98,7 @@ services:
     domainname: ${LOCAL_DOMAIN}
     hostname: ir06
     container_name: ir06
+    restart: on-failure
     networks:
       ir_int:
       internet:
@@ -109,6 +116,7 @@ services:
     domainname: ${LOCAL_DOMAIN}
     hostname: ir07
     container_name: ir07
+    restart: on-failure
     networks:
       ir_int:
       internet:
diff --git a/services/morph_chain/docker-compose.yml b/services/morph_chain/docker-compose.yml
index 70f94cb..3a13588 100644
--- a/services/morph_chain/docker-compose.yml
+++ b/services/morph_chain/docker-compose.yml
@@ -11,11 +11,6 @@ services:
       chain_int:
       internet:
         ipv4_address: ${IPV4_PREFIX}.90
-    healthcheck:
-      interval: 5s
-      retries: 15
-      test: ['CMD', 'sh', '-c', 'echo | nc 127.0.0.1 30333']
-      timeout: 10s
     stop_signal: SIGKILL
     environment:
     - ACC=/morph_chain.gz
@@ -25,13 +20,6 @@ services:
     - ./node-wallet.json:/wallets/node-wallet.json
     - ./../../vendor/hosts:/etc/hosts
 
-  neofs_morph_chain-healthy:
-    image: alpine
-    container_name: neofs_morph_chain-healthy
-    depends_on:
-      neofs_morph_chain:
-        condition: service_healthy
-
 networks:
   chain_int:
   internet:
diff --git a/services/storage/docker-compose.yml b/services/storage/docker-compose.yml
index 3130780..bb5b1b1 100644
--- a/services/storage/docker-compose.yml
+++ b/services/storage/docker-compose.yml
@@ -7,6 +7,7 @@ services:
     domainname: ${LOCAL_DOMAIN}
     hostname: s01
     container_name: s01
+    restart: on-failure
     networks:
       storage_int:
       internet:
@@ -26,7 +27,7 @@ services:
     domainname: ${LOCAL_DOMAIN}
     hostname: s02
     container_name: s02
-    container_name: s02
+    restart: on-failure
     networks:
       storage_int:
       internet:
@@ -46,6 +47,7 @@ services:
     domainname: ${LOCAL_DOMAIN}
     hostname: s03
     container_name: s03
+    restart: on-failure
     networks:
       storage_int:
       internet:
@@ -65,6 +67,7 @@ services:
     domainname: ${LOCAL_DOMAIN}
     hostname: s04
     container_name: s04
+    restart: on-failure
     networks:
       storage_int:
       internet: