[bootstrap] fix: add stop_grace_period to server and broker containers (

#400) * [bootstrap] fix: add stop_grace_period to server and broker containers
fboucquez · May 22, 2023 · b1d907f · b1d907f
1 parent 128f9be
commit b1d907f
Show file tree

Hide file tree

Showing 24 changed files with 92 additions and 18 deletions.
diff --git a/presets/mainnet/network.yml b/presets/mainnet/network.yml
@@ -27,7 +27,7 @@ minVotingKeyLifetime: 112
 maxVotingKeyLifetime: 360
 votingKeyDesiredLifetime: 360
 votingKeyDesiredFutureLifetime: 60
-lastKnownNetworkEpoch: 1513
+lastKnownNetworkEpoch: 1573
 stepDuration: 5m
 maxBlockFutureTime: 300ms
 maxAccountRestrictionValues: 100

diff --git a/presets/shared.yml b/presets/shared.yml
@@ -96,6 +96,10 @@ maxWriterThreads: 8
 maxDropBatchSize: 10
 writeTimeout: 10m
 
+# stop grace periods
+nodeStopGracePeriod: 300s
+brokerStopGracePeriod: 20s
+
 #Peer List configuration
 peersP2PListLimit: 10
 peersApiListLimit: 10
@@ -232,3 +236,4 @@ treasuryReissuanceTransactionSignatures_has_items: false
 corruptAggregateTransactionHashes_has_items: false
 treasuryReissuanceTransactionSignatures: []
 corruptAggregateTransactionHashes: []
+
diff --git a/presets/testnet/network.yml b/presets/testnet/network.yml
@@ -22,7 +22,7 @@ importanceGrouping: 180
 votingSetGrouping: 720
 votingKeyDesiredLifetime: 720
 votingKeyDesiredFutureLifetime: 120
-lastKnownNetworkEpoch: 520
+lastKnownNetworkEpoch: 636
 minVotingKeyLifetime: 28
 maxVotingKeyLifetime: 720
 stepDuration: 4m

diff --git a/src/model/ConfigPreset.ts b/src/model/ConfigPreset.ts
@@ -31,6 +31,7 @@ export interface DockerServicePreset {
     excludeDockerService?: boolean;
     compose?: DockerComposeService;
     dockerComposeDebugMode?: boolean;
+    stopGracePeriod?: string;
 }
 
 export interface CurrencyDistribution {
@@ -254,6 +255,8 @@ export interface NodeConfigPreset {
     caCertificateExpirationInDays: number;
     nodeCertificateExpirationInDays: number;
     certificateExpirationWarningInDays: number;
+    nodeStopGracePeriod: string;
+    brokerStopGracePeriod: string;
 }
 
 export interface NodePreset extends DockerServicePreset, Partial<NodeConfigPreset> {

diff --git a/src/model/DockerCompose.ts b/src/model/DockerCompose.ts
@@ -32,6 +32,7 @@ export interface DockerComposeService {
     hostname?: string;
     environment?: Record<string, string>;
     stop_signal?: string;
+    stop_grace_period?: string;
     volumes?: string[];
     ports?: string[];
     depends_on?: string[];

diff --git a/src/service/ComposeService.ts b/src/service/ComposeService.ts
@@ -130,6 +130,9 @@ export class ComposeService {
                 service.hostname = servicePreset.host;
                 service.networks!.default.aliases = [servicePreset.host];
             }
+            if (servicePreset.stopGracePeriod) {
+                service.stop_grace_period = servicePreset.stopGracePeriod;
+            }
             if (servicePreset.ipv4_address) {
                 service.networks!.default.ipv4_address = servicePreset.ipv4_address;
             }
@@ -194,19 +197,29 @@ export class ComposeService {
                         vol(`../${targetNodesFolder}/${n.name}`, nodeWorkingDirectory, false),
                         vol(`./server`, nodeCommandsDirectory, true),
                     ];
-                    const nodeService = await resolveService(n, {
-                        user: serverDebugMode === debugFlag ? undefined : user, // if debug on, run as root
-                        container_name: n.name,
-                        image: presetData.symbolServerImage,
-                        command: serverCommand,
-                        stop_signal: 'SIGINT',
-                        working_dir: nodeWorkingDirectory,
-                        restart: restart,
-                        ports: resolvePorts(portConfigurations),
-                        volumes: volumes,
-                        depends_on: serverDependsOn,
-                        ...this.resolveDebugOptions(presetData.dockerComposeDebugMode, n.dockerComposeDebugMode),
-                    });
+                    const nodeService = await resolveService(
+                        {
+                            ipv4_address: n.ipv4_address,
+                            openPort: n.openPort,
+                            excludeDockerService: n.excludeDockerService,
+                            host: n.host,
+                            compose: n.compose,
+                            stopGracePeriod: n.nodeStopGracePeriod || presetData.nodeStopGracePeriod,
+                        },
+                        {
+                            user: serverDebugMode === debugFlag ? undefined : user, // if debug on, run as root
+                            container_name: n.name,
+                            image: presetData.symbolServerImage,
+                            command: serverCommand,
+                            stop_signal: 'SIGINT',
+                            working_dir: nodeWorkingDirectory,
+                            restart: restart,
+                            ports: resolvePorts(portConfigurations),
+                            volumes: volumes,
+                            depends_on: serverDependsOn,
+                            ...this.resolveDebugOptions(presetData.dockerComposeDebugMode, n.dockerComposeDebugMode),
+                        },
+                    );
 
                     services.push(nodeService);
                     if (n.brokerName) {
@@ -218,6 +231,7 @@ export class ComposeService {
                                     excludeDockerService: n.brokerExcludeDockerService,
                                     host: n.brokerHost,
                                     compose: n.brokerCompose,
+                                    stopGracePeriod: n.brokerStopGracePeriod || presetData.brokerStopGracePeriod,
                                 },
                                 {
                                     user: brokerDebugMode === debugFlag ? undefined : user, // if debug on, run as root

diff --git a/test/composes/expected-docker-compose-bootstrap-custom-compose.yml b/test/composes/expected-docker-compose-bootstrap-custom-compose.yml
@@ -26,6 +26,7 @@ services:
         image: 'symbolplatform/symbol-server:gcc-1.0.3.6'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker peer-node-0 NORMAL false
         stop_signal: SIGINT
+        stop_grace_period: 300s
         working_dir: /symbol-workdir
         restart: 'on-failure:2'
         ports:
@@ -50,6 +51,7 @@ services:
         image: 'symbolplatform/symbol-server:gcc-1.0.3.6'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker peer-node-1 NORMAL false
         stop_signal: SIGINT
+        stop_grace_period: 300s
         working_dir: /symbol-workdir
         restart: 'on-failure:2'
         ports:
@@ -74,6 +76,7 @@ services:
         image: 'symbolplatform/symbol-server:gcc-1.0.3.6'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker api-node-0 NORMAL true
         stop_signal: SIGINT
+        stop_grace_period: 300s
         working_dir: /symbol-workdir
         restart: 'on-failure:2'
         volumes:
@@ -96,6 +99,7 @@ services:
         ports:
             - '8002:7902'
         stop_signal: SIGINT
+        stop_grace_period: 20s
         restart: 'on-failure:2'
         volumes:
             - '../nodes/api-node-0:/symbol-workdir:rw'

diff --git a/test/composes/expected-docker-compose-bootstrap-custom.yml b/test/composes/expected-docker-compose-bootstrap-custom.yml
@@ -19,6 +19,7 @@ services:
         image: 'symbolplatform/symbol-server:gcc-1.0.3.6'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker peer-node-0 DEBUG false
         stop_signal: SIGINT
+        stop_grace_period: 300s
         working_dir: /symbol-workdir
         restart: 'on-failure:2'
         ports:
@@ -41,6 +42,7 @@ services:
         image: 'symbolplatform/symbol-server:gcc-1.0.3.6'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker peer-node-1 DEBUG false
         stop_signal: SIGINT
+        stop_grace_period: 300s
         working_dir: /symbol-workdir
         restart: 'on-failure:2'
         ports:
@@ -63,6 +65,7 @@ services:
         image: 'symbolplatform/symbol-server:gcc-1.0.3.6'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker api-node-0 DEBUG true
         stop_signal: SIGINT
+        stop_grace_period: 300s
         working_dir: /symbol-workdir
         restart: 'on-failure:2'
         volumes:
@@ -89,6 +92,7 @@ services:
         ports:
             - '8002:7902'
         stop_signal: SIGINT
+        stop_grace_period: 20s
         restart: 'on-failure:2'
         volumes:
             - '../nodes/api-node-0:/symbol-workdir:rw'

diff --git a/test/composes/expected-docker-compose-bootstrap-demo.yml b/test/composes/expected-docker-compose-bootstrap-demo.yml
@@ -22,6 +22,7 @@ services:
         image: 'symbolplatform/symbol-server:gcc-1.0.3.6'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker node DEBUG true
         stop_signal: SIGINT
+        stop_grace_period: 300s
         working_dir: /symbol-workdir
         restart: 'on-failure:2'
         ports:
@@ -43,6 +44,7 @@ services:
         working_dir: /symbol-workdir
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data broker server broker DEBUG
         stop_signal: SIGINT
+        stop_grace_period: 20s
         restart: 'on-failure:2'
         volumes:
             - '../nodes/node:/symbol-workdir:rw'

diff --git a/test/composes/expected-docker-compose-bootstrap-dual.yml b/test/composes/expected-docker-compose-bootstrap-dual.yml
@@ -18,6 +18,7 @@ services:
         image: 'symbolplatform/symbol-server:gcc-1.0.3.6'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker node NORMAL true
         stop_signal: SIGINT
+        stop_grace_period: 300s
         working_dir: /symbol-workdir
         restart: 'on-failure:2'
         ports:
@@ -35,6 +36,7 @@ services:
         working_dir: /symbol-workdir
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data broker server broker NORMAL
         stop_signal: SIGINT
+        stop_grace_period: 20s
         restart: 'on-failure:2'
         volumes:
             - '../nodes/node:/symbol-workdir:rw'

diff --git a/test/composes/expected-docker-compose-bootstrap-repeat.yml b/test/composes/expected-docker-compose-bootstrap-repeat.yml
@@ -62,6 +62,7 @@ services:
         image: 'symbolplatform/symbol-server:gcc-1.0.3.6'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker peer-node-0 NORMAL false
         stop_signal: SIGINT
+        stop_grace_period: 300s
         working_dir: /symbol-workdir
         restart: 'on-failure:2'
         ports:
@@ -80,6 +81,7 @@ services:
         image: 'symbolplatform/symbol-server:gcc-1.0.3.6'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker peer-node-1 NORMAL false
         stop_signal: SIGINT
+        stop_grace_period: 300s
         working_dir: /symbol-workdir
         restart: 'on-failure:2'
         ports:
@@ -98,6 +100,7 @@ services:
         image: 'symbolplatform/symbol-server:gcc-1.0.3.6'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker peer-node-2 NORMAL false
         stop_signal: SIGINT
+        stop_grace_period: 300s
         working_dir: /symbol-workdir
         restart: 'on-failure:2'
         ports:
@@ -116,6 +119,7 @@ services:
         image: 'symbolplatform/symbol-server:gcc-1.0.3.6'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker api-node-0 NORMAL true
         stop_signal: SIGINT
+        stop_grace_period: 300s
         working_dir: /symbol-workdir
         restart: 'on-failure:2'
         volumes:
@@ -135,6 +139,7 @@ services:
         image: 'symbolplatform/symbol-server:gcc-1.0.3.6'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker api-node-1 NORMAL true
         stop_signal: SIGINT
+        stop_grace_period: 300s
         working_dir: /symbol-workdir
         restart: 'on-failure:2'
         volumes:
@@ -154,6 +159,7 @@ services:
         image: 'symbolplatform/symbol-server:gcc-1.0.3.6'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker api-node-2 NORMAL true
         stop_signal: SIGINT
+        stop_grace_period: 300s
         working_dir: /symbol-workdir
         restart: 'on-failure:2'
         volumes:
@@ -173,6 +179,7 @@ services:
         image: 'symbolplatform/symbol-server:gcc-1.0.3.6'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker api-node-3 NORMAL true
         stop_signal: SIGINT
+        stop_grace_period: 300s
         working_dir: /symbol-workdir
         restart: 'on-failure:2'
         volumes:
@@ -195,6 +202,7 @@ services:
         ports:
             - '8002:7902'
         stop_signal: SIGINT
+        stop_grace_period: 20s
         restart: 'on-failure:2'
         volumes:
             - '../nodes/api-node-0:/symbol-workdir:rw'
@@ -210,6 +218,7 @@ services:
         ports:
             - '8003:7902'
         stop_signal: SIGINT
+        stop_grace_period: 20s
         restart: 'on-failure:2'
         volumes:
             - '../nodes/api-node-1:/symbol-workdir:rw'
@@ -225,6 +234,7 @@ services:
         ports:
             - '8004:7902'
         stop_signal: SIGINT
+        stop_grace_period: 20s
         restart: 'on-failure:2'
         volumes:
             - '../nodes/api-node-2:/symbol-workdir:rw'
@@ -240,6 +250,7 @@ services:
         ports:
             - '8005:7902'
         stop_signal: SIGINT
+        stop_grace_period: 20s
         restart: 'on-failure:2'
         volumes:
             - '../nodes/api-node-3:/symbol-workdir:rw'

diff --git a/test/composes/expected-docker-compose-bootstrap.yml b/test/composes/expected-docker-compose-bootstrap.yml
@@ -20,6 +20,7 @@ services:
         image: 'symbolplatform/symbol-server:gcc-1.0.3.6'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker peer-node-0 NORMAL false
         stop_signal: SIGINT
+        stop_grace_period: 300s
         working_dir: /symbol-workdir
         restart: 'on-failure:2'
         ports:
@@ -38,6 +39,7 @@ services:
         image: 'symbolplatform/symbol-server:gcc-1.0.3.6'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker peer-node-1 NORMAL false
         stop_signal: SIGINT
+        stop_grace_period: 300s
         working_dir: /symbol-workdir
         restart: 'on-failure:2'
         ports:
@@ -56,6 +58,7 @@ services:
         image: 'symbolplatform/symbol-server:gcc-1.0.3.6'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker api-node-0 NORMAL true
         stop_signal: SIGINT
+        stop_grace_period: 300s
         working_dir: /symbol-workdir
         restart: 'on-failure:2'
         volumes:
@@ -78,6 +81,7 @@ services:
         ports:
             - '8002:7902'
         stop_signal: SIGINT
+        stop_grace_period: 20s
         restart: 'on-failure:2'
         volumes:
             - '../nodes/api-node-0:/symbol-workdir:rw'

diff --git a/test/composes/expected-mainnet-api-compose.yml b/test/composes/expected-mainnet-api-compose.yml
@@ -18,6 +18,7 @@ services:
         image: 'symbolplatform/symbol-server:gcc-1.0.3.6'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker node NORMAL true
         stop_signal: SIGINT
+        stop_grace_period: 300s
         working_dir: /symbol-workdir
         restart: 'on-failure:2'
         ports:
@@ -35,6 +36,7 @@ services:
         working_dir: /symbol-workdir
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data broker server broker NORMAL
         stop_signal: SIGINT
+        stop_grace_period: 20s
         restart: 'on-failure:2'
         volumes:
             - '../nodes/node:/symbol-workdir:rw'

diff --git a/test/composes/expected-mainnet-custom-services.yml b/test/composes/expected-mainnet-custom-services.yml
@@ -8,6 +8,7 @@ services:
         image: 'mongo:5.0.15'
         command: mongod --dbpath=/dbdata --bind_ip=db --wiredTigerCacheSizeGB 2
         stop_signal: SIGINT
+        stop_grace_period: 25s
         working_dir: /docker-entrypoint-initdb.d
         volumes:
             - './mongo:/docker-entrypoint-initdb.d:ro'
@@ -26,6 +27,7 @@ services:
         image: 'symbolplatform/symbol-server:gcc-1.0.3.6'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker node NORMAL true
         stop_signal: SIGINT
+        stop_grace_period: 350s
         working_dir: /symbol-workdir
         restart: 'on-failure:2'
         ports:
@@ -56,6 +58,7 @@ services:
         working_dir: /symbol-workdir
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data broker server broker NORMAL
         stop_signal: SIGINT
+        stop_grace_period: 30s
         restart: 'on-failure:2'
         volumes:
             - '../nodes/node:/symbol-workdir:rw'
@@ -78,6 +81,7 @@ services:
         image: 'symbolplatform/symbol-rest:2.4.3'
         command: npm start --prefix /app /symbol-workdir/rest.json
         stop_signal: SIGINT
+        stop_grace_period: 15s
         working_dir: /symbol-workdir
         ports:
             - '3000:3000'

diff --git a/test/composes/expected-mainnet-dual-compose.yml b/test/composes/expected-mainnet-dual-compose.yml
@@ -18,6 +18,7 @@ services:
         image: 'symbolplatform/symbol-server:gcc-1.0.3.6'
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data server broker node NORMAL true
         stop_signal: SIGINT
+        stop_grace_period: 300s
         working_dir: /symbol-workdir
         restart: 'on-failure:2'
         ports:
@@ -35,6 +36,7 @@ services:
         working_dir: /symbol-workdir
         command: /bin/bash /symbol-commands/start.sh /usr/catapult ./data broker server broker NORMAL
         stop_signal: SIGINT
+        stop_grace_period: 20s
         restart: 'on-failure:2'
         volumes:
             - '../nodes/node:/symbol-workdir:rw'