Changes to allow restore from 3.5 to 3.6.

arangodb · neunhoef · Nov 15, 2019 · Nov 7, 2019 · Nov 11, 2019 · Nov 12, 2019
commit abd8c5b8bd2584c01cdf8f67043d710664f36a60
diff --git a/arangod/RestServer/UpgradeFeature.cpp b/arangod/RestServer/UpgradeFeature.cpp
@@ -143,9 +143,9 @@ void UpgradeFeature::validateOptions(std::shared_ptr<ProgramOptions> options) {
   cluster.forceDisable();
   ServerState::instance()->setRole(ServerState::ROLE_SINGLE);
 
-#ifdef USE_ENTEPRISE
+#ifdef USE_ENTERPRISE
   HotBackupFeature& hotBackupFeature = server().getFeature<HotBackupFeature>();
-  hotBackupFeature.disable();
+  hotBackupFeature.forceDisable();
 #endif
 }
 

diff --git a/lib/Basics/StaticStrings.cpp b/lib/Basics/StaticStrings.cpp
@@ -277,3 +277,5 @@ std::string const StaticStrings::New("new");
 std::string const StaticStrings::Old("old");
 std::string const StaticStrings::UpgradeEnvName(
     "ARANGODB_UPGRADE_DURING_RESTORE");
+std::string const StaticStrings::BackupToDeleteName("DIRECTORY_TO_DELETE");
+std::string const StaticStrings::BackupSearchToDeleteName("DIRECTORY_TO_DELETE_SEARCH");
diff --git a/lib/Basics/StaticStrings.h b/lib/Basics/StaticStrings.h
@@ -252,6 +252,8 @@ class StaticStrings {
   static std::string const New;
   static std::string const Old;
   static std::string const UpgradeEnvName;
+  static std::string const BackupToDeleteName;
+  static std::string const BackupSearchToDeleteName;
 };
 }  // namespace arangodb
 

diff --git a/tests/RocksDBEngine/HotBackupTest.cpp b/tests/RocksDBEngine/HotBackupTest.cpp
@@ -365,16 +365,16 @@ class RocksDBHotBackupRestoreTest : public RocksDBHotBackupRestore {
 
 /// @brief test
 TEST(RocksDBHotBackupRestoreDirectories, test_createRestoringDirectory) {
-  std::string restoringDir, restoringSearchDir, tempname;
+  std::string fullRestoringDir, restoringDir, restoringSearchDir, tempname;
   bool retBool;
 
   VPackBuilder report;
   tests::mocks::MockAqlServer server;
   HotBackupFeature& feature = server.getFeature<HotBackupFeature>();
   RocksDBHotBackupRestoreTest testee(feature, VPackSlice(), report);
-  testee.createHotDirectory();
+  testee.createHotDirectory()
 
-  retBool = testee.createRestoringDirectories(restoringDir, restoringSearchDir);
+  retBool = testee.createRestoringDirectories(fullRestoringDir, restoringDir, restoringSearchDir);
 
   // spot check files in restoring dir
   EXPECT_TRUE( retBool );