* fix not invoking the returned action to release global locked image…

…s when any exception was thrown after locks acquired @ `ReplyContentImageSaver.Save()` * fix not disposing `SaverLocks<>` to release locks when any exception was thrown after locks acquired @ `AuthorRevisionSaver.SaveAuthorExpGradeRevisions()` & `ReplySignatureSaver.Save()` @ c#/crawler
n0099 · Jun 12, 2024 · 388ddc9 · 388ddc9
1 parent 5d794b1
commit 388ddc9
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 42 deletions.
diff --git a/c#/crawler/src/Tieba/Crawl/Saver/AuthorRevisionSaver.cs b/c#/crawler/src/Tieba/Crawl/Saver/AuthorRevisionSaver.cs
@@ -17,7 +17,8 @@ public Action SaveAuthorExpGradeRevisions<TPostWithAuthorExpGrade>
         (CrawlerDbContext db, IReadOnlyCollection<TPostWithAuthorExpGrade> posts)
         where TPostWithAuthorExpGrade : PostWithAuthorExpGrade
     {
-        Save(db, posts, _authorExpGradeLocksSaverLocks.Value,
+        using var saverLocks = _authorExpGradeLocksSaverLocks.Value;
+        Save(db, posts, saverLocks,
             db.AuthorExpGradeRevisions,
             p => p.AuthorExpGrade,
             (a, b) => a != b,
@@ -36,7 +37,7 @@ public Action SaveAuthorExpGradeRevisions<TPostWithAuthorExpGrade>
                 TriggeredBy = triggeredByPostType,
                 AuthorExpGrade = t.Value
             });
-        return _authorExpGradeLocksSaverLocks.Value.Dispose;
+        return saverLocks.Dispose;
     }
 
     private void Save<TPost, TRevision, TValue>(

diff --git a/c#/crawler/src/Tieba/Crawl/Saver/ReplyContentImageSaver.cs b/c#/crawler/src/Tieba/Crawl/Saver/ReplyContentImageSaver.cs
@@ -52,43 +52,7 @@ where images.Keys.Contains(e.UrlFilename)
             .Where(image => !Monitor.TryEnter(image, TimeSpan.FromSeconds(10)))
             .ForEach(image => logger.LogWarning(
                 "Wait for locking already locked image {} timed out after 10s", image.UrlFilename));
-        if (alreadyLockedImages.Count != 0)
-            existingImages = existingImages
-                .Concat((
-                    from e in db.ImageInReplies.AsTracking()
-                    where alreadyLockedImages.Keys().Contains(e.UrlFilename)
-                    select e).ToDictionary(e => e.UrlFilename))
-                .ToDictionary();
-
-        (from existing in existingImages.Values
-                where existing.ExpectedByteSize == 0 // randomly respond with 0
-                join newInContent in images.Values
-                    on existing.UrlFilename equals newInContent.UrlFilename
-                select (existing, newInContent))
-            .ForEach(t => t.existing.ExpectedByteSize = t.newInContent.ExpectedByteSize);
-
-        (from existing in existingImages.Values
-                join replyContentImage in replyContentImages
-                    on existing.UrlFilename equals replyContentImage.ImageInReply.UrlFilename
-                select (existing, replyContentImage))
-            .ForEach(t => t.replyContentImage.ImageInReply = t.existing);
-        var existingReplyContentImages = db.ReplyContentImages.AsNoTracking()
-            .Where(replyContentImages.Aggregate(
-                LinqKit.PredicateBuilder.New<ReplyContentImage>(),
-                (predicate, newOrExisting) =>
-                    predicate.Or(LinqKit.PredicateBuilder
-                        .New<ReplyContentImage>(existing =>
-                            existing.Pid == newOrExisting.Pid)
-                        .And(existing =>
-                            existing.ImageInReply.UrlFilename == newOrExisting.ImageInReply.UrlFilename))))
-            .Include(e => e.ImageInReply)
-            .Select(e => new {e.Pid, e.ImageInReply.UrlFilename})
-            .ToList();
-        db.ReplyContentImages.AddRange(replyContentImages
-            .ExceptBy(existingReplyContentImages.Select(e => (e.Pid, e.UrlFilename)),
-                e => (e.Pid, e.ImageInReply.UrlFilename)));
-
-        return () =>
+        void ReleaseGlobalLocks()
         {
             try
             {
@@ -101,6 +65,49 @@ on existing.UrlFilename equals replyContentImage.ImageInReply.UrlFilename
                 newlyLockedImages.Values().ForEach(Monitor.Exit);
                 alreadyLockedImages.Values().ForEach(Monitor.Exit);
             }
-        };
+        }
+        try
+        {
+            if (alreadyLockedImages.Count != 0)
+                existingImages = existingImages
+                    .Concat((
+                        from e in db.ImageInReplies.AsTracking()
+                        where alreadyLockedImages.Keys().Contains(e.UrlFilename)
+                        select e).ToDictionary(e => e.UrlFilename))
+                    .ToDictionary();
+
+            (from existing in existingImages.Values
+                    where existing.ExpectedByteSize == 0 // randomly respond with 0
+                    join newInContent in images.Values
+                        on existing.UrlFilename equals newInContent.UrlFilename
+                    select (existing, newInContent))
+                .ForEach(t => t.existing.ExpectedByteSize = t.newInContent.ExpectedByteSize);
+
+            (from existing in existingImages.Values
+                    join replyContentImage in replyContentImages
+                        on existing.UrlFilename equals replyContentImage.ImageInReply.UrlFilename
+                    select (existing, replyContentImage))
+                .ForEach(t => t.replyContentImage.ImageInReply = t.existing);
+            var existingReplyContentImages = db.ReplyContentImages.AsNoTracking()
+                .Where(replyContentImages.Aggregate(
+                    LinqKit.PredicateBuilder.New<ReplyContentImage>(),
+                    (predicate, newOrExisting) =>
+                        predicate.Or(LinqKit.PredicateBuilder
+                            .New<ReplyContentImage>(existing =>
+                                existing.Pid == newOrExisting.Pid)
+                            .And(existing =>
+                                existing.ImageInReply.UrlFilename == newOrExisting.ImageInReply.UrlFilename))))
+                .Include(e => e.ImageInReply)
+                .Select(e => new {e.Pid, e.ImageInReply.UrlFilename})
+                .ToList();
+            db.ReplyContentImages.AddRange(replyContentImages
+                .ExceptBy(existingReplyContentImages.Select(e => (e.Pid, e.UrlFilename)),
+                    e => (e.Pid, e.ImageInReply.UrlFilename)));
+            return ReleaseGlobalLocks;
+        }
+        finally
+        {
+            ReleaseGlobalLocks();
+        }
     }
 }
