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

preparation

This commit is contained in:
Jan Steemann 2014-01-21 15:14:07 +01:00
parent 80e8250d54
commit ddfa36274d
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/server/modules/org/arangodb/cluster.js
View File

@ -182,6 +182,8 @@ function createLocalDatabases (plannedDatabases) {
payload); payload);
}; };
db._useDatabase("_system");
var localDatabases = getLocalDatabases(); var localDatabases = getLocalDatabases();
var name; var name;
@ -232,6 +234,8 @@ function dropLocalDatabases (plannedDatabases) {
} }
}; };
db._useDatabase("_system");
var localDatabases = getLocalDatabases(); var localDatabases = getLocalDatabases();
var name; var name;
@ -268,6 +272,8 @@ function cleanupCurrentDatabases () {
} }
}; };
db._useDatabase("_system");
var all = ArangoAgency.get("Current/Databases", true); var all = ArangoAgency.get("Current/Databases", true);
var currentDatabases = getByPrefix(all, "Current/Databases/", true); var currentDatabases = getByPrefix(all, "Current/Databases/", true);
var localDatabases = getLocalDatabases(); var localDatabases = getLocalDatabases();
@ -299,7 +305,6 @@ function cleanupCurrentDatabases () {
function handleDatabaseChanges (plan, current) { function handleDatabaseChanges (plan, current) {
var plannedDatabases = getByPrefix(plan, "Plan/Databases/"); var plannedDatabases = getByPrefix(plan, "Plan/Databases/");
db._useDatabase("_system");
createLocalDatabases(plannedDatabases); createLocalDatabases(plannedDatabases);
dropLocalDatabases(plannedDatabases); dropLocalDatabases(plannedDatabases);
cleanupCurrentDatabases(); cleanupCurrentDatabases();
@ -317,6 +322,7 @@ function createLocalCollections (plannedCollections) {
payload); payload);
}; };
db._useDatabase("_system");
var localDatabases = getLocalDatabases(); var localDatabases = getLocalDatabases();
var database; var database;
@ -447,6 +453,7 @@ function dropLocalCollections (plannedCollections) {
} }
}; };
db._useDatabase("_system");
var shardMap = getShardMap(plannedCollections); var shardMap = getShardMap(plannedCollections);
var localDatabases = getLocalDatabases(); var localDatabases = getLocalDatabases();
@ -500,6 +507,10 @@ function dropLocalCollections (plannedCollections) {
} }
} }
function cleanupCurrentCollections () {
db._useDatabase("_system");
}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief handle collection changes /// @brief handle collection changes
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -507,11 +518,9 @@ function dropLocalCollections (plannedCollections) {
function handleCollectionChanges (plan, current) { function handleCollectionChanges (plan, current) {
var plannedCollections = getByPrefix(plan, "Plan/Collections/", true); var plannedCollections = getByPrefix(plan, "Plan/Collections/", true);
db._useDatabase("_system");
createLocalCollections(plannedCollections); createLocalCollections(plannedCollections);
db._useDatabase("_system");
dropLocalCollections(plannedCollections); dropLocalCollections(plannedCollections);
cleanupCurrentCollections();
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////