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

Merge pull request #173 from bmuppana/master 

Backup log messages.
This commit is contained in:
Stephen Atherton 2017-10-13 18:31:53 -07:00 committed by GitHub Enterprise
parent 1f90a27acf d1e9d28239
commit 68eccb681e
3 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
fdbclient/BackupAgent.h
View File

@ -67,28 +67,6 @@ public:
static const int logHeaderSize;
// The following function will return the textual name of the
// start status
static const char* getResultText(enumActionResult enResult)
{
switch (enResult)
{
case RESULT_SUCCESSFUL:
return "action was successful";
break;
case RESULT_ERRORED:
return "error received during action process";
break;
case RESULT_DUPLICATE:
return "requested action has already been performed";
break;
case RESULT_UNNEEDED:
return "requested action is not needed";
break;
}
return "<undefined>";
}
// Convert the status text to an enumerated value
static enumState getState(std::string stateText)
{
@ -184,11 +162,7 @@ public:
return isRunnable;
}
static bool isRunnable(std::string stateText) {
return isRunnable(getState(stateText));
}
static const KeyRef getDefaultTag() {
static const KeyRef getDefaultTag() {
return StringRef(defaultTagName);
}

13
fdbclient/FileBackupAgent.actor.cpp
View File

@ -3233,6 +3233,11 @@ public:
tr->setOption(FDBTransactionOptions::ACCESS_SYSTEM_KEYS);
tr->setOption(FDBTransactionOptions::LOCK_AWARE);
TraceEvent(SevInfo, "FBA_submitBackup")
.detail("tagName", tagName.c_str())
.detail("stopWhenDone", stopWhenDone)
.detail("outContainer", outContainer.toString());
state KeyBackedTag tag = makeBackupTag(tagName);
Optional<UidAndAbortedFlagT> uidAndAbortedFlag = wait(tag.get(tr));
if (uidAndAbortedFlag.present()) {
@ -3432,6 +3437,10 @@ public:
throw backup_unneeded();
}
TraceEvent(SevInfo, "FBA_discontinueBackup")
.detail("tagName", tag.tagName.c_str())
.detail("status", BackupAgentBase::getStateText(status));
state bool stopWhenDone = wait(config.stopWhenDone().getOrThrow(tr));
if (stopWhenDone) {
@ -3457,6 +3466,10 @@ public:
throw backup_unneeded();
}
TraceEvent(SevInfo, "FBA_abortBackup")
.detail("tagName", tagName.c_str())
.detail("status", BackupAgentBase::getStateText(status));
// Cancel backup task through tag
Void _ = wait(tag.cancel(tr));

15
fdbserver/workloads/BackupCorrectness.actor.cpp
View File

@ -73,7 +73,7 @@ struct BackupAndRestoreCorrectnessWorkload : TestWorkload {
backupRanges.push_back_deep(backupRanges.arena(), KeyRangeRef(start, *i));
// Track the added range
TraceEvent("BackupCorrectness_Range", randomID).detail("rangeBegin", (beginRange < endRange) ? printable(beginRange) : printable(endRange))
TraceEvent("BARW_BackupCorrectness_Range", randomID).detail("rangeBegin", (beginRange < endRange) ? printable(beginRange) : printable(endRange))
.detail("rangeEnd", (beginRange < endRange) ? printable(endRange) : printable(beginRange));
}
}
@ -90,6 +90,19 @@ struct BackupAndRestoreCorrectnessWorkload : TestWorkload {
virtual Future<Void> start(Database const& cx) {
if (clientId != 0)
return Void();
TraceEvent(SevInfo, "BARW_Param").detail("locked", locked);
TraceEvent(SevInfo, "BARW_Param").detail("backupAfter", backupAfter);
TraceEvent(SevInfo, "BARW_Param").detail("restoreAfter", restoreAfter);
TraceEvent(SevInfo, "BARW_Param").detail("performRestore", performRestore);
TraceEvent(SevInfo, "BARW_Param").detail("backupTag", printable(backupTag).c_str());
TraceEvent(SevInfo, "BARW_Param").detail("backupRangesCount", backupRangesCount);
TraceEvent(SevInfo, "BARW_Param").detail("backupRangeLengthMax", backupRangeLengthMax);
TraceEvent(SevInfo, "BARW_Param").detail("abortAndRestartAfter", abortAndRestartAfter);
TraceEvent(SevInfo, "BARW_Param").detail("differentialBackup", differentialBackup);
TraceEvent(SevInfo, "BARW_Param").detail("stopDifferentialAfter", stopDifferentialAfter);
TraceEvent(SevInfo, "BARW_Param").detail("agentRequest", agentRequest);
return _start(cx, this);
}