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

changed the order of index creation during restore for _users collection

This commit is contained in:
hkernbach 2019-11-26 11:44:11 +01:00
parent c903bc1e3a
commit e0ffabf490
1 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
arangosh/Restore/RestoreFeature.cpp
View File

@ -1060,27 +1060,46 @@ arangodb::Result processInputDirectory(
arangodb::Result processJob(arangodb::httpclient::SimpleHttpClient& httpClient, arangodb::Result processJob(arangodb::httpclient::SimpleHttpClient& httpClient,
arangodb::RestoreFeature::JobData& jobData) { arangodb::RestoreFeature::JobData& jobData) {
arangodb::Result result; arangodb::Result result;
if (jobData.options.indexesFirst && jobData.options.importStructure) {
// restore indexes first if we are using rocksdb VPackSlice const parameters = jobData.collection.get("parameters");
std::string const cname =
arangodb::basics::VelocyPackHelper::getStringValue(parameters, "name", "");
if (cname == "_users") {
// special case: never restore data in the _users collection first as it could
// potentially change user permissions. In that case index creation will fail.
result = ::restoreIndexes(httpClient, jobData); result = ::restoreIndexes(httpClient, jobData);
if (result.fail()) { if (result.fail()) {
return result; return result;
} }
}
if (jobData.options.importData) {
result = ::restoreData(httpClient, jobData); result = ::restoreData(httpClient, jobData);
if (result.fail()) { if (result.fail()) {
return result; return result;
} }
} } else {
if (!jobData.options.indexesFirst && jobData.options.importStructure) { if (jobData.options.indexesFirst && jobData.options.importStructure) {
// restore indexes second if we are using mmfiles // restore indexes first if we are using rocksdb
result = ::restoreIndexes(httpClient, jobData); result = ::restoreIndexes(httpClient, jobData);
if (result.fail()) { if (result.fail()) {
return result; return result;
}
}
if (jobData.options.importData) {
result = ::restoreData(httpClient, jobData);
if (result.fail()) {
return result;
}
}
if (!jobData.options.indexesFirst && jobData.options.importStructure) {
// restore indexes second if we are using mmfiles
result = ::restoreIndexes(httpClient, jobData);
if (result.fail()) {
return result;
}
} }
} }
++jobData.stats.restoredCollections; ++jobData.stats.restoredCollections;
if (jobData.options.progress) { if (jobData.options.progress) {