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

fix version check

This commit is contained in:
jsteemann 2017-05-12 13:55:57 +02:00
parent 341cf969d3
commit b528178a0b
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arangod/RestServer/CheckVersionFeature.cpp
View File

@ -138,6 +138,7 @@ void CheckVersionFeature::checkVersion() {
// can do this without a lock as this is the startup // can do this without a lock as this is the startup
DatabaseFeature* databaseFeature = application_features::ApplicationServer::getFeature<DatabaseFeature>("Database"); DatabaseFeature* databaseFeature = application_features::ApplicationServer::getFeature<DatabaseFeature>("Database");
// iterate over all databases
for (auto& name : databaseFeature->getDatabaseNames()) { for (auto& name : databaseFeature->getDatabaseNames()) {
TRI_vocbase_t* vocbase = databaseFeature->lookupDatabase(name); TRI_vocbase_t* vocbase = databaseFeature->lookupDatabase(name);
@ -155,9 +156,17 @@ void CheckVersionFeature::checkVersion() {
<< "'. Please inspect the logs for any errors"; << "'. Please inspect the logs for any errors";
FATAL_ERROR_EXIT(); FATAL_ERROR_EXIT();
} else if (status == 3) { } else if (status == 3) {
// this is safe to do even if further databases will be checked
// because we will never set the status back to success
*_result = 3; *_result = 3;
LOG_TOPIC(WARN, arangodb::Logger::FIXME) << "Database version check failed for '"
<< vocbase->name() << "': upgrade needed";
} else if (status == 2 && *_result == 1) { } else if (status == 2 && *_result == 1) {
// this is safe to do even if further databases will be checked
// because we will never set the status back to success
*_result = 2; *_result = 2;
LOG_TOPIC(WARN, arangodb::Logger::FIXME) << "Database version check failed for '"
<< vocbase->name() << "': downgrade needed";
} }
} }
} }
@ -167,10 +176,14 @@ void CheckVersionFeature::checkVersion() {
localContext->Exit(); localContext->Exit();
} }
} }
LOG_TOPIC(DEBUG, arangodb::Logger::FIXME) << "final result of version check: " << *_result;
if (*_result == 1) { if (*_result == 1) {
*_result = EXIT_SUCCESS; *_result = EXIT_SUCCESS;
} else if (*_result > 1) {
*_result = EXIT_FAILURE;
LOG_TOPIC(FATAL, arangodb::Logger::FIXME) << "Database version check failed";
FATAL_ERROR_EXIT();
} }
LOG_TOPIC(DEBUG, arangodb::Logger::FIXME) << "final result of version check: " << *_result;
} }