Terminate Caliper workers on interrupting Caliper manager

packages/caliper-cli/lib/launch/lib/launchManager.js

@@ -59,6 +59,25 @@ class LaunchManager {
                 sutType, Constants.Factories.Connector, require);
 
             const engine = new CaliperEngine(benchmarkConfig, networkConfig, connectorFactory);
+            process.on('SIGINT', async () => {
+                // support a force stop
+                if (!this.terminationAlreadyRequested) {
+                    this.terminationAlreadyRequested = true;
+                    logger.info('Request to terminate received, stopping workers');
+                    try {
+                        await engine.stop();
+                    } catch(error) {
+                        logger.error(`Failed to stop workers: ${error}`);
+                        process.exit(1);
+                    }
+                    logger.info('Workers terminated');
+                    process.exit(0);
+                } else {
+                    logger.info('Termination already requested, terminating immediately');
+                    process.exit(2);
+                }
+            });
+
             const response = await engine.run();
 
             if (response === 0) {

packages/caliper-core/lib/manager/caliper-engine.js

@@ -180,6 +180,15 @@
 
         return this.returnCode;
     }
+
+    /**
+     * Stops the benchmark run
+     */
+    async stop() {
+        if (this.roundOrchestrator) {
+            await this.roundOrchestrator.stop();
+        }
+    }
 }
 
 module.exports = CaliperEngine;

packages/caliper-core/lib/manager/orchestrators/round-orchestrator.js

@@ -225,14 +225,24 @@
             }
         }
 
-        // clean up, with "silent" failure handling
         try {
             this.report.printResultsByRound();
             await this.report.finalize();
         } catch (err) {
             logger.error(`Error while finalizing the report: ${err.stack || err}`);
         }
 
+        await this.stop();
+
+        let benchEndTime = Date.now();
+        logger.info(`Benchmark finished in ${(benchEndTime - benchStartTime)/1000.0} seconds. Total rounds: ${success + failed}. Successful rounds: ${success}. Failed rounds: ${failed}.`);
+    }
+
+    /**
+     * Stops the benchmark.
+     */
+    async stop() {
+        // clean up, with "silent" failure handling
         try {
             await this.monitorOrchestrator.stopAllMonitors();
         } catch (err) {
@@ -244,9 +254,6 @@
         } catch (err) {
             logger.error(`Error while stopping workers: ${err.stack || err}`);
         }
-
-        let benchEndTime = Date.now();
-        logger.info(`Benchmark finished in ${(benchEndTime - benchStartTime)/1000.0} seconds. Total rounds: ${success + failed}. Successful rounds: ${success}. Failed rounds: ${failed}.`);
     }
 }