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

adjusted error messages

This commit is contained in:
jsteemann 2016-07-18 11:08:12 +02:00
parent 3b6d7c304e
commit d8a95222a2
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arangod/StorageEngine/MMFilesEngine.cpp
View File

@ -464,10 +464,7 @@ int MMFilesEngine::openDatabases() {
continue; continue;
} }
// .........................................................................
// construct and validate path // construct and validate path
// .........................................................................
std::string const directory(basics::FileUtils::buildFilename(_databasePath, name)); std::string const directory(basics::FileUtils::buildFilename(_databasePath, name));
if (!TRI_IsDirectory(directory.c_str())) { if (!TRI_IsDirectory(directory.c_str())) {
@ -503,10 +500,6 @@ int MMFilesEngine::openDatabases() {
// a valid database directory // a valid database directory
// .........................................................................
// read parameter.json file
// .........................................................................
// now read data from parameter.json file // now read data from parameter.json file
std::string const file = parametersFile(id); std::string const file = parametersFile(id);
@ -554,8 +547,8 @@ int MMFilesEngine::openDatabases() {
if (arangodb::basics::VelocyPackHelper::getBooleanValue(parameters, "deleted", false)) { if (arangodb::basics::VelocyPackHelper::getBooleanValue(parameters, "deleted", false)) {
// database is deleted, skip it! // database is deleted, skip it!
LOG(INFO) << "found dropped database in directory '" << directory << "'"; LOG(DEBUG) << "found dropped database in directory '" << directory << "'";
LOG(INFO) << "removing superfluous database directory '" << directory << "'"; LOG(DEBUG) << "removing superfluous database directory '" << directory << "'";
#ifdef ARANGODB_ENABLE_ROCKSDB #ifdef ARANGODB_ENABLE_ROCKSDB
// delete persistent indexes for this database // delete persistent indexes for this database
@ -571,8 +564,7 @@ int MMFilesEngine::openDatabases() {
VPackSlice nameSlice = parameters.get("name"); VPackSlice nameSlice = parameters.get("name");
if (!nameSlice.isString()) { if (!nameSlice.isString()) {
LOG(ERR) << "database directory '" << directory LOG(ERR) << "database directory '" << directory << "' does not contain a valid parameters file";
<< "' does not contain a valid parameters file";
return TRI_ERROR_ARANGO_ILLEGAL_PARAMETER_FILE; return TRI_ERROR_ARANGO_ILLEGAL_PARAMETER_FILE;
} }
@ -604,7 +596,7 @@ int MMFilesEngine::openDatabases() {
res = TRI_ERROR_INTERNAL; res = TRI_ERROR_INTERNAL;
} }
LOG(ERR) << "could not process database directory '" << databaseDirectory LOG(ERR) << "could not process database directory '" << directory
<< "' for database '" << name << "': " << TRI_errno_string(res); << "' for database '" << name << "': " << TRI_errno_string(res);
return res; return res;
} }