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

fixing bug when removing simple config

This commit is contained in:
Josh Slocum 2021-10-26 16:34:23 -05:00
parent c39c631d50
commit 51c0f78b59
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fdbserver/workloads/ConsistencyCheck.actor.cpp
View File

@ -1996,25 +1996,24 @@ struct ConsistencyCheckWorkload : TestWorkload {
int numBlobWorkerProcesses = 0;
for (const auto& worker : workers) {
NetworkAddress addr = worker.interf.stableAddress();
bool inCCDc = worker.interf.locality.dcId() == ccDcId;
if (!configuration.isExcludedServer(worker.interf.addresses())) {
if (worker.processClass == ProcessClass::BlobWorkerClass) {
numBlobWorkerProcesses++;
// this is a worker with processClass == BWClass, so should have exactly one blob worker
if (blobWorkersByAddr[addr] == 0) {
TraceEvent("ConsistencyCheck_NoBWsOnBWClass")
// this is a worker with processClass == BWClass, so should have exactly one blob worker if it's in
// the same DC
int desiredBlobWorkersOnAddr = inCCDc ? 1 : 0;
if (blobWorkersByAddr[addr] != desiredBlobWorkersOnAddr) {
TraceEvent("ConsistencyCheck_WrongBWCountOnBWClass")
.detail("Address", addr)
.detail("NumBlobWorkersOnAddr", blobWorkersByAddr[addr]);
.detail("NumBlobWorkersOnAddr", blobWorkersByAddr[addr])
.detail("DesiredBlobWorkersOnAddr", desiredBlobWorkersOnAddr)
.detail("BwDcId", worker.interf.locality.dcId())
.detail("CcDcId", ccDcId);
return false;
}
/* TODO: replace above code with this once blob manager recovery is handled
if (blobWorkersByAddr[addr] != 1) {
TraceEvent("ConsistencyCheck_NoBWOrManyBWsOnBWClass")
.detail("Address", addr)
.detail("NumBlobWorkersOnAddr", blobWorkersByAddr[addr]);
return false;
}
*/
} else {
// this is a worker with processClass != BWClass, so there should be no BWs on it
if (blobWorkersByAddr[addr] > 0) {