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

Ignore data move conflict on TSS in simulation.

This commit is contained in:
He Liu 2024-10-15 13:38:05 -07:00 committed by Jingyu Zhou
parent 7290369aac
commit f7fe09c577
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fdbserver/storageserver.actor.cpp
View File

@ -10583,7 +10583,11 @@ void changeServerKeysWithPhysicalShards(StorageServer* data,
.detailf("CurrentShard", "%016llx", shard->desiredShardId)
.detail("IsTSS", data->isTss())
.detail("Version", cVer);
throw data_move_conflict();
if (data->isTss() && g_network->isSimulated()) {
throw please_reboot();
} else {
throw data_move_conflict();
}
} else {
TraceEvent(SevInfo, "CSKMoveInToSameShard", data->thisServerID)
.detail("DataMoveID", dataMoveId)