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

Merge pull request #11571 from jzhou77/fix

This commit is contained in:
Jingyu Zhou 2024-08-13 19:53:40 -07:00 committed by GitHub
parent a12b8a7ffc d0b6430a69
commit e1781b5234
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fdbcli/ExcludeCommand.actor.cpp
View File

@ -42,6 +42,7 @@ ACTOR Future<bool> excludeServersAndLocalities(Reference<IDatabase> db,
state Reference<ITransaction> tr = db->createTransaction();
loop {
tr->setOption(FDBTransactionOptions::SPECIAL_KEY_SPACE_ENABLE_WRITES);
tr->setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
try {
if (force && servers.size())
tr->set(failed ? fdb_cli::failedForceOptionSpecialKey : fdb_cli::excludedForceOptionSpecialKey,
@ -78,6 +79,7 @@ ACTOR Future<bool> excludeServersAndLocalities(Reference<IDatabase> db,
: "Type `exclude FORCE failed <ADDRESS...>' to exclude without performing safety checks.");
return false;
}
TraceEvent(SevWarn, "ExcludeServersAndLocalitiesError").error(err);
wait(safeThreadFutureToFuture(tr->onError(err)));
}
}
@ -99,6 +101,7 @@ ACTOR Future<std::vector<std::string>> getExcludedServers(Reference<IDatabase> d
}
return exclusions;
} catch (Error& e) {
TraceEvent(SevWarn, "GetExcludedServersError").error(e);
wait(safeThreadFutureToFuture(tr->onError(e)));
}
}
@ -164,6 +167,7 @@ ACTOR Future<std::vector<std::string>> getFailedLocalities(Reference<IDatabase>
}
return excludedLocalities;
} catch (Error& e) {
TraceEvent(SevWarn, "GetExcludedLocalitiesError").error(e);
wait(safeThreadFutureToFuture(tr->onError(e)));
}
}
@ -221,6 +225,7 @@ ACTOR Future<std::set<NetworkAddress>> checkForExcludingServers(Reference<IDatab
wait(delayJittered(1.0)); // SOMEDAY: watches!
} catch (Error& e) {
TraceEvent(SevWarn, "CheckForExcludingServersError").error(e);
wait(safeThreadFutureToFuture(tr->onError(e)));
}
}
@ -241,6 +246,7 @@ ACTOR Future<Void> checkForCoordinators(Reference<IDatabase> db, std::set<Addres
coordinatorList = NetworkAddress::parseList(coordinators.get().toString());
break;
} catch (Error& e) {
TraceEvent(SevWarn, "CheckForCoordinatorsError").error(e);
wait(safeThreadFutureToFuture(tr->onError(e)));
}
}

2
fdbcli/Util.actor.cpp
View File

@ -148,6 +148,7 @@ ACTOR Future<bool> getWorkers(Reference<IDatabase> db, std::vector<ProcessData>*
return true;
} catch (Error& e) {
TraceEvent(SevWarn, "GetWorkersError").error(e);
wait(safeThreadFutureToFuture(tr->onError(e)));
}
}
@ -174,6 +175,7 @@ ACTOR Future<Void> getStorageServerInterfaces(Reference<IDatabase> db,
}
return Void();
} catch (Error& e) {
TraceEvent(SevWarn, "GetStorageServerInterfacesError").error(e);
wait(safeThreadFutureToFuture(tr->onError(e)));
}
}