From b560b94ebc2a9746d7652d0d0dc9d22cbfb141a7 Mon Sep 17 00:00:00 2001
From: Evan Tschannen <ejt@apple.com>
Date: Fri, 28 Sep 2018 12:10:04 -0700
Subject: [PATCH] fix: do not force a recovery if the master was already in the
 other region (and therefore already recovered) fix: reboot the remaining DC,
 because any storage server rejoins that were rolled back will cause that
 server to be unusable

---
 fdbserver/workloads/KillRegion.actor.cpp | 36 +++++++++++++++---------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/fdbserver/workloads/KillRegion.actor.cpp b/fdbserver/workloads/KillRegion.actor.cpp
index 235b1ea5a9..3fc93486a5 100644
--- a/fdbserver/workloads/KillRegion.actor.cpp
+++ b/fdbserver/workloads/KillRegion.actor.cpp
@@ -79,25 +79,33 @@ struct KillRegionWorkload : TestWorkload {
 		g_simulator.killDataCenter( LiteralStringRef("2"), ISimulator::RebootAndDelete, true );
 		g_simulator.killDataCenter( LiteralStringRef("4"), ISimulator::RebootAndDelete, true );
 
+		state bool first = true;
 		loop {
+			state Transaction tr(cx);
+			loop {
+				try {
+					tr.addWriteConflictRange(KeyRangeRef(LiteralStringRef(""), LiteralStringRef("\x00")));
+					choose {
+						when( Void _ = wait(tr.commit()) ) {
+							TraceEvent("ForceRecovery_Complete");
+							g_simulator.killDataCenter( LiteralStringRef("1"), ISimulator::Reboot );
+							g_simulator.killDataCenter( LiteralStringRef("3"), ISimulator::Reboot );
+							g_simulator.killDataCenter( LiteralStringRef("5"), ISimulator::Reboot );
+							return Void();
+						}
+						when( Void _ = wait(delay(first ? 5.0 : 120.0)) ) {
+							break;
+						}
+					}
+				} catch( Error &e ) {
+					Void _ = wait( tr.onError(e) );
+				}
+			}
 			TraceEvent("ForceRecovery_Begin");
 			Void _ = wait( forceRecovery(cx->cluster->getConnectionFile()) );
+			first = false;
 			TraceEvent("ForceRecovery_Attempted");
-			state Transaction tr(cx);
-			try {
-				choose {
-					when( Version _ = wait(tr.getReadVersion()) ) {
-						TraceEvent("ForceRecovery_Complete");
-						break;
-					}
-					when( Void _ = wait(delay(120.0)) ) {}
-				}
-			} catch( Error &e ) {
-				Void _ = wait( tr.onError(e) );
-			}
 		}
-
-		return Void();
 	}
 };