Bug fix/dont fail when restoring cluster dump into single server (arangodb#7598)

jsteemann · web-flow · commit 7b93b1c8f9c3 · 2018-12-03T16:18:07.000+01:00
diff --git a/arangod/Indexes/IndexFactory.cpp b/arangod/Indexes/IndexFactory.cpp
@@ -228,8 +228,13 @@ TRI_idx_iid_t IndexFactory::validateSlice(arangodb::velocypack::Slice info,
 
   if (iid == 0 && !isClusterConstructor) {
     // Restore is not allowed to generate an id
-    TRI_ASSERT(generateKey);
-    iid = arangodb::Index::generateId();
+    VPackSlice type = info.get(StaticStrings::IndexType);
+    // dont generate ids for indexes of type "primary"
+    // id 0 is expected for primary indexes
+    if (!type.isString() || !type.isEqualString("primary")) {
+      TRI_ASSERT(generateKey);
+      iid = arangodb::Index::generateId();
+    }
   }
 
   return iid;
