broken hotbackup list with (arangodb#9956)

kvahed · neunhoef · commit 30118460258b · 2019-09-10T10:17:24.000+02:00
* fix broken list of non existing id
diff --git a/arangod/Cluster/ClusterMethods.cpp b/arangod/Cluster/ClusterMethods.cpp
@@ -3230,12 +3230,13 @@ arangodb::Result hotBackupList(std::vector<ServerID> const& dbServers, VPackSlic
 
   LOG_TOPIC("410a1", DEBUG, Logger::BACKUP) << "Got " << nrGood << " of " << requests.size() << " lists of local backups";
 
-  if (nrGood < requests.size()) {
+  // Any error if no id presented
+  if (payload.isObject() && !payload.hasKey("id") && nrGood < requests.size()) {
     return arangodb::Result(
       TRI_ERROR_HOT_BACKUP_DBSERVERS_AWOL,
       std::string("not all db servers could be reached for backup listing"));
   }
-  
+
   // Now check results
   for (auto const& req : requests) {
     auto res = req.result;
@@ -4252,6 +4253,12 @@ arangodb::Result listHotBackupsOnCoordinator(VPackSlice const payload, VPackBuil
     result = hotBackupList(dbServers, payload, list, dummy);
 
     if (!result.ok()) {
+
+      if (payload.isObject() && payload.hasKey("id") && result.is(TRI_ERROR_HTTP_NOT_FOUND)) {
+        auto error = std::string("failed to locate backup ") + payload.get("id").copyString();
+        LOG_TOPIC("2020b", DEBUG, Logger::BACKUP) << error;
+        return arangodb::Result(TRI_ERROR_HTTP_NOT_FOUND, error);
+      }
       if (steady_clock::now() > timeout) {
         return arangodb::Result(
           TRI_ERROR_CLUSTER_TIMEOUT, "timeout waiting for all db servers to report backup list");
