From cc556d77b61c58965198a29729dcb2e1f14cea10 Mon Sep 17 00:00:00 2001
From: Meng Xu <meng_xu@apple.com>
Date: Wed, 16 Oct 2019 16:05:46 -0700
Subject: [PATCH] FastRestore:RestoreMaster:Remove the extra lockDatabase in
 RestoreMaster

---
 fdbserver/RestoreCommon.actor.h   | 3 +--
 fdbserver/RestoreMaster.actor.cpp | 1 -
 fdbserver/RestoreMaster.actor.h   | 4 ++--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/fdbserver/RestoreCommon.actor.h b/fdbserver/RestoreCommon.actor.h
index 9dd347c628..daa8f3dea2 100644
--- a/fdbserver/RestoreCommon.actor.h
+++ b/fdbserver/RestoreCommon.actor.h
@@ -219,8 +219,7 @@ struct RestoreFileFR {
 	}
 
 	bool operator<(const RestoreFileFR& rhs) const {
-		return beginVersion < rhs.beginVersion || (beginVersion == rhs.beginVersion && endVersion < rhs.endVersion) ||
-		       (beginVersion == rhs.beginVersion && endVersion == rhs.endVersion && fileIndex < rhs.fileIndex);
+		return std::tie(beginVersion, endVersion, fileIndex) < std::tie(rhs.beginVersion, rhs.endVersion, rhs.fileIndex);
 	}
 
 	RestoreFileFR()
diff --git a/fdbserver/RestoreMaster.actor.cpp b/fdbserver/RestoreMaster.actor.cpp
index 70419e529b..5bb2bf0aed 100644
--- a/fdbserver/RestoreMaster.actor.cpp
+++ b/fdbserver/RestoreMaster.actor.cpp
@@ -163,7 +163,6 @@ ACTOR Future<Void> startProcessRestoreRequests(Reference<RestoreMasterData> self
 	state Standalone<VectorRef<RestoreRequest>> restoreRequests = wait(collectRestoreRequests(cx));
 
 	// lock DB for restore
-	wait(lockDatabase(cx, randomUID));
 	state int numTries = 0;
 	loop {
 		try {
diff --git a/fdbserver/RestoreMaster.actor.h b/fdbserver/RestoreMaster.actor.h
index 9673f789b4..1ec8819c37 100644
--- a/fdbserver/RestoreMaster.actor.h
+++ b/fdbserver/RestoreMaster.actor.h
@@ -132,10 +132,10 @@ struct RestoreMasterData : RestoreRoleData, public ReferenceCounted<RestoreMaste
 			std::sort(versionBatch->second.rangeFiles.begin(), versionBatch->second.rangeFiles.end());
 			std::sort(versionBatch->second.logFiles.begin(), versionBatch->second.logFiles.end());
 			for (auto& logFile : versionBatch->second.logFiles) {
-				logFile.fileIndex = (++fileIndex);
+				logFile.fileIndex = ++fileIndex;
 			}
 			for (auto& rangeFile : versionBatch->second.rangeFiles) {
-				rangeFile.fileIndex = (++fileIndex);
+				rangeFile.fileIndex = ++fileIndex;
 			}
 		}