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

Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

This commit is contained in:
a-brandt 2012-11-20 15:43:49 +01:00
parent a7c957faeb 156da907c5
commit 8f14a9b790
4 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGELOG
View File

@ -1,5 +1,14 @@
v1.1.beta3 (XXXX-XX-XX)
* WARNING:
arangod now performs a database version check at startup. It will look for a file
named "VERSION" in its database directory. If the file is not present, arangod will
refuse to start and ask the user to run arango-upgrade first. If the VERSION file
is present but is from an older version of ArangoDB, arangod will also refuse to
start and ask the user to run the upgrade script first. This procedure shall ensure
that users have full control over when they perform any updates/upgrades of their
data, and do not risk running an incompatible server/database state tandem.
* fixed issue #283: AQL LENGTH() now works on documents, too
* fixed issue #281: documentation for skip lists shows wrong example

4
arangod/V8Server/ApplicationV8.cpp
View File

@ -691,6 +691,8 @@ bool ApplicationV8::prepareV8Instance (const size_t i) {
if (i == 0 && _runVersionCheck) {
LOGGER_DEBUG << "running database version check";
const string script = _startupLoader.buildScript(JS_server_version_check);
// special check script to be run just once in first thread (not in all)
@ -709,6 +711,8 @@ bool ApplicationV8::prepareV8Instance (const size_t i) {
return false;
}
LOGGER_DEBUG << "database version check passed";
}
// load all actions

6
js/server/arango-upgrade.js
View File

@ -58,8 +58,12 @@ function main (argv) {
var versionInfo = SYS_READ(versionFile);
if (versionInfo != '') {
var versionValues = JSON.parse(versionInfo);
if (versionValues && versionValues.version && ! isNaN(versionValues.version)) {
lastVersion = parseFloat(versionValues.version);
lastTasks = versionValues.tasks;
}
if (versionValues && versionValues.tasks && typeof(versionValues.tasks) === 'object') {
lastTasks = versionValues.tasks || { };
}
}
}

10
js/server/version-check.js
View File

@ -54,8 +54,15 @@
var versionInfo = SYS_READ(versionFile);
if (versionInfo != '') {
var versionValues = JSON.parse(versionInfo);
if (versionValues && versionValues.version && ! isNaN(versionValues.version)) {
lastVersion = parseFloat(versionValues.version);
}
}
if (lastVersion == null) {
console.error("No version information file found in database directory.");
return false;
}
var currentServerVersion = VERSION.match(/^(\d+\.\d+).*$/);
if (! currentServerVersion) {
@ -67,7 +74,8 @@
if (lastVersion != null && lastVersion > currentVersion) {
// downgrade??
console.warn("Database directory version is higher than server version. This seems like you are running arangodb on a database directory that was created with a newer version. This is not supported.");
console.error("Database directory version is higher than server version.");
console.error("It seems like you are running arangodb on a database directory that was created with a newer version. This is not supported.");
// still, allow the start
}