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

Merge branch 'block-down' of github.com:sfc-gh-bvr/foundationdb into block-down

This commit is contained in:
Bharadwaj V.R 2022-04-12 10:35:53 -07:00
parent 95754fe650 5d103d5f7b
commit 775fd4a027
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fdbclient/SystemData.cpp
View File

@ -619,7 +619,7 @@ StorageServerInterface decodeServerListValue(ValueRef const& value) {
return decodeServerListValueFB(value);
}
const Value swVersionValue(SWVersion const& swversion) {
Value swVersionValue(SWVersion const& swversion) {
auto protocolVersion = currentProtocolVersion;
protocolVersion.addObjectSerializerFlag();
return ObjectWriter::toValue(swversion, IncludeVersion(protocolVersion));

2
fdbclient/SystemData.h
View File

@ -205,7 +205,7 @@ const Value serverListValue(StorageServerInterface const&);
UID decodeServerListKey(KeyRef const&);
StorageServerInterface decodeServerListValue(ValueRef const&);
const Value swVersionValue(SWVersion const& swversion);
Value swVersionValue(SWVersion const& swversion);
SWVersion decodeSWVersionValue(ValueRef const&);
// "\xff/processClass/[[processID]]" := "[[ProcessClass]]"

5
fdbserver/worker.actor.cpp
View File

@ -3201,10 +3201,7 @@ ACTOR Future<Void> fdbd(Reference<IClusterConnectionRecord> connRecord,
localities.set(LocalityData::keyProcessId, processIDUid.toString());
// Only one process can execute on a dataFolder from this point onwards
ErrorOr<Void> f = wait(errorOr(testAndUpdateSoftwareVersionCompatibility(dataFolder, processIDUid)));
if (f.isError()) {
throw f.getError();
}
wait(testAndUpdateSoftwareVersionCompatibility(dataFolder, processIDUid));
std::string fitnessFilePath = joinPath(dataFolder, "fitness");
auto cc = makeReference<AsyncVar<Optional<ClusterControllerFullInterface>>>();