RavenDB-22849 - backwards compatibilty changes

lastav5 · Jan 23, 2025 · 0a0a695 · 0a0a695
1 parent f7ecb9f
commit 0a0a695
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 10 deletions.
diff --git a/src/Raven.Server/ServerWide/Maintenance/ClusterMaintenanceWorker.cs b/src/Raven.Server/ServerWide/Maintenance/ClusterMaintenanceWorker.cs
@@ -168,7 +168,8 @@ private Dictionary<string, DatabaseStatusReport> CollectDatabaseInformation(Tran
                 var report = new DatabaseStatusReport
                 {
                     Name = dbName,
-                    NodeName = _server.NodeTag
+                    NodeName = _server.NodeTag,
+                    BackupStatuses = new ()
                 };
 
                 prevReport.TryGetValue(dbName, out var prevDatabaseReport);

diff --git a/src/Raven.Server/ServerWide/Maintenance/ClusterNodeStatusReport.cs b/src/Raven.Server/ServerWide/Maintenance/ClusterNodeStatusReport.cs
@@ -64,7 +64,7 @@ public class DatabaseStatusReport : IDynamicJson
 
         public Dictionary<string, ObservedIndexStatus> LastIndexStats = new Dictionary<string, ObservedIndexStatus>();
         public Dictionary<string, long> LastSentEtag = new Dictionary<string, long>();
-        public Dictionary<long, PeriodicBackupStatusReport> BackupStatuses = new ();
+        public Dictionary<long, PeriodicBackupStatusReport> BackupStatuses;
 
         public long LastCompareExchangeIndex { get; set; }
         public long LastClusterWideTransactionRaftIndex { get; set; }
@@ -149,8 +149,16 @@ public override string ToString()
         public long GetBackupStatusReportHash()
         {
             long hash = 0;
-            foreach (var (_, status) in BackupStatuses)
+
+            if (BackupStatuses == null)
+            {
+                Debug.Fail($"{nameof(BackupStatuses)} should not be null");
+                return hash;
+            }
+
+            foreach (var (taskId, status) in BackupStatuses)
             {
+                hash = Hashing.Combine(hash, taskId);
                 hash = Hashing.Combine(hash, status?.LastRaftIndex?.LastEtag ?? 0);
             }
 
@@ -205,12 +213,18 @@ public DynamicJsonValue ToJson()
             }
             dynamicJsonValue[nameof(LastIndexStats)] = indexStats;
 
-            var backupStatuses = new DynamicJsonValue();
-            foreach (var status in BackupStatuses)
+            if (BackupStatuses == null)
+                dynamicJsonValue[nameof(BackupStatuses)] = null;
+            else
             {
-                backupStatuses[status.Key.ToString()] = status.Value?.ToJson();
+                var backupStatuses = new DynamicJsonValue();
+                foreach (var status in BackupStatuses)
+                {
+                    backupStatuses[status.Key.ToString()] = status.Value?.ToJson();
+                }
+
+                dynamicJsonValue[nameof(BackupStatuses)] = backupStatuses;
             }
-            dynamicJsonValue[nameof(BackupStatuses)] = backupStatuses;
 
             return dynamicJsonValue;
         }

diff --git a/src/Raven.Server/ServerWide/Maintenance/ClusterObserver.cs b/src/Raven.Server/ServerWide/Maintenance/ClusterObserver.cs
@@ -602,10 +602,9 @@ private CompareExchangeTombstonesCleanupState GetMaxCompareExchangeTombstonesEta
                 if (hasReport == false)
                     return CompareExchangeTombstonesCleanupState.InvalidDatabaseObservationState;
 
-                if (state.RawDatabase.PeriodicBackupsTaskIds != null && state.RawDatabase.PeriodicBackupsTaskIds.Count != 0 &&
-                    report.BackupStatuses.Count == 0)
+                if (report.BackupStatuses == null)
                 {
-                    // we got a report from an old version that doesn't populate BackupStatuses (we add BackupStatuses taskIds keys even if its values are null)
+                    // the node wasn't updated to a version that supports it
                     return CompareExchangeTombstonesCleanupState.InvalidPeriodicBackupStatus;
                 }