diff --git a/c#/crawler/src/Tieba/Crawl/Saver/ReplySignatureSaver.cs b/c#/crawler/src/Tieba/Crawl/Saver/ReplySignatureSaver.cs
@@ -12,6 +12,7 @@ public class ReplySignatureSaver(
 
     public Action Save(CrawlerDbContext db, IEnumerable<ReplyPost> replies)
     {
+        using var saverLocks = _saverLocks.Value;
         SharedHelper.GetNowTimestamp(out var now);
         var repliesWithSignature = replies
             .Where(r => r is {SignatureId: not null, Signature: not null}).ToList();
@@ -55,11 +56,11 @@ join newInReply in signatures on existing.SignatureId equals newInReply.Signatur
 
         var newSignatures = signatures
             .ExceptBy(existingSignatures.Select(s => s.SignatureId), s => s.SignatureId).ToList();
-        var newlyLocked = _saverLocks.Value.Acquire(
+        var newlyLocked = saverLocks.Acquire(
             newSignatures.Select(s => new UniqueSignature(s.SignatureId, s.XxHash3)).ToList());
         db.ReplySignatures.AddRange(
             newSignatures.IntersectBy(newlyLocked, s => new(s.SignatureId, s.XxHash3)));
-        return _saverLocks.Value.Dispose;
+        return saverLocks.Dispose;
     }
 
     [SuppressMessage("Class Design", "AV1000:Type name contains the word 'and', which suggests it has multiple purposes")]