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

fixing system priority flags usage (#9819)

This commit is contained in:
Josh Slocum 2023-03-28 14:46:20 -05:00 committed by GitHub
parent 56a26b4229
commit ed722ce1c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fdbserver/BlobManager.actor.cpp
View File

@ -3181,12 +3181,12 @@ ACTOR Future<Void> checkBlobWorkerList(Reference<BlobManagerData> bmData, Promis
// Get list of last known blob workers // Get list of last known blob workers
// note: the list will include every blob worker that the old manager knew about, // note: the list will include every blob worker that the old manager knew about,
// but it might also contain blob workers that died while the new manager was being recruited // but it might also contain blob workers that died while the new manager was being recruited
state std::vector<BlobWorkerInterface> blobWorkers = wait(getBlobWorkers(bmData->db)); state std::vector<BlobWorkerInterface> blobWorkers = wait(getBlobWorkers(bmData->db, true));
// We could get the affinity list transactionally with the blob workers, however it is simpilier from an API // We could get the affinity list transactionally with the blob workers, however it is simpilier from an API
// perspective to get the affinities after the blob worker list, which ensures we will have the affinity for // perspective to get the affinities after the blob worker list, which ensures we will have the affinity for
// every worker returned. // every worker returned.
std::vector<std::pair<UID, UID>> blobWorkerAffinities = wait(getBlobWorkerAffinity(bmData->db)); std::vector<std::pair<UID, UID>> blobWorkerAffinities = wait(getBlobWorkerAffinity(bmData->db, true));
bmData->workerAffinities.clear(); bmData->workerAffinities.clear();
for (auto& it : blobWorkerAffinities) { for (auto& it : blobWorkerAffinities) {
bmData->workerAffinities[it.second] = it.first; bmData->workerAffinities[it.second] = it.first;
@ -4145,7 +4145,7 @@ ACTOR Future<Void> blobWorkerRecruiter(
} }
ACTOR Future<Void> haltBlobGranules(Reference<BlobManagerData> bmData) { ACTOR Future<Void> haltBlobGranules(Reference<BlobManagerData> bmData) {
std::vector<BlobWorkerInterface> blobWorkers = wait(getBlobWorkers(bmData->db)); std::vector<BlobWorkerInterface> blobWorkers = wait(getBlobWorkers(bmData->db, true));
std::vector<Future<Void>> deregisterBlobWorkers; std::vector<Future<Void>> deregisterBlobWorkers;
for (auto& worker : blobWorkers) { for (auto& worker : blobWorkers) {
bmData->addActor.send(haltBlobWorker(bmData, worker)); bmData->addActor.send(haltBlobWorker(bmData, worker));

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

@ -1162,7 +1162,7 @@ struct ConsistencyCheckWorkload : TestWorkload {
ACTOR Future<bool> checkBlobWorkers(Database cx, ACTOR Future<bool> checkBlobWorkers(Database cx,
DatabaseConfiguration configuration, DatabaseConfiguration configuration,
ConsistencyCheckWorkload* self) { ConsistencyCheckWorkload* self) {
state std::vector<BlobWorkerInterface> blobWorkers = wait(getBlobWorkers(cx)); state std::vector<BlobWorkerInterface> blobWorkers = wait(getBlobWorkers(cx, true));
state std::vector<WorkerDetails> workers = wait(getWorkers(self->dbInfo)); state std::vector<WorkerDetails> workers = wait(getWorkers(self->dbInfo));
// process addr -> num blob workers on that process // process addr -> num blob workers on that process