arangodb
diff --git a/‎CHANGELOG‎
Lines changed: 13 additions & 9 deletions b/‎CHANGELOG‎
Lines changed: 13 additions & 9 deletions
diff --git a/‎arangod/Cluster/HeartbeatThread.cpp‎
Lines changed: 43 additions & 23 deletions b/‎arangod/Cluster/HeartbeatThread.cpp‎
Lines changed: 43 additions & 23 deletions
@@ -1,6 +1,10 @@
 devel
 -----
 
+* Fixed a bug, where Coordinators handled plan changes for databases
+  in heartbeat thread in wrong order. Databases could be listed, but
+  not used.
+
 * Automatically extend web UI sessions while they are still active. 
   The web UI can now call a backend route to renew its JWT, so there will not
   be any rude logouts in the middle of an active session.
@@ -40,28 +44,28 @@ devel
   Previously, the value was ignored and WAL syncing on Windows was using a
   different code paths than on the other supported platforms. Now syncing is
   unified across all platforms, and they all call RocksDB's `SyncWAL()`.
-
+  
 * Updated ArangoDB Starter to 0.15.1-preview-4.
 
 * APM-132: Clean up collection statuses
   Removes collection statuses "new born", "loading", "unloading" and "unloaded".
   These statuses were last relevant with the MMFiles storage engine, when it
   was important to differentiate which collections are present in main memory
-  memory and which aren't. With the RocksDB storage engine, all that was 
+  memory and which aren't. With the RocksDB storage engine, all that was
   automatically handled anyway, and the statuses were not important anymore.
 
   The change removes the "Load" and "Unload" buttons for collections from the
   web interface. All collections in the web interface will be marked as
   "loaded" permanently.
-  
+
   This change also obsoletes the `load()` and `unload()` calls for collections
   as well as their HTTP API equivalents. The APIs will remain in place for now
   but are changed to no-ops. They will removed eventually in a future version
   of ArangoDB. This will be announced separately.
 
-* Include K_SHORTEST_PATHS and SHORTEST_PATH execution nodes in AQL query memory
-  usage accounting. The memory used by these execution node types was previously
-  not tracked against the configured query memory limit (BTS-411).
+* Include K_SHORTEST_PATHS and SHORTEST_PATH execution nodes in AQL query
+  memory usage accounting. The memory used by these execution node types was
+  previously not tracked against the configured query memory limit.
 
 * Reduce default value for max-nodes-per-callstack to 200 for OSX, because on
   OSX worker threads have a stack size of only 512kb.
@@ -70,10 +74,10 @@ devel
   directory. This is required so we have a full copy of the JavaScript
   dependencies and not one that excludes some infrequently changed modules.
   In addition, file copying now intentionally excludes .map files as they
-  are not needed. 
+  are not needed.
 
-* Fixed BTS-408: treat positive or negative signed numbers as constants 
-  immediately during AQL query parsing. 
+* Fixed BTS-408: treat positive or negative signed numbers as constants
+  immediately during AQL query parsing.
   Previously, a value of `-1` was parsed initially as `unary minus(value(1))`,
   which was not treated in the same way as a constant value `value(-1)`. 
   The value was later optimized to just `value(-1)`, but this only happened 
 
@@ -1220,14 +1220,55 @@ bool HeartbeatThread::handlePlanChangeCoordinator(uint64_t currentPlanVersion) {
     std::vector<TRI_voc_tick_t> ids;
     velocypack::Slice databases = result[0].get(std::vector<std::string>(
         {AgencyCommHelper::path(), "Plan", "Databases"}));
-
     if (!databases.isObject()) {
       return false;
     }
 
+    for (VPackObjectIterator::ObjectPair options : VPackObjectIterator(databases)) {
+      try {
+        ids.push_back(std::stoul(options.value.get("id").copyString()));
+      } catch (std::invalid_argument& e) {
+        LOG_TOPIC("a9233", ERR, Logger::CLUSTER)
+          << "Number conversion for planned database id for " << options.key.stringView() << " failed: " << e.what();
+      } catch (std::out_of_range const& e) {
+        LOG_TOPIC("a9243", ERR, Logger::CLUSTER)
+          << "Number conversion for planned database id for " << options.key.stringView() << " failed: " << e.what();
+      } catch (std::bad_alloc const&) {
+        LOG_TOPIC("a9234", FATAL, Logger::CLUSTER)
+          << "Failed to allocate memory to enumerate planned databases from agency";
+        FATAL_ERROR_EXIT();
+      } catch (std::exception const& e) {
+        LOG_TOPIC("a9235", FATAL, Logger::CLUSTER)
+          << "Failed to read planned databases " << options.key.stringView() << " from agency: " << e.what();
+      }
+    }
+
+    // get the list of databases that we know about locally
+    std::vector<TRI_voc_tick_t> localIds = databaseFeature.getDatabaseIds(false);
+    for (auto id : localIds) {
+      auto r = std::find(ids.begin(), ids.end(), id);
+
+      if (r == ids.end()) {
+        // local database not found in the plan...
+        std::string dbName = "n/a";
+        TRI_vocbase_t* db = databaseFeature.useDatabase(id);
+        TRI_ASSERT(db);
+        if (db) {
+          try {
+            dbName = db->name();
+          } catch (...) {
+            db->release();
+            throw;
+          }
+          db->release();
+        }
+        Result res = databaseFeature.dropDatabase(id, true);
+        events::DropDatabase(dbName, res, ExecContext::current());
+      }
+    }
+
     // loop over all database names we got and create a local database
     // instance if not yet present:
-
     for (VPackObjectIterator::ObjectPair options : VPackObjectIterator(databases)) {
       if (!options.value.isObject()) {
         continue;
@@ -1243,9 +1284,6 @@ bool HeartbeatThread::handlePlanChangeCoordinator(uint64_t currentPlanVersion) {
         TRI_ASSERT(false);
       }
 
-      // known plan IDs
-      ids.push_back(info.getId());
-
       auto dbName = info.getName();
       TRI_vocbase_t* vocbase = databaseFeature.useDatabase(dbName);
       if (vocbase == nullptr) {
@@ -1273,24 +1311,6 @@ bool HeartbeatThread::handlePlanChangeCoordinator(uint64_t currentPlanVersion) {
       }
     }
 
-    // get the list of databases that we know about locally
-    std::vector<TRI_voc_tick_t> localIds = databaseFeature.getDatabaseIds(false);
-
-    for (auto id : localIds) {
-      auto r = std::find(ids.begin(), ids.end(), id);
-
-      if (r == ids.end()) {
-        // local database not found in the plan...
-        TRI_vocbase_t* db = databaseFeature.useDatabase(id);
-        TRI_ASSERT(db);
-        std::string dbName = db ? db->name() : "n/a";
-        if (db) {
-          db->release();
-        }
-        Result res = databaseFeature.dropDatabase(id, true);
-        events::DropDatabase(dbName, res, ExecContext::current());
-      }
-    }
 
   } else {
     return false;