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

Remove getRecoveryInfo from master interface.

This commit is contained in:
Jingyu Zhou 2019-01-19 16:37:40 -08:00 committed by Jingyu Zhou
parent f5242bda7c
commit aea602d9c7
2 changed files with 1 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
fdbserver/MasterInterface.h
View File

@ -36,7 +36,6 @@ struct MasterInterface {
RequestStream< struct TLogRejoinRequest > tlogRejoin; // sent by tlog (whether or not rebooted) to communicate with a new master
RequestStream< struct ChangeCoordinatorsRequest > changeCoordinators;
RequestStream< struct GetCommitVersionRequest > getCommitVersion;
RequestStream< struct GetRecoveryInfoRequest > getRecoveryInfo;
NetworkAddress address() const { return changeCoordinators.getEndpoint().address; }
@ -44,7 +43,7 @@ struct MasterInterface {
template <class Archive>
void serialize(Archive& ar) {
ASSERT( ar.protocolVersion() >= 0x0FDB00A200040001LL );
serializer(ar, locality, waitFailure, tlogRejoin, changeCoordinators, getCommitVersion, getRecoveryInfo);
serializer(ar, locality, waitFailure, tlogRejoin, changeCoordinators, getCommitVersion);
}
void initEndpoints() {
@ -134,31 +133,6 @@ struct GetCommitVersionRequest {
}
};
struct GetRecoveryInfoReply {
Version recoveryTransactionVersion;
DatabaseConfiguration configuration;
GetRecoveryInfoReply() : recoveryTransactionVersion(invalidVersion) {}
explicit GetRecoveryInfoReply(Version v, DatabaseConfiguration c) : recoveryTransactionVersion(v), configuration(c) {}
template <class Ar>
void serialize(Ar& ar) {
serializer(ar, recoveryTransactionVersion, configuration);
}
};
struct GetRecoveryInfoRequest {
UID reqId;
ReplyPromise<GetRecoveryInfoReply> reply;
GetRecoveryInfoRequest() {}
explicit GetRecoveryInfoRequest(UID id) : reqId(id) {}
template <class Ar>
void serialize(Ar& ar) {
serializer(ar, reqId, reply);
}
};
struct LifetimeToken {
UID ccID;
int64_t count;

12
fdbserver/masterserver.actor.cpp
View File

@ -911,16 +911,6 @@ ACTOR Future<Void> provideVersions(Reference<MasterData> self) {
}
}
ACTOR Future<Void> provideRecoveryInfo( Reference<MasterData> self ) {
loop choose {
when( GetRecoveryInfoRequest req = waitNext(self->myInterface.getRecoveryInfo.getFuture()) ) {
TraceEvent("MasterGetRecoveryInfo", self->dbgid).detail("ReqID", req.reqId);
GetRecoveryInfoReply reply(self->recoveryTransactionVersion, self->configuration);
req.reply.send( reply );
}
}
}
std::pair<KeyRangeRef, bool> findRange( CoalescedKeyRangeMap<int>& key_resolver, Standalone<VectorRef<ResolverMoveRef>>& movedRanges, int src, int dest ) {
auto ranges = key_resolver.ranges();
auto prev = ranges.begin();
@ -1358,8 +1348,6 @@ ACTOR Future<Void> masterCore( Reference<MasterData> self ) {
.detail("RecoveryDuration", recoveryDuration)
.trackLatest("MasterRecoveryState");
self->addActor.send( provideRecoveryInfo(self) );
if( self->resolvers.size() > 1 )
self->addActor.send( resolutionBalancing(self) );