wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4691 from RenxuanW/first-consistent-version 

Add first consistent version in restore status.
This commit is contained in:
Steve Atherton 2021-04-21 17:46:13 -07:00 committed by GitHub
parent 6109f24c97 bc43fa99ac
commit 4ff714efbd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fdbclient/FileBackupAgent.actor.cpp
View File

@ -150,6 +150,7 @@ public:
KeyBackedProperty<Key> batchFuture() { return configSpace.pack(LiteralStringRef(__FUNCTION__)); } KeyBackedProperty<Key> batchFuture() { return configSpace.pack(LiteralStringRef(__FUNCTION__)); }
KeyBackedProperty<Version> beginVersion() { return configSpace.pack(LiteralStringRef(__FUNCTION__)); } KeyBackedProperty<Version> beginVersion() { return configSpace.pack(LiteralStringRef(__FUNCTION__)); }
KeyBackedProperty<Version> restoreVersion() { return configSpace.pack(LiteralStringRef(__FUNCTION__)); } KeyBackedProperty<Version> restoreVersion() { return configSpace.pack(LiteralStringRef(__FUNCTION__)); }
KeyBackedProperty<Version> firstConsistentVersion() { return configSpace.pack(LiteralStringRef(__FUNCTION__)); }
KeyBackedProperty<Reference<IBackupContainer>> sourceContainer() { KeyBackedProperty<Reference<IBackupContainer>> sourceContainer() {
return configSpace.pack(LiteralStringRef(__FUNCTION__)); return configSpace.pack(LiteralStringRef(__FUNCTION__));
@ -358,6 +359,7 @@ ACTOR Future<std::string> RestoreConfig::getProgress_impl(RestoreConfig restore,
state Future<StringRef> status = restore.stateText(tr); state Future<StringRef> status = restore.stateText(tr);
state Future<Version> currentVersion = restore.getCurrentVersion(tr); state Future<Version> currentVersion = restore.getCurrentVersion(tr);
state Future<Version> lag = restore.getApplyVersionLag(tr); state Future<Version> lag = restore.getApplyVersionLag(tr);
state Future<Version> firstConsistentVersion = restore.firstConsistentVersion().getD(tr);
state Future<std::string> tag = restore.tag().getD(tr); state Future<std::string> tag = restore.tag().getD(tr);
state Future<std::pair<std::string, Version>> lastError = restore.lastError().getD(tr); state Future<std::pair<std::string, Version>> lastError = restore.lastError().getD(tr);
@ -365,7 +367,7 @@ ACTOR Future<std::string> RestoreConfig::getProgress_impl(RestoreConfig restore,
state UID uid = restore.getUid(); state UID uid = restore.getUid();
wait(success(fileCount) && success(fileBlockCount) && success(fileBlocksDispatched) && wait(success(fileCount) && success(fileBlockCount) && success(fileBlocksDispatched) &&
success(fileBlocksFinished) && success(bytesWritten) && success(status) && success(currentVersion) && success(fileBlocksFinished) && success(bytesWritten) && success(status) && success(currentVersion) &&
success(lag) && success(tag) && success(lastError)); success(lag) && success(firstConsistentVersion) && success(tag) && success(lastError));
std::string errstr = "None"; std::string errstr = "None";
if (lastError.get().second != 0) if (lastError.get().second != 0)
@ -383,11 +385,12 @@ ACTOR Future<std::string> RestoreConfig::getProgress_impl(RestoreConfig restore,
.detail("FileBlocksInProgress", fileBlocksDispatched.get() - fileBlocksFinished.get()) .detail("FileBlocksInProgress", fileBlocksDispatched.get() - fileBlocksFinished.get())
.detail("BytesWritten", bytesWritten.get()) .detail("BytesWritten", bytesWritten.get())
.detail("CurrentVersion", currentVersion.get()) .detail("CurrentVersion", currentVersion.get())
.detail("FirstConsistentVersion", firstConsistentVersion.get())
.detail("ApplyLag", lag.get()) .detail("ApplyLag", lag.get())
.detail("TaskInstance", THIS_ADDR); .detail("TaskInstance", THIS_ADDR);
return format("Tag: %s UID: %s State: %s Blocks: %lld/%lld BlocksInProgress: %lld Files: %lld BytesWritten: " return format("Tag: %s UID: %s State: %s Blocks: %lld/%lld BlocksInProgress: %lld Files: %lld BytesWritten: "
"%lld CurrentVersion: %lld ApplyVersionLag: %lld LastError: %s", "%lld CurrentVersion: %lld FirstConsistentVersion: %lld ApplyVersionLag: %lld LastError: %s",
tag.get().c_str(), tag.get().c_str(),
uid.toString().c_str(), uid.toString().c_str(),
status.get().toString().c_str(), status.get().toString().c_str(),
@ -397,6 +400,7 @@ ACTOR Future<std::string> RestoreConfig::getProgress_impl(RestoreConfig restore,
fileCount.get(), fileCount.get(),
bytesWritten.get(), bytesWritten.get(),
currentVersion.get(), currentVersion.get(),
firstConsistentVersion.get(),
lag.get(), lag.get(),
errstr.c_str()); errstr.c_str());
} }
@ -4105,7 +4109,7 @@ struct StartFullRestoreTaskFunc : RestoreTaskFuncBase {
for (auto const& r : ranges) { for (auto const& r : ranges) {
keyRangesFilter.push_back_deep(keyRangesFilter.arena(), KeyRangeRef(r)); keyRangesFilter.push_back_deep(keyRangesFilter.arena(), KeyRangeRef(r));
} }
Optional<RestorableFileSet> restorable = state Optional<RestorableFileSet> restorable =
wait(bc->getRestoreSet(restoreVersion, keyRangesFilter, incremental, beginVersion)); wait(bc->getRestoreSet(restoreVersion, keyRangesFilter, incremental, beginVersion));
if (!incremental) { if (!incremental) {
beginVersion = restorable.get().snapshot.beginVersion; beginVersion = restorable.get().snapshot.beginVersion;
@ -4121,8 +4125,22 @@ struct StartFullRestoreTaskFunc : RestoreTaskFuncBase {
// Order does not matter, they will be put in order when written to the restoreFileMap below. // Order does not matter, they will be put in order when written to the restoreFileMap below.
state std::vector<RestoreConfig::RestoreFile> files; state std::vector<RestoreConfig::RestoreFile> files;
state Version firstConsistentVersion = beginVersion;
for (const RangeFile& f : restorable.get().ranges) { for (const RangeFile& f : restorable.get().ranges) {
files.push_back({ f.version, f.fileName, true, f.blockSize, f.fileSize }); files.push_back({ f.version, f.fileName, true, f.blockSize, f.fileSize });
firstConsistentVersion = std::max(firstConsistentVersion, f.version);
}
tr->reset();
loop {
try {
tr->setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
tr->setOption(FDBTransactionOptions::LOCK_AWARE);
restore.firstConsistentVersion().set(tr, firstConsistentVersion);
wait(tr->commit());
break;
} catch (Error& e) {
wait(tr->onError(e));
}
} }
if (!CLIENT_KNOBS->RESTORE_IGNORE_LOG_FILES) { if (!CLIENT_KNOBS->RESTORE_IGNORE_LOG_FILES) {