From 6adf119e3d7f8ee102856b801a9e68b125962d41 Mon Sep 17 00:00:00 2001
From: Josh Slocum <josh.slocum@snowflake.com>
Date: Tue, 8 Feb 2022 13:58:56 -0600
Subject: [PATCH] Fixing change feed durableFetchVersion not getting updated

---
 fdbserver/storageserver.actor.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/fdbserver/storageserver.actor.cpp b/fdbserver/storageserver.actor.cpp
index eb4038ffea..63e8b638ff 100644
--- a/fdbserver/storageserver.actor.cpp
+++ b/fdbserver/storageserver.actor.cpp
@@ -4274,10 +4274,15 @@ ACTOR Future<Version> fetchChangeFeedApplier(StorageServer* data,
 					remoteLoc++;
 				}
 				if (localVersion <= remoteVersion) {
+					// Do this once per wait instead of once per version for efficiency
+					data->fetchingChangeFeeds.insert(changeFeedInfo->id);
 					Standalone<MutationsAndVersionRef> _localResult = waitNext(localResults.getFuture());
 					localResult = _localResult;
 				}
 			}
+			// Do this once per wait instead of once per version for efficiency
+			data->fetchingChangeFeeds.insert(changeFeedInfo->id);
+
 			data->counters.feedBytesFetched += remoteResult.expectedSize();
 			data->fetchKeysBytesBudget -= remoteResult.expectedSize();
 			if (data->fetchKeysBytesBudget <= 0) {