Преглед на файлове

HPCC-11618 Roxie core when detaching from dali

If roxie detaches from dali while a Workunit listener thread is at certain
locations inside dodequeue, Roxie may core.

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman преди 11 години
родител
ревизия
c39cf86b68
променени са 2 файла, в които са добавени 2 реда и са изтрити 1 реда
  1. 1 1
      roxie/ccd/ccddali.cpp
  2. 1 0
      roxie/ccd/ccdlistener.cpp

+ 1 - 1
roxie/ccd/ccddali.cpp

@@ -726,10 +726,10 @@ public:
                 closeDllServer();
                 closeEnvironment();
                 clientShutdownWorkUnit();
+                disconnectRoxieQueues();
                 ::closedownClientProcess(); // dali client closedown
                 isConnected = false;
                 disconnectSem.signal();
-                disconnectRoxieQueues();
             }
         }
     }

+ 1 - 0
roxie/ccd/ccdlistener.cpp

@@ -863,6 +863,7 @@ public:
         {
             DBGLOG("RoxieWorkUnitListener::disconnectQueue");
             queue->cancelAcceptConversation();
+            queue.clear();
         }
     }