Merge pull request #18391 from ghalliday/ftjoin

HPCC-31420 Ensure threads are joined inside the dfu copy code

Reviewed-By: Shamser Ahmed <shamser.ahmed@lexisnexis.com>
Merged-by: Gavin Halliday <ghalliday@hpccsystems.com>

dali/ft/daftformat.cpp

@@ -1974,6 +1974,10 @@ void CRemotePartitioner::callRemote()
 
 void CRemotePartitioner::getResults(PartitionPointArray & partition)
 {
+#ifdef RUN_SLAVES_ON_THREADS
+    join();
+#endif
+
     if (error)
         throw error.getLink();
 

dali/ft/filecopy.cpp

@@ -2033,6 +2033,8 @@ void FileSprayer::gatherFileSizes(FilePartInfoArray & fileSizeQueue, bool errorI
             if (alldone)
                 break;
         }
+        for (idx = 0; idx < numThreads; idx++)
+            threads.item(idx).join();
         for (idx = 0; idx < numThreads; idx++)
             threads.item(idx).queryThrowError();
     }
@@ -2566,6 +2568,12 @@ void FileSprayer::performTransfer()
         numSlavesCompleted++;
     }
 
+#ifdef RUN_SLAVES_ON_THREADS
+    //Ensure that the transfer slave threads have terminated before continuing
+    ForEachItemIn(idx4, transferSlaves)
+        transferSlaves.item(idx4).join();
+#endif
+
     if (error)
         throw LINK(error);