Explorar o código

Merge pull request #11572 from jakesmith/hpcc-20330

HPCC-20330 Stop aggregate stream to avoid potential deadlock

Reviewed-By: Mark Kelly <mark.kelly@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman %!s(int64=7) %!d(string=hai) anos
pai
achega
701c4aecc2
Modificáronse 1 ficheiros con 5 adicións e 1 borrados
  1. 5 1
      thorlcr/activities/hashdistrib/thhashdistribslave.cpp

+ 5 - 1
thorlcr/activities/hashdistrib/thhashdistribslave.cpp

@@ -4134,7 +4134,11 @@ public:
         ActPrintLog("HASHAGGREGATE: stopping");
         if (localAggTable)
             localAggTable->reset();
-        aggregateStream.clear();
+        if (aggregateStream)
+        {
+            aggregateStream->stop();
+            aggregateStream.clear();
+        }
         PARENT::stop();
     }
     virtual void abort() override