task/s3: handle repeated SIGINT/SIGTERM consistently (#1658)

Noted while working on #1653

When multiple INT/TERM signals are received, the second signal would previously cause unpredictable behaviour:

- if the second signal were the same as the first, it would cause immediate exit;
- if it was different from the first it would try to shut down ongoing uploads again

This commit changes the behaviour to ignore `INT` & `TERM` signals received while shutdown is already in progress.

Author: alxndrsn

lib/task/s3.js

@@ -66,8 +66,16 @@ const uploadPending = withContainer(({ s3, Blobs }) => async (limit) => {
   const signals = ['SIGINT', 'SIGTERM'];
 
   let uploader;
+  let shutdownInProgress;
 
   const shutdownListener = async signal => {
+    if (shutdownInProgress) {
+      console.error('Shutdown already in progress.');
+      return;
+    }
+    shutdownInProgress = true;
+    console.error('Shutting down...');
+
     try {
       await s3.destroy();
     } catch (err) {
@@ -88,7 +96,7 @@ const uploadPending = withContainer(({ s3, Blobs }) => async (limit) => {
 
     process.kill(process.pid, signal);
   };
-  signals.forEach(s => process.once(s, shutdownListener));
+  signals.forEach(s => process.on(s, shutdownListener));
 
   try {
     console.log(`Uploading ${count ?? 'all'} blobs...`);

test/e2e/s3/test-forms/.gitignore

@@ -1 +1,3 @@
 /*-attachments/big-*.bin
+/5-*.xml
+!/5-template.xml

test/e2e/s3/test-forms/5.xml test/e2e/s3/test-forms/5-template.xmltest/e2e/s3/test-forms/5.xml renamed to test/e2e/s3/test-forms/5-template.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <h:html xmlns="http://www.w3.org/2002/xforms" xmlns:h="http://www.w3.org/1999/xhtml" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:jr="http://openrosa.org/javarosa" xmlns:orx="http://openrosa.org/xforms" xmlns:odk="http://www.opendatakit.org/xforms">
   <h:head>
-    <h:title>Blob Test 5</h:title>
+    <h:title>Blob Test 5-{{testIdx}}</h:title>
     <model odk:xforms-version="1.0.0">
       <itext>
         <translation lang="default" default="true()">
@@ -12,7 +12,7 @@
         </translation>
       </itext>
       <instance>
-        <data id="blob_test_5" version="20240506130956">
+        <data id="blob_test_5_{{testIdx}}" version="20240506130956">
           <meta>
             <instanceID/>
           </meta>

test/e2e/s3/test-forms/6.xml

@@ -9,6 +9,10 @@
             <value>Big Bin 1</value>
             <value form="image">jr://images/big-1.bin</value>
           </text>
+          <text id="image-big-2-bin">
+            <value>Big Bin 2</value>
+            <value form="image">jr://images/big-2.bin</value>
+          </text>
         </translation>
       </itext>
       <instance>

…e/s3/test-forms/8-attachments/tiny-1.bin …e/s3/test-forms/7-attachments/tiny-1.bintest/e2e/s3/test-forms/8-attachments/tiny-1.bin renamed to test/e2e/s3/test-forms/7-attachments/tiny-1.bin test/e2e/s3/test-forms/8-attachments/tiny-1.bin renamed to test/e2e/s3/test-forms/7-attachments/tiny-1.bin

@@ -5,13 +5,13 @@
     <model odk:xforms-version="1.0.0">
       <itext>
         <translation lang="default" default="true()">
-          <text id="image-big-1-bin">
-            <value>Big Bin 1</value>
-            <value form="image">jr://images/big-1.bin</value>
+          <text id="image-tiny-2-dat">
+            <value>Tiny Bin 1</value>
+            <value form="image">jr://images/tiny-1.bin</value>
           </text>
-          <text id="image-big-2-bin">
-            <value>Big Bin 2</value>
-            <value form="image">jr://images/big-2.bin</value>
+          <text id="image-tiny-1-dat">
+            <value>Tiny Bin 2</value>
+            <value form="image">jr://images/tiny-2.bin</value>
           </text>
         </translation>
       </itext>