Fork TLogServer into TLogServer_6_2

This prepares us for incoming modifications to the TLog that can't
easily coexist with our current on-disk state.
This commit is contained in:
Alex Miller 2019-10-02 16:41:00 -07:00
parent d41852abbc
commit 60fb04ca68
5 changed files with 2860 additions and 1 deletions

View File

@ -53,6 +53,7 @@ set(FDBSERVER_SRCS
NetworkTest.h
OldTLogServer_4_6.actor.cpp
OldTLogServer_6_0.actor.cpp
OldTLogServer_6_2.actor.cpp
Orderer.actor.h
pubsub.actor.cpp
pubsub.h

File diff suppressed because it is too large Load Diff

View File

@ -467,6 +467,12 @@ ACTOR Future<Void> tLog(IKeyValueStore* persistentData, IDiskQueue* persistentQu
PromiseStream<InitializeTLogRequest> tlogRequests, UID tlogId, bool restoreFromDisk,
Promise<Void> oldLog, Promise<Void> recovered, std::string folder, Reference<AsyncVar<bool>> degraded);
}
namespace oldTLog_6_2 {
ACTOR Future<Void> tLog(IKeyValueStore* persistentData, IDiskQueue* persistentQueue,
Reference<AsyncVar<ServerDBInfo>> db, LocalityData locality,
PromiseStream<InitializeTLogRequest> tlogRequests, UID tlogId, bool restoreFromDisk,
Promise<Void> oldLog, Promise<Void> recovered, std::string folder, Reference<AsyncVar<bool>> degraded);
}
typedef decltype(&tLog) TLogFn;

View File

@ -68,6 +68,7 @@
<ClCompile Include="LatencyBandConfig.cpp" />
<ActorCompiler Include="OldTLogServer_4_6.actor.cpp" />
<ActorCompiler Include="OldTLogServer_6_0.actor.cpp" />
<ActorCompiler Include="OldTLogServer_6_2.actor.cpp" />
<ClCompile Include="SkipList.cpp" />
<ActorCompiler Include="WaitFailure.actor.cpp" />
<ActorCompiler Include="tester.actor.cpp" />

View File

@ -309,7 +309,7 @@ TLogFn tLogFnForOptions( TLogOptions options ) {
ASSERT(false);
case TLogVersion::V3:
case TLogVersion::V4:
return tLog;
return oldTLog_6_2::tLog;
default:
ASSERT(false);
}