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

Merge branch 'release-6.0' 

# Conflicts:
#	documentation/sphinx/source/release-notes.rst
This commit is contained in:
Evan Tschannen 2018-10-05 12:54:00 -07:00
parent a72c8f5cb2 2263fb08cd
commit 1314bcec9e
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fdbserver/QuietDatabase.actor.cpp
View File

@ -283,7 +283,7 @@ ACTOR Future<bool> getStorageServersRecruiting( Database cx, Reference<AsyncVar<
}
ACTOR Future<Void> repairDeadDatacenter(Database cx, Reference<AsyncVar<ServerDBInfo>> dbInfo, std::string context) {
if(g_network->isSimulated()) {
if(g_network->isSimulated() && g_simulator.usableRegions > 1) {
bool primaryDead = g_simulator.datacenterDead(g_simulator.primaryDcId);
bool remoteDead = g_simulator.datacenterDead(g_simulator.remoteDcId);

2
fdbserver/TagPartitionedLogSystem.actor.cpp
View File

@ -699,7 +699,7 @@ struct TagPartitionedLogSystem : ILogSystem, ReferenceCounted<TagPartitionedLogS
virtual Reference<IPeekCursor> peekSpecial( UID dbgid, Version begin, Tag tag, int8_t peekLocality, Version localEnd ) {
Version end = getEnd();
TraceEvent("TLogPeekSpecial", dbgid).detail("Begin", begin).detail("End", end).detail("LocalEnd", localEnd).detail("PeekLocality", peekLocality);
if(localEnd == invalidVersion) {
if(localEnd == invalidVersion || localEnd <= begin) {
return peekAll(dbgid, begin, end, tag, true, false);
}

2
fdbserver/storageserver.actor.cpp
View File

@ -2562,7 +2562,7 @@ ACTOR Future<Void> update( StorageServer* data, bool* pReceivedUpdate )
ver = updater.currentVersion;
}
if(ver != invalidVersion) {
if(ver != invalidVersion && ver > data->version.get()) {
debugKeyRange("SSUpdate", ver, allKeys);
data->mutableData().createNewVersion(ver);