Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix cluster upgrade

This commit is contained in:
Jan Steemann 2015-12-07 11:57:13 +01:00
parent fd18efa94e
commit 9dd164eadc
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arangod/Cluster/ApplicationCluster.cpp
View File

@ -143,6 +143,13 @@ bool ApplicationCluster::prepare () {
ServerState::instance()->setDisableDispatcherFrontend(_disableDispatcherFrontend); ServerState::instance()->setDisableDispatcherFrontend(_disableDispatcherFrontend);
ServerState::instance()->setDisableDispatcherKickstarter(_disableDispatcherKickstarter); ServerState::instance()->setDisableDispatcherKickstarter(_disableDispatcherKickstarter);
if (_disabled) {
// if ApplicationFeature is disabled
_enableCluster = false;
ServerState::instance()->setRole(ServerState::ROLE_SINGLE);
return true;
}
// check the cluster state // check the cluster state
_enableCluster = ! _agencyEndpoints.empty(); _enableCluster = ! _agencyEndpoints.empty();

6
arangod/RestServer/ArangoServer.cpp
View File

@ -838,6 +838,9 @@ int ArangoServer::startupServer () {
checkVersion = true; checkVersion = true;
// --check-version disables all replication appliers // --check-version disables all replication appliers
_disableReplicationApplier = true; _disableReplicationApplier = true;
if (_applicationCluster != nullptr) {
_applicationCluster->disable();
}
} }
// run upgrade script // run upgrade script
@ -847,6 +850,9 @@ int ArangoServer::startupServer () {
performUpgrade = true; performUpgrade = true;
// --upgrade disables all replication appliers // --upgrade disables all replication appliers
_disableReplicationApplier = true; _disableReplicationApplier = true;
if (_applicationCluster != nullptr) {
_applicationCluster->disable();
}
} }
// skip an upgrade even if VERSION is missing // skip an upgrade even if VERSION is missing