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

only anounce coordinator readiness once the agency is convinced we are (#10562) 

* only anounce coordinator readiness once the agency is convinced we are

* wait for DB-Servers too

* move test creating the database to the front

* move test to be run first
This commit is contained in:
Wilfried Goesgens 2019-11-28 18:56:59 +01:00 committed by KVS85
parent 0f8897f9c6
commit 589f321ace
2 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arangod/RestServer/BootstrapFeature.cpp
View File

@ -344,6 +344,10 @@ void BootstrapFeature::start() {
um->createRootUser();
}
}
if (ServerState::isClusterRole(role)) {
waitForHealthEntry();
}
if (ServerState::isSingleServer(role) && AgencyCommManager::isEnabled()) {
// simon: this is set to correct value in the heartbeat thread
@ -352,10 +356,6 @@ void BootstrapFeature::start() {
// Start service properly:
ServerState::setServerMode(ServerState::Mode::DEFAULT);
}
if (ServerState::isCoordinator(role)) {
waitForHealthEntry();
}
if (!databaseFeature.upgrade()) {
LOG_TOPIC("cf3f4", INFO, arangodb::Logger::FIXME)

49
tests/js/common/shell/shell-database.js → tests/js/common/shell/01_shell-database.js
View File

@ -60,6 +60,31 @@ function DatabaseSuite () {
internal.wait(0);
},
////////////////////////////////////////////////////////////////////////////////
/// @brief test _createDatabase function
////////////////////////////////////////////////////////////////////////////////
testCreateDatabase : function () {
// run this early in the test setup for maximal stress.
assertEqual("_system", internal.db._name());
try {
internal.db._dropDatabase("UnitTestsDatabase0");
} catch (err1) {
}
try {
internal.db._dropDatabase("UnitTestsDatabase1");
} catch (err2) {
}
assertTrue(internal.db._createDatabase("UnitTestsDatabase0"));
assertTrue(internal.db._createDatabase("UnitTestsDatabase1"));
assertTrue(internal.db._dropDatabase("UnitTestsDatabase0"));
assertTrue(internal.db._dropDatabase("UnitTestsDatabase1"));
},
////////////////////////////////////////////////////////////////////////////////
/// @brief test _name function
////////////////////////////////////////////////////////////////////////////////
@ -256,30 +281,6 @@ function DatabaseSuite () {
internal.db._dropDatabase("UnitTestsDatabase0");
},
////////////////////////////////////////////////////////////////////////////////
/// @brief test _createDatabase function
////////////////////////////////////////////////////////////////////////////////
testCreateDatabase : function () {
assertEqual("_system", internal.db._name());
try {
internal.db._dropDatabase("UnitTestsDatabase0");
} catch (err1) {
}
try {
internal.db._dropDatabase("UnitTestsDatabase1");
} catch (err2) {
}
assertTrue(internal.db._createDatabase("UnitTestsDatabase0"));
assertTrue(internal.db._createDatabase("UnitTestsDatabase1"));
assertTrue(internal.db._dropDatabase("UnitTestsDatabase0"));
assertTrue(internal.db._dropDatabase("UnitTestsDatabase1"));
},
////////////////////////////////////////////////////////////////////////////////
/// @brief test _createDatabase function
////////////////////////////////////////////////////////////////////////////////