RavenDB-22835 rename + fix tests + add a dew more cases

aviv86 · Nov 25, 2024 · f9569de · f9569de
1 parent 34d92ec
commit f9569de
Show file tree

Hide file tree

Showing 6 changed files with 450 additions and 79 deletions.
diff --git a/...ver/Documents/FixCorruptedCountersTask.cs → ...en.Server/Documents/CountersRepairTask.cs b/...ver/Documents/FixCorruptedCountersTask.cs → ...en.Server/Documents/CountersRepairTask.cs
@@ -11,18 +11,18 @@
 
 namespace Raven.Server.Documents;
 
-public class FixCorruptedCountersTask
+public class CountersRepairTask
 {
     private readonly DocumentDatabase _database;
 
     private readonly Logger _logger;
 
     public static string Completed = string.Empty;
 
-    public FixCorruptedCountersTask(DocumentDatabase database)
+    public CountersRepairTask(DocumentDatabase database)
     {
         _database = database;
-        _logger = LoggingSource.Instance.GetLogger<FixCorruptedCountersTask>(_database.Name);
+        _logger = LoggingSource.Instance.GetLogger<CountersRepairTask>(_database.Name);
     }
 
     public async Task Start(string lastProcessedKey)
@@ -128,7 +128,7 @@ private void MarkAsCompleted()
         using (_database.DocumentsStorage.ContextPool.AllocateOperationContext(out DocumentsOperationContext writeCtx))
         using (var tx = writeCtx.OpenWriteTransaction())
         {
-            _database.DocumentsStorage.SetFixCountersLastKey(writeCtx, Completed);
+            _database.DocumentsStorage.SetLastFixedCounterKey(writeCtx, Completed);
             tx.Commit();
         }
     }

diff --git a/src/Raven.Server/Documents/CountersStorage.cs b/src/Raven.Server/Documents/CountersStorage.cs
@@ -1169,8 +1169,8 @@ public int FixCountersForDocuments(DocumentsOperationContext context, List<strin
                 numOfCounterGroupsFixed += FixCountersForDocument(context, docId);
             }
 
-            var lastProcessedKey = hasMore ? docIds[^1] : FixCorruptedCountersTask.Completed;
-            _documentsStorage.SetFixCountersLastKey(context, lastProcessedKey);
+            var lastProcessedKey = hasMore ? docIds[^1] : CountersRepairTask.Completed;
+            _documentsStorage.SetLastFixedCounterKey(context, lastProcessedKey);
 
             return numOfCounterGroupsFixed;
         }

diff --git a/src/Raven.Server/Documents/DocumentDatabase.cs b/src/Raven.Server/Documents/DocumentDatabase.cs
@@ -201,7 +201,7 @@ public DocumentDatabase(string name, RavenConfiguration configuration, ServerSto
                 });
                 _hasClusterTransaction = new ManualResetEventSlim(false);
                 IdentityPartsSeparator = '/';
-                FixCorruptedCountersTask = new FixCorruptedCountersTask(this);
+                CountersRepairTask = new CountersRepairTask(this);
             }
             catch (Exception)
             {
@@ -287,7 +287,7 @@ public DocumentDatabase(string name, RavenConfiguration configuration, ServerSto
 
         public StudioConfiguration StudioConfiguration { get; private set; }
 
-        public FixCorruptedCountersTask FixCorruptedCountersTask { get; private set; }
+        public CountersRepairTask CountersRepairTask { get; private set; }
 
         public bool Is32Bits { get; }
 
@@ -393,9 +393,9 @@ record = _serverStore.Cluster.ReadDatabase(context, Name, out index);
                     var lastCompletedClusterTransactionIndex = DocumentsStorage.ReadLastCompletedClusterTransactionIndex(ctx.Transaction.InnerTransaction);
                     ClusterWideTransactionIndexWaiter.SetAndNotifyListenersIfHigher(lastCompletedClusterTransactionIndex);
 
-                    var fixCountersLastKey = DocumentsStorage.ReadFixCountersLastKey(ctx.Transaction.InnerTransaction);
-                    if (fixCountersLastKey != FixCorruptedCountersTask.Completed)
-                        _ = Task.Run(() => FixCorruptedCountersTask.Start(fixCountersLastKey), DatabaseShutdown);
+                    var lastCounterFixed = DocumentsStorage.ReadLastFixedCounterKey(ctx.Transaction.InnerTransaction);
+                    if (lastCounterFixed != CountersRepairTask.Completed)
+                        _ = Task.Run(() => CountersRepairTask.Start(lastCounterFixed), DatabaseShutdown);
                 }
 
                 _ = Task.Run(async () =>

diff --git a/src/Raven.Server/Documents/DocumentsStorage.cs b/src/Raven.Server/Documents/DocumentsStorage.cs
@@ -757,7 +757,7 @@ public void SetLastCompletedClusterTransactionIndex(DocumentsOperationContext co
                 tree.Add(LastCompletedClusterTransactionIndexSlice, indexSlice);
         }
 
-        public static string ReadFixCountersLastKey(Transaction tx)
+        public static string ReadLastFixedCounterKey(Transaction tx)
         {
             if (tx == null)
                 throw new InvalidOperationException("No active transaction found in the context, and at least read transaction is needed");
@@ -768,7 +768,7 @@ public static string ReadFixCountersLastKey(Transaction tx)
             return Encodings.Utf8.GetString(val.Reader.Base, val.Reader.Length);
         }
 
-        public void SetFixCountersLastKey(DocumentsOperationContext context, string lastKey)
+        public void SetLastFixedCounterKey(DocumentsOperationContext context, string lastKey)
         {
             var tree = context.Transaction.InnerTransaction.ReadTree(GlobalTreeSlice);
             using (Slice.From(context.Allocator, lastKey, out var slice))

diff --git a/src/Raven.Server/Documents/Handlers/CountersHandler.cs b/src/Raven.Server/Documents/Handlers/CountersHandler.cs
@@ -400,20 +400,10 @@ protected override long ExecuteCmd(DocumentsOperationContext context)
 
                 foreach (var cgd in _counterGroups)
                 {
-                    try
-                    {
-
-                        using (cgd.Values)
-                        {
-                            PutCounters(context, cgd);
-                        }
-                    }
-                    catch (Exception e)
+                    using (cgd.Values)
                     {
-                        Console.WriteLine(e);
-                        throw;
+                        PutCounters(context, cgd);
                     }
-
                 }
 
                 UpdateDocumentsMetadata(context);