apple/foundationdb
1
0
Fork 0
mirror of https://github.com/apple/foundationdb.git synced 2025-05-15 10:22:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Disable remote kvs if RocksDB is used

Browse Source
This commit is contained in:
Chaoguang Lin 2022-04-06 15:09:22 -07:00
parent 7aff4e5fad
commit f62904187e
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fdbserver/worker.actor.cpp
View File

@ -210,18 +210,10 @@ ACTOR Future<Void> handleIOErrors(Future<Void> actor, IClosable* store, UID id,
state Future<ErrorOr<Void>> storeError = actor.isReady() ? Never() : errorOr(store->getError()); state Future<ErrorOr<Void>> storeError = actor.isReady() ? Never() : errorOr(store->getError());
choose { choose {
when(state ErrorOr<Void> e = wait(errorOr(actor))) { when(state ErrorOr<Void> e = wait(errorOr(actor))) {
TraceEvent(SevDebug, "HandleIOErrorsActorIsReady")
.detail("Error", e.isError() ? e.getError().code() : -1)
.detail("UID", id);
if (e.isError() && e.getError().code() == error_code_please_reboot) { if (e.isError() && e.getError().code() == error_code_please_reboot) {
// no need to wait. // no need to wait.
} else { } else {
TraceEvent(SevDebug, "HandleIOErrorsActorBeforeOnClosed").detail("IsClosed", onClosed.isReady());
wait(onClosed); wait(onClosed);
TraceEvent(SevDebug, "HandleIOErrorsActorOnClosedFinished")
.detail("StoreError",
storeError.isReady() ? (storeError.get().isError() ? storeError.get().getError().code() : 0)
: -1);
} }
if (e.isError() && e.getError().code() == error_code_broken_promise && !storeError.isReady()) { if (e.isError() && e.getError().code() == error_code_broken_promise && !storeError.isReady()) {
wait(delay(0.00001 + FLOW_KNOBS->MAX_BUGGIFIED_DELAY)); wait(delay(0.00001 + FLOW_KNOBS->MAX_BUGGIFIED_DELAY));
@ -1575,7 +1567,10 @@ ACTOR Future<Void> workerServer(Reference<IClusterConnectionRecord> connRecord,
false, false,
validateDataFiles, validateDataFiles,
SERVER_KNOBS->REMOTE_KV_STORE && /* testing mixed mode in simulation if remote kvs enabled */ SERVER_KNOBS->REMOTE_KV_STORE && /* testing mixed mode in simulation if remote kvs enabled */
(g_network->isSimulated() ? deterministicRandom()->coinflip() : true)); (g_network->isSimulated()
? (/* Disable for RocksDB */ s.storeType != KeyValueStoreType::SSD_ROCKSDB_V1 &&
deterministicRandom()->coinflip())
: true));
Future<Void> kvClosed = kv->onClosed(); Future<Void> kvClosed = kv->onClosed();
filesClosed.add(kvClosed); filesClosed.add(kvClosed);
@ -2148,7 +2143,10 @@ ACTOR Future<Void> workerServer(Reference<IClusterConnectionRecord> connRecord,
false, false,
false, false,
SERVER_KNOBS->REMOTE_KV_STORE && /* testing mixed mode in simulation if remote kvs enabled */ SERVER_KNOBS->REMOTE_KV_STORE && /* testing mixed mode in simulation if remote kvs enabled */
(g_network->isSimulated() ? deterministicRandom()->coinflip() : true)); (g_network->isSimulated()
? (/* Disable for RocksDB */ req.storeType != KeyValueStoreType::SSD_ROCKSDB_V1 &&
deterministicRandom()->coinflip())
: true));
Future<Void> kvClosed = data->onClosed(); Future<Void> kvClosed = data->onClosed();
filesClosed.add(kvClosed); filesClosed.add(kvClosed);

1
tests/fast/PhysicalShardMove.toml
View File

@ -4,7 +4,6 @@ storageEngineType = 4
processesPerMachine = 1 processesPerMachine = 1
coordinators = 3 coordinators = 3
machineCount = 15 machineCount = 15
disableRemoteKVS = true
[[test]] [[test]]
testTitle = 'PhysicalShardMove' testTitle = 'PhysicalShardMove'