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

AtomicOp:Debug

This commit is contained in:
Meng Xu 2020-01-22 15:02:20 -08:00
parent c4a11597cf
commit bffb4e380d
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fdbserver/RestoreMaster.actor.cpp
View File

@ -246,8 +246,8 @@ ACTOR static Future<Version> processRestoreRequest(Reference<RestoreMasterData>
std::sort(rangeFiles.begin(), rangeFiles.end());
std::sort(logFiles.begin(), logFiles.end(), [](RestoreFileFR const& f1, RestoreFileFR const& f2) -> bool {
return std::tie(f1.endVersion, f1.beginVersion, f1.fileIndex) <
std::tie(f2.endVersion, f2.beginVersion, f2.fileIndex);
return std::tie(f1.endVersion, f1.beginVersion, f1.fileIndex, f1.fileName) <
std::tie(f2.endVersion, f2.beginVersion, f2.fileIndex, f2.fileName);
});
self->buildVersionBatches(rangeFiles, logFiles, &self->versionBatches); // Divide files into version batches

5
fdbserver/workloads/AtomicOps.actor.cpp
View File

@ -26,6 +26,8 @@
#include "fdbserver/workloads/workloads.actor.h"
#include "flow/actorcompiler.h" // This must be the last #include.
#define SevAtomicOpDebug SevInfo
struct AtomicOpsWorkload : TestWorkload {
int opNum, actorCount, nodeCount;
uint32_t opType;
@ -182,7 +184,7 @@ struct AtomicOpsWorkload : TestWorkload {
try {
int group = deterministicRandom()->randomInt(0,100);
state uint64_t intValue = deterministicRandom()->randomInt(0, 10000000);
Key val = StringRef((const uint8_t*) &intValue, sizeof(intValue));
state Key val = StringRef((const uint8_t*) &intValue, sizeof(intValue));
state std::pair<Key, Key> logDebugKey = self->logDebugKey(group);
int nodeIndex = deterministicRandom()->randomInt(0, self->nodeCount / 100);
state Key opsKey(format("ops%08x%08x", group, nodeIndex));
@ -190,6 +192,7 @@ struct AtomicOpsWorkload : TestWorkload {
tr.set(logDebugKey.second, opsKey); // set debug key; one opsKey can have multiple logs key
tr.atomicOp(opsKey, val, self->opType);
wait( tr.commit() );
TraceEvent(SevAtomicOpDebug, "AtomicOpWorker").detail("OpsKey", opsKey).detail("LogKey", logDebugKey.first).detail("Value", val.toString());
if (self->opType == MutationRef::AddValue) {
self->lbsum += intValue;
self->ubsum += intValue;