From ee858a1906719284b13f89a3a6e0d70c0b44e96c Mon Sep 17 00:00:00 2001 From: jsteemann Date: Thu, 28 Jun 2018 21:57:44 +0200 Subject: [PATCH] fix assertions --- arangod/ClusterEngine/ClusterEngine.cpp | 3 +-- arangod/RestServer/DatabaseFeature.cpp | 8 ++++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/arangod/ClusterEngine/ClusterEngine.cpp b/arangod/ClusterEngine/ClusterEngine.cpp index 12d61e83b2..7e94d0a972 100644 --- a/arangod/ClusterEngine/ClusterEngine.cpp +++ b/arangod/ClusterEngine/ClusterEngine.cpp @@ -464,8 +464,7 @@ std::unique_ptr ClusterEngine::openExistingDatabase( bool wasCleanShutdown, bool isUpgrade ) { - // TODO make this a coordinator type vocbase - return std::make_unique(TRI_VOCBASE_TYPE_NORMAL, id, name); + return std::make_unique(TRI_VOCBASE_TYPE_COORDINATOR, id, name); } // ----------------------------------------------------------------------------- diff --git a/arangod/RestServer/DatabaseFeature.cpp b/arangod/RestServer/DatabaseFeature.cpp index 4771b54cd4..506087207f 100644 --- a/arangod/RestServer/DatabaseFeature.cpp +++ b/arangod/RestServer/DatabaseFeature.cpp @@ -391,7 +391,9 @@ void DatabaseFeature::stop() { TRI_vocbase_t* vocbase = p.second; // iterate over all databases TRI_ASSERT(vocbase != nullptr); - TRI_ASSERT(vocbase->type() == TRI_VOCBASE_TYPE_NORMAL); + if (vocbase->type() != TRI_VOCBASE_TYPE_NORMAL) { + continue; + } vocbase->processCollections([](LogicalCollection* collection) { // no one else must modify the collection's status while we are in here @@ -462,7 +464,9 @@ void DatabaseFeature::recoveryDone() { TRI_vocbase_t* vocbase = p.second; // iterate over all databases TRI_ASSERT(vocbase != nullptr); - TRI_ASSERT(vocbase->type() == TRI_VOCBASE_TYPE_NORMAL); + if (vocbase->type() != TRI_VOCBASE_TYPE_NORMAL) { + continue; + } // execute the engine-specific callbacks on successful recovery engine->recoveryDone(*vocbase);