From 5d103d5f7b3d854a23efca8b2747425a8e42731c Mon Sep 17 00:00:00 2001
From: "Bharadwaj V.R" <bharadwaj.vr@snowflake.com>
Date: Tue, 12 Apr 2022 10:22:35 -0700
Subject: [PATCH] Update fdbserver/worker.actor.cpp

Remove unnecessary errorOr actor when testing SW version compatibility

Co-authored-by: Trevor Clinkenbeard <trevor.clinkenbeard@snowflake.com>
---
 fdbserver/worker.actor.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/fdbserver/worker.actor.cpp b/fdbserver/worker.actor.cpp
index 0173745b00..10281bb9bd 100644
--- a/fdbserver/worker.actor.cpp
+++ b/fdbserver/worker.actor.cpp
@@ -3211,10 +3211,7 @@ ACTOR Future<Void> fdbd(Reference<IClusterConnectionRecord> connRecord,
 		localities.set(LocalityData::keyProcessId, processIDUid.toString());
 		// Only one process can execute on a dataFolder from this point onwards
 
-		ErrorOr<Void> f = wait(errorOr(testAndUpdateSoftwareVersionCompatibility(dataFolder, processIDUid)));
-		if (f.isError()) {
-			throw f.getError();
-		}
+		wait(testAndUpdateSoftwareVersionCompatibility(dataFolder, processIDUid));
 
 		std::string fitnessFilePath = joinPath(dataFolder, "fitness");
 		auto cc = makeReference<AsyncVar<Optional<ClusterControllerFullInterface>>>();