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

fix merge conflict

This commit is contained in:
Markus Pilman 2022-04-10 14:16:21 -06:00
parent 16467262f0
commit 64ac66c1d0
3 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fdbclient/StorageServerInterface.h
View File

@ -158,13 +158,9 @@ public:
checkpoint =
PublicRequestStream<struct GetCheckpointRequest>(getValue.getEndpoint().getAdjustedEndpoint(19));
fetchCheckpoint =
<<<<<<< variant A
PublicRequestStream<struct FetchCheckpointRequest>(getValue.getEndpoint().getAdjustedEndpoint(20));
>>>>>>> variant B
RequestStream<struct FetchCheckpointRequest>(getValue.getEndpoint().getAdjustedEndpoint(20));
fetchCheckpointKeyValues = RequestStream<struct FetchCheckpointKeyValuesRequest>(
fetchCheckpointKeyValues = PublicRequestStream<struct FetchCheckpointKeyValuesRequest>(
getValue.getEndpoint().getAdjustedEndpoint(21));
======= end
}
} else {
ASSERT(Ar::isDeserializing);

2
fdbrpc/sim2.actor.cpp
View File

@ -445,7 +445,7 @@ private:
TraceEvent(SevError, "LeakedConnection", self->dbgid)
.error(connection_leaked())
.detail("MyAddr", self->process->address)
.detail("IsPublic", self->process->address.isPublic())
.detail("IsPublic", self->process->address.isPublic())
.detail("PeerAddr", self->peerEndpoint)
.detail("PeerId", self->peerId)
.detail("Opened", self->opened);

26
fdbserver/workloads/ClientWorkload.actor.cpp
View File

@ -32,9 +32,7 @@ class WorkloadProcessState {
Future<Void> processActor;
Promise<Void> init;
WorkloadProcessState(int clientId) : clientId(clientId) {
processActor = processStart(this);
}
WorkloadProcessState(int clientId) : clientId(clientId) { processActor = processStart(this); }
~WorkloadProcessState() {
TraceEvent("ShutdownClientForWorkload", id).log();
@ -64,17 +62,19 @@ class WorkloadProcessState {
auto locality = LocalityData(Optional<Standalone<StringRef>>(), newZoneId, newZoneId, parent->locality.dcId());
auto dataFolder = joinPath(popPath(parent->dataFolder), deterministicRandom()->randomUniqueID().toString());
platform::createDirectory(dataFolder);
TraceEvent("StartingClientForWorkload", self->id).detail("Name", self->processName).detail("Address", self->childAddress);
TraceEvent("StartingClientForWorkload", self->id)
.detail("Name", self->processName)
.detail("Address", self->childAddress);
self->childProcess = g_simulator.newProcess(self->processName.c_str(),
self->childAddress,
1,
parent->address.isTLS(),
1,
locality,
ProcessClass(ProcessClass::TesterClass, ProcessClass::AutoSource),
dataFolder.c_str(),
parent->coordinationFolder,
parent->protocolVersion);
self->childAddress,
1,
parent->address.isTLS(),
1,
locality,
ProcessClass(ProcessClass::TesterClass, ProcessClass::AutoSource),
dataFolder.c_str(),
parent->coordinationFolder,
parent->protocolVersion);
self->childProcess->excludeFromRestarts = true;
wait(g_simulator.onProcess(self->childProcess, TaskPriority::DefaultYield));
try {