From d45e7bf0b16f39f57e6c069a59dd5d39c4307f56 Mon Sep 17 00:00:00 2001
From: Balachandar Namasivayam <bnamasivayam@apple.com>
Date: Tue, 7 May 2019 17:19:59 -0700
Subject: [PATCH] Addressed review comments

---
 fdbserver/workloads/TriggerRecovery.actor.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/fdbserver/workloads/TriggerRecovery.actor.cpp b/fdbserver/workloads/TriggerRecovery.actor.cpp
index 1715b82f35..cf1659514e 100644
--- a/fdbserver/workloads/TriggerRecovery.actor.cpp
+++ b/fdbserver/workloads/TriggerRecovery.actor.cpp
@@ -29,11 +29,9 @@ struct TriggerRecoveryLoopWorkload : TestWorkload {
 	virtual std::string description() { return "TriggerRecoveryLoop"; }
 
 	ACTOR Future<Void> setOriginalNumOfResolvers(Database cx, TriggerRecoveryLoopWorkload* self) {
-		loop {
-			DatabaseConfiguration config = wait(getDatabaseConfiguration(cx));
-			self->originalNumOfResolvers = self->currentNumOfResolvers = config.getDesiredResolvers();
-			return Void();
-		}
+		DatabaseConfiguration config = wait(getDatabaseConfiguration(cx));
+		self->originalNumOfResolvers = self->currentNumOfResolvers = config.getDesiredResolvers();
+		return Void();
 	}
 
 	virtual Future<Void> setup(Database const& cx) {
@@ -47,9 +45,9 @@ struct TriggerRecoveryLoopWorkload : TestWorkload {
 		loop {
 			state ReadYourWritesTransaction tr(cx);
 			try {
-				state Version v = wait(tr.getReadVersion());
 				tr.setOption(FDBTransactionOptions::LOCK_AWARE);
 				tr.setOption(FDBTransactionOptions::PRIORITY_SYSTEM_IMMEDIATE);
+				state Version v = wait(tr.getReadVersion());
 				tr.makeSelfConflicting();
 				wait(tr.commit());
 				TraceEvent(SevInfo, "TriggerRecoveryLoop_ClusterVersion").detail("Version", v);