wait until restore task queue is idle before shutting down (arangodb#…

…12353)
dcosta72 · Aug 3, 2020 · 295bfae · 295bfae
1 parent 141a000
commit 295bfae
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,8 @@
 devel
 -----
 
+* Wait until restore task queue is idle before shutting down.
+
 * Fix a race problem in the unit tests w.r.t. PlanSyncer.
 
 * Always fetch data for /_api/cluster/agency-dump from leader of the agency.

diff --git a/arangosh/Restore/RestoreFeature.cpp b/arangosh/Restore/RestoreFeature.cpp
@@ -650,25 +650,24 @@ arangodb::Result restoreIndexes(arangodb::httpclient::SimpleHttpClient& httpClie
   using arangodb::Logger;
 
   arangodb::Result result{};
-  VPackSlice const parameters = jobData.collection.get("parameters");
   VPackSlice const indexes = jobData.collection.get("indexes");
   // re-create indexes
   if (indexes.length() > 0) {
     // we actually have indexes
-    if (jobData.options.progress) {
-      std::string const cname =
-          arangodb::basics::VelocyPackHelper::getStringValue(parameters, "name",
+
+    VPackSlice const parameters = jobData.collection.get("parameters");
+
+    std::string const cname =
+        arangodb::basics::VelocyPackHelper::getStringValue(parameters, "name",
                                                              "");
+    if (jobData.options.progress) {
       LOG_TOPIC("d88c6", INFO, Logger::RESTORE)
           << "# Creating indexes for collection '" << cname << "'...";
     }
 
     result = ::sendRestoreIndexes(httpClient, jobData.options, jobData.collection);
 
     if (result.fail()) {
-      std::string const cname =
-          arangodb::basics::VelocyPackHelper::getStringValue(parameters, "name",
-                                                             "");
       if (jobData.options.force) {
         LOG_TOPIC("db937", WARN, Logger::RESTORE)
             << "Error while creating indexes for collection '" << cname
@@ -1779,6 +1778,8 @@ void RestoreFeature::start() {
       result = {TRI_ERROR_INTERNAL};
     }
 
+    _clientTaskQueue.waitForIdle();
+
     if (result.fail()) {
       break;
     }