From f09ff46c65093c4c04367585ad93dd3d0902f13f Mon Sep 17 00:00:00 2001 From: Matthew Von-Maszewski Date: Thu, 11 Jul 2019 14:55:56 +0200 Subject: [PATCH] coordinator would not always include rocksdb error message with error code (#9458) --- arangod/Cluster/ClusterInfo.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arangod/Cluster/ClusterInfo.cpp b/arangod/Cluster/ClusterInfo.cpp index 78843c27bc..0a751f7c2d 100644 --- a/arangod/Cluster/ClusterInfo.cpp +++ b/arangod/Cluster/ClusterInfo.cpp @@ -2081,6 +2081,10 @@ int ClusterInfo::ensureIndexCoordinatorInner(std::string const& databaseName, auto rollbackEndTime = steady_clock::now() + std::chrono::seconds(10); while (true) { AgencyCommResult update = _agency.sendTransactionWithFailover(trx, 0.0); + { + CONDITION_LOCKER(locker, agencyCallback->_cv); + errorMsg = *errMsg; // default is "", but errors not covered below can populate + } if (update.successful()) { loadPlan(); if (tmpRes < 0) { // timeout