From aabc0bb831f2313bce41c43c29c9c2b0e434cb00 Mon Sep 17 00:00:00 2001
From: Vasileios Zois <96085550+vazois@users.noreply.github.com>
Date: Wed, 11 Dec 2024 14:03:36 -0800
Subject: [PATCH] handle uninitialized epoch value merge (#874)

* handle uninitialized epoch value merge

* release 1.0.47
---
 Version.props                        | 2 +-
 libs/cluster/Server/ClusterConfig.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Version.props b/Version.props
index 640036a556..a1c7128f21 100644
--- a/Version.props
+++ b/Version.props
@@ -1,6 +1,6 @@
 <Project>
 	<!-- Versioning property for builds and packages -->
 	<PropertyGroup>
-		<VersionPrefix>1.0.46</VersionPrefix>
+		<VersionPrefix>1.0.47</VersionPrefix>
 	</PropertyGroup>
 </Project>
diff --git a/libs/cluster/Server/ClusterConfig.cs b/libs/cluster/Server/ClusterConfig.cs
index 5e54c0d026..a65d4dc1d5 100644
--- a/libs/cluster/Server/ClusterConfig.cs
+++ b/libs/cluster/Server/ClusterConfig.cs
@@ -976,7 +976,7 @@ public ClusterConfig MergeSlotMap(ClusterConfig senderConfig, ILogger logger = n
                 }
 
                 // Process this slot information when config epoch of original owner is greater than config epoch of sender
-                if (workers[currentOwnerId].ConfigEpoch >= senderConfig.LocalNodeConfigEpoch)
+                if (senderConfig.LocalNodeConfigEpoch != 0 && workers[currentOwnerId].ConfigEpoch >= senderConfig.LocalNodeConfigEpoch)
                     continue;
 
                 // Update ownership of node