Fix ArangoAgency::version() (arangodb#14476)

jsteemann · web-flow · commit c6931da36f12 · 2021-07-07T20:56:42.000+02:00
* Fix ArangoAgency::version(), which always returned an empty string instead
  of the agency's correctly reported version. This also fixes the agency
  version in the startup log messages of the cluster.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,10 @@
 devel
 -----
 
+* Fix ArangoAgency::version(), which always returned an empty string instead
+  of the agency's correctly reported version. This also fixes the agency
+  version in the startup log messages of the cluster.
+
 * Fixed an issue in index selection, when the selectivty estimate of another
   prefix index was used without checking if the other index covered the
   FILTER condition.
diff --git a/arangod/Agency/AgencyComm.cpp b/arangod/Agency/AgencyComm.cpp
@@ -622,8 +622,14 @@ std::string AgencyComm::version() {
                        AgencyCommHelper::CONNECTION_OPTIONS._requestTimeout,
                        "/_api/version", VPackSlice::noneSlice());
 
-  if (result.successful() && result.slice().isString()) {
-    return result.slice().copyString();
+  if (result.successful()) {
+    VPackSlice r = result.slice();
+    if (r.isObject()) {
+      r = r.get("version");
+    }
+    if (r.isString()) {
+      return r.copyString();
+    }
   }
 
   return "";
diff --git a/arangod/Cluster/ClusterFeature.cpp b/arangod/Cluster/ClusterFeature.cpp
@@ -623,7 +623,7 @@ void ClusterFeature::start() {
       << (_forceOneShard ? " with one-shard mode" : "")
       << ". Agency version: " << version << ", Agency endpoints: " << endpoints
       << ", server id: '" << myId << "', internal endpoint / address: " << _myEndpoint
-      << "', advertised endpoint: " << _myAdvertisedEndpoint << ", role: " << role;
+      << "', advertised endpoint: " << _myAdvertisedEndpoint << ", role: " << ServerState::roleToString(role);
 
   auto [acb, idx] = _agencyCache->read(
     std::vector<std::string>{AgencyCommHelper::path("Sync/HeartbeatIntervalMs")});
diff --git a/tests/js/server/shell/shell-cluster-agency.js b/tests/js/server/shell/shell-cluster-agency.js
@@ -1,5 +1,5 @@
 /*jshint globalstrict:false, strict:false */
-/*global fail, assertFalse, assertTrue, assertEqual, ArangoAgency */
+/*global fail, assertFalse, assertTrue, assertEqual, assertMatch, ArangoAgency */
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief test the agency communication layer
@@ -65,6 +65,11 @@ function AgencySuite () {
       catch (err) {
       }
     },
+    
+    testVersion : function () {
+      let result = agency.version();
+      assertMatch(/^\d\.\d/, result);
+    },
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief test set
