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

do not fail when encountering an empty database directory

This commit is contained in:
jsteemann 2016-05-31 13:18:10 +02:00
parent bb3c8a427b
commit 82d513a546
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
arangod/VocBase/server.cpp
View File

@ -440,12 +440,21 @@ static int OpenDatabases(TRI_server_t* server, bool isUpgrade) {
if (!TRI_ExistsFile(parametersFile.c_str())) {
// no parameter.json file
LOG(ERR) << "database directory '" << databaseDirectory
<< "' does not contain parameters file or parameters file "
"cannot be read";
if (TRI_FilesDirectory(databaseDirectory.c_str()).empty()) {
// directory is otherwise empty, continue!
LOG(WARN) << "ignoring empty database directory '" << databaseDirectory
<< "' without parameters file";
// abort
res = TRI_ERROR_ARANGO_ILLEGAL_PARAMETER_FILE;
res = TRI_ERROR_NO_ERROR;
} else {
// abort
LOG(ERR) << "database directory '" << databaseDirectory
<< "' does not contain parameters file or parameters file "
"cannot be read";
res = TRI_ERROR_ARANGO_ILLEGAL_PARAMETER_FILE;
}
break;
}