arangodb · jsteemann · Jun 14, 2021 · Jun 11, 2021 · Jun 11, 2021
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,8 @@
 devel
 -----
 
+* Slightly improve specific warning messages for better readability.
+
 * Fix URL request parsing in case data is handed in in small chunks.
   Previously the URL could be cut off if the chunk size was smaller than
   the URL size.

diff --git a/arangod/Cluster/Maintenance.cpp b/arangod/Cluster/Maintenance.cpp
@@ -1473,6 +1473,14 @@ arangodb::Result arangodb::maintenance::reportInCurrent(
           std::vector<std::string> const planPath {
             AgencyCommHelper::path(), PLAN, COLLECTIONS, d, c, "shards", s};
 
+          if (!pdb.isObject()) {
+            LOG_TOPIC("2647d", WARN, Logger::MAINTENANCE) 
+              << "plan database in error reporting struct is not an object: " << pdb.toJson();
+          }
+          if (!ldb.isObject()) {
+            LOG_TOPIC("8fe58", WARN, Logger::MAINTENANCE) 
+              << "local database in error reporting struct is not an object: " << ldb.toJson();
+          }
           TRI_ASSERT(pdb.isObject());
           TRI_ASSERT(ldb.isObject());
           if (pdb.hasKey(planPath) && !ldb.hasKey(s)) {

diff --git a/arangod/Cluster/SynchronizeShard.cpp b/arangod/Cluster/SynchronizeShard.cpp
@@ -1336,12 +1336,18 @@ void SynchronizeShard::setState(ActionState state) {
     while (!_feature.server().isStopping() && clock::now() < stoppage) {
       cluster::fetchCurrentVersion(0.1 * timeout)
         .thenValue(
-          [&v] (auto&& res) { v = res.get(); })
+          [&v] (auto&& res) {
+            // we need to check if res is ok() in order to not trigger a 
+            // bad_optional_access exception here
+            if (res.ok()) {
+              v = res.get(); 
+            }
+          })
         .thenError<std::exception>(
           [this] (std::exception const& e) {
             LOG_TOPIC("3ae99", ERR, Logger::CLUSTER)
               << "Failed to acquire current version from agency while increasing shard version"
-              << " for shard "  << getDatabase() << "/" << getShard() << e.what();
+              << " for shard "  << getDatabase() << "/" << getShard() << ": " << e.what();
           })
         .wait();
       if (v > 0) {

diff --git a/arangod/Scheduler/SchedulerFeature.cpp b/arangod/Scheduler/SchedulerFeature.cpp
@@ -383,7 +383,7 @@ extern "C" void c_exit_handler(int signal, siginfo_t* info, void*) {
       application_features::ApplicationServer::CTRL_C.store(true);
     } else {
       LOG_TOPIC("11ca3", FATAL, arangodb::Logger::FIXME)
-          << signals::name(signal) << "received during shutdown sequence (sender pid "
+          << signals::name(signal) << " received during shutdown sequence (sender pid "
           << info->si_pid << "), terminating!";
       FATAL_ERROR_EXIT();
     }