Fixes to upgrade on env-var.

arangodb · neunhoef · Nov 15, 2019 · Nov 7, 2019 · Nov 11, 2019 · Nov 12, 2019
commit 40ae1d3c8143788d5cddd24668c1eb77adbd2c63
diff --git a/arangod/Cluster/ClusterMethods.cpp b/arangod/Cluster/ClusterMethods.cpp
@@ -3011,7 +3011,8 @@ arangodb::Result hotRestoreCoordinator(ClusterFeature& feature, VPackSlice const
     using arangodb::methods::VersionResult;
 #ifdef USE_ENTERPRISE
     // Will never be called in community
-    if (!RocksDBHotBackup::versionTestRestore(meta._version)) {
+    bool autoUpgradeNeeded;   // not actually used
+    if (!RocksDBHotBackup::versionTestRestore(meta._version, autoUpgradeNeeded)) {
       return arangodb::Result(TRI_ERROR_HOT_RESTORE_INTERNAL,
                               "Version mismatch");
     }

diff --git a/arangod/RestServer/UpgradeFeature.cpp b/arangod/RestServer/UpgradeFeature.cpp
@@ -24,7 +24,11 @@
 
 #include "ApplicationFeatures/HttpEndpointProvider.h"
 #include "Basics/application-exit.h"
+#include "Basics/StaticStrings.h"
 #include "Cluster/ClusterFeature.h"
+#ifdef USE_ENTERPRISE
+#include "Enterprise/StorageEngine/HotBackupFeature.h"
+#endif
 #include "FeaturePhases/AqlFeaturePhase.h"
 #include "GeneralServer/AuthenticationFeature.h"
 #include "Logger/LogMacros.h"
@@ -79,10 +83,8 @@ void UpgradeFeature::collectOptions(std::shared_ptr<ProgramOptions> options) {
 extern std::function<int()> * restartAction;
 
 #ifndef _WIN32
-static std::string const UPGRADE_ENV = "ARANGODB_UPGRADE_DURING_RESTORE";
-
 static int upgradeRestart() {
-  unsetenv(UPGRADE_ENV.c_str());
+  unsetenv(StaticStrings::UpgradeEnvName.c_str());
   return 0;
 }
 #endif
@@ -97,11 +99,15 @@ void UpgradeFeature::validateOptions(std::shared_ptr<ProgramOptions> options) {
   // variable at runtime and then does a restore. After the restart (with
   // the old data) the database upgrade is run and another restart is
   // happening afterwards with the environment variable being cleared.
-  char* upgrade = getenv(UPGRADE_ENV.c_str());
+  char* upgrade = getenv(StaticStrings::UpgradeEnvName.c_str());
   if (upgrade != nullptr) {
     _upgrade = true;
     restartAction = new std::function<int()>();
     *restartAction = upgradeRestart;
+    LOG_TOPIC("fdeae", INFO, Logger::STARTUP)
+        << "Detected environment variable " << StaticStrings::UpgradeEnvName
+        << " with value " << upgrade
+        << " will perform database auto-upgrade and immediately restart.";
   }
 #endif
   if (_upgrade && !_upgradeCheck) {
@@ -136,6 +142,11 @@ void UpgradeFeature::validateOptions(std::shared_ptr<ProgramOptions> options) {
   ClusterFeature& cluster = server().getFeature<ClusterFeature>();
   cluster.forceDisable();
   ServerState::instance()->setRole(ServerState::ROLE_SINGLE);
+
+#ifdef USE_ENTEPRISE
+  HotBackupFeature& hotBackupFeature = server().getFeature<HotBackupFeature>();
+  hotBackupFeature.disable();
+#endif
 }
 8000
 void UpgradeFeature::prepare() {

diff --git a/lib/Basics/StaticStrings.cpp b/lib/Basics/StaticStrings.cpp
@@ -275,3 +275,5 @@ std::string const StaticStrings::RebootId("rebootId");
 
 std::string const StaticStrings::New("new");
 std::string const StaticStrings::Old("old");
+std::string const StaticStrings::UpgradeEnvName(
+    "ARANGODB_UPGRADE_DURING_RESTORE");
diff --git a/lib/Basics/StaticStrings.h b/lib/Basics/StaticStrings.h
@@ -251,6 +251,7 @@ class StaticStrings {
   static std::string const RebootId;
   static std::string const New;
   static std::string const Old;
+  static std::string const UpgradeEnvName;
 };
 }  // namespace arangodb