From a4fdf924036a6c310ad72e1144caf0e2e4916e31 Mon Sep 17 00:00:00 2001 From: amalsaidov Date: Wed, 11 Nov 2026 18:43:33 +0700 Subject: [PATCH] fix(target/queue): Clean up dangling entries when meta file is missing readDiskQueue scanned only .meta files, so an entry whose .meta was removed but still had .header and .body left those two files on disk forever. They were never iterated and never cleaned up. Group all queue files by message ID first and treat an entry as dangling whenever any of the three files (.meta, .header, .body) is missing, then remove whatever is left. Complete entries are loaded as before. This enables the previously skipped NoMeta sub-test of TestQueueDelivery_DeserlizationCleanUp. Fixes #209. Assisted-By: Claude Opus 4.8 (Claude Code) Signed-off-by: amalsaidov --- internal/target/queue/queue.go | 82 ++++++++++++++++++++--------- internal/target/queue/queue_test.go | 1 - 2 files changed, 58 insertions(+), 25 deletions(-) diff --git a/internal/target/queue/queue.go b/internal/target/queue/queue.go index 4d910424..02e48e36 100644 --- a/internal/target/queue/queue.go +++ b/internal/target/queue/queue.go @@ -685,44 +685,78 @@ func (q *Queue) readDiskQueue() error { return err } - // TODO(GH #209): Rewrite this function to pass all sub-tests in TestQueueDelivery_DeserializationCleanUp/NoMeta. - - loadedCount := 0 + // A complete queue entry consists of three files: ID.meta, ID.header and + // ID.body. Group all files by their message ID first so we can detect + // entries that are missing any of the three files, regardless of which + // one it is. Keying the scan on .meta alone (as was done before) misses + // the case where .meta itself is gone but .header/.body are left behind. + type entryFiles struct { + meta, header, body bool + } + entries := map[string]*entryFiles{} for _, entry := range dirInfo { - // We start loading from meta-data files and then check whether ID.header and ID.body exist. - // This allows us to properly detect dangling body files. - if entry.IsDir() || !strings.HasSuffix(entry.Name(), ".meta") { + if entry.IsDir() { continue } - id := entry.Name()[:len(entry.Name())-5] - meta, err := q.readMessageMeta(id) - if err != nil { - q.log.Printf("failed to read meta-data, skipping: %v (msg ID = %s)", err, id) + name := entry.Name() + var id, part string + switch { + case strings.HasSuffix(name, ".meta"): + id, part = strings.TrimSuffix(name, ".meta"), "meta" + case strings.HasSuffix(name, ".header"): + id, part = strings.TrimSuffix(name, ".header"), "header" + case strings.HasSuffix(name, ".body"): + id, part = strings.TrimSuffix(name, ".body"), "body" + default: continue } - // Check header file existence. - if _, err := os.Stat(filepath.Join(q.location, id+".header")); err != nil { - if os.IsNotExist(err) { + files := entries[id] + if files == nil { + files = &entryFiles{} + entries[id] = files + } + switch part { + case "meta": + files.meta = true + case "header": + files.header = true + case "body": + files.body = true + } + } + + loadedCount := 0 + for id, files := range entries { + // Drop incomplete entries left over by an interrupted write or a + // partial removal. Any files that are present are dangling and get + // cleaned up so they don't accumulate on disk. + if !files.meta || !files.header || !files.body { + if !files.meta { + q.log.Printf("meta-data file doesn't exist for msg ID = %s", id) + } + if !files.header { q.log.Printf("header file doesn't exist for msg ID = %s", id) + } + if !files.body { + q.log.Printf("body file doesn't exist for msg ID = %s", id) + } + if files.meta { q.tryRemoveDanglingFile(id + ".meta") + } + if files.header { + q.tryRemoveDanglingFile(id + ".header") + } + if files.body { q.tryRemoveDanglingFile(id + ".body") - } else { - q.log.Printf("skipping nonstat'able header file: %v (msg ID = %s)", err, id) } continue } - // Check body file existence. - if _, err := os.Stat(filepath.Join(q.location, id+".body")); err != nil { - if os.IsNotExist(err) { - q.log.Printf("body file doesn't exist for msg ID = %s", id) - q.tryRemoveDanglingFile(id + ".meta") - q.tryRemoveDanglingFile(id + ".header") - } else { - q.log.Printf("skipping nonstat'able body file: %v (msg ID = %s)", err, id) - } + meta, err := q.readMessageMeta(id) + if err != nil { + q.log.Printf("failed to read meta-data, skipping: %v (msg ID = %s)", err, id) continue } diff --git a/internal/target/queue/queue_test.go b/internal/target/queue/queue_test.go index d2e8977c..38e07bcd 100644 --- a/internal/target/queue/queue_test.go +++ b/internal/target/queue/queue_test.go @@ -646,7 +646,6 @@ func TestQueueDelivery_DeserlizationCleanUp(t *testing.T) { } t.Run("NoMeta", func(t *testing.T) { - t.Skip("Not implemented") test(t, ".meta") }) t.Run("NoBody", func(t *testing.T) {