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

Remove invalid assertion from ConfigBroadcastSnapshotRequest handling

This commit is contained in:
sfc-gh-tclinkenbeard 2021-08-18 13:24:00 -07:00
parent e0981e71b2
commit 62303af832
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fdbserver/ConfigBroadcaster.actor.cpp
View File

@ -106,7 +106,7 @@ class ConfigBroadcasterImpl {
TraceEvent(SevDebug, "ConfigBroadcasterSnapshotRequest", id)
.detail("Size", request.snapshot.size())
.detail("Version", request.version);
return success(client.broadcastInterface.snapshot.getReply(request));
return success(brokenPromiseToNever(client.broadcastInterface.snapshot.getReply(request)));
}
template <class Changes>

6
fdbserver/LocalConfiguration.actor.cpp
View File

@ -283,7 +283,11 @@ class LocalConfigurationImpl {
loop {
choose {
when(ConfigBroadcastSnapshotRequest snapshotReq = waitNext(broadcaster.snapshot.getFuture())) {
ASSERT_GT(snapshotReq.version, self->lastSeenVersion);
if (snapshotReq.version <= self->lastSeenVersion) {
TraceEvent(SevWarnAlways, "LocalConfigGotOldSnapshot")
.detail("NewSnapshotVersion", snapshotReq.version)
.detail("LastSeenVersion", self->lastSeenVersion);
}
++self->snapshots;
wait(setSnapshot(self, std::move(snapshotReq.snapshot), snapshotReq.version));
}