From 21fd49d98d62fe30424d04493d46fc2bae2e1a12 Mon Sep 17 00:00:00 2001
From: rcourtman <courtmanr@gmail.com>
Date: Wed, 13 May 2026 17:09:45 +0100
Subject: [PATCH] Fix PBS job task history filters

---
 pkg/pbs/client.go           | 20 +++++++++-----
 pkg/pbs/client_http_test.go | 52 +++++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 6 deletions(-)

diff --git a/pkg/pbs/client.go b/pkg/pbs/client.go
index d91130eb7..8981765ea 100644
--- a/pkg/pbs/client.go
+++ b/pkg/pbs/client.go
@@ -1165,6 +1165,14 @@ type taskHistoryQuery struct {
 	Until         int64
 }
 
+const (
+	pbsTaskTypeBackup            = "backup"
+	pbsTaskTypeSyncJob           = "syncjob"
+	pbsTaskTypeVerificationJob   = "verificationjob"
+	pbsTaskTypePruneJob          = "prunejob"
+	pbsTaskTypeGarbageCollection = "garbage_collection"
+)
+
 func (c *Client) listTaskHistory(ctx context.Context, datastores []string, opts JobHealthOptions) ([]JobHealthEvidence, []JobHealthEvidence, error) {
 	now := time.Now()
 	until := now.Unix()
@@ -1235,24 +1243,24 @@ func buildTaskHistoryQueries(datastores []string, opts JobHealthOptions, since,
 	if opts.MonitorBackups {
 		stores := uniqueNonEmptyStrings(datastores)
 		if len(stores) == 0 {
-			add("backup", "backup", "")
+			add("backup", pbsTaskTypeBackup, "")
 		} else {
 			for _, store := range stores {
-				add("backup", "backup", store)
+				add("backup", pbsTaskTypeBackup, store)
 			}
 		}
 	}
 	if opts.MonitorSyncJobs {
-		add("sync", "sync", "")
+		add("sync", pbsTaskTypeSyncJob, "")
 	}
 	if opts.MonitorVerifyJobs {
-		add("verify", "verif", "")
+		add("verify", pbsTaskTypeVerificationJob, "")
 	}
 	if opts.MonitorPruneJobs {
-		add("prune", "prune", "")
+		add("prune", pbsTaskTypePruneJob, "")
 	}
 	if opts.MonitorGarbageJobs {
-		add("garbage", "garbage", "")
+		add("garbage", pbsTaskTypeGarbageCollection, "")
 	}
 	return queries
 }
diff --git a/pkg/pbs/client_http_test.go b/pkg/pbs/client_http_test.go
index 4f056852e..ce0b46293 100644
--- a/pkg/pbs/client_http_test.go
+++ b/pkg/pbs/client_http_test.go
@@ -136,6 +136,58 @@ func TestClient_GetJobHealthEvidence_MergesConfigAndTaskFacts(t *testing.T) {
 	}
 }
 
+func TestPBSJobTaskHistoryQueries_UsesWorkerTypeFilters(t *testing.T) {
+	queries := buildTaskHistoryQueries([]string{"fast", "fast", "slow"}, JobHealthOptions{
+		MonitorBackups:     true,
+		MonitorSyncJobs:    true,
+		MonitorVerifyJobs:  true,
+		MonitorPruneJobs:   true,
+		MonitorGarbageJobs: true,
+	}, 1700000000, 1700003600)
+
+	got := make(map[string][]taskHistoryQuery)
+	for _, query := range queries {
+		got[query.Family] = append(got[query.Family], query)
+		if query.Since != 1700000000 || query.Until != 1700003600 {
+			t.Fatalf("query %s bounds = (%d, %d), want (1700000000, 1700003600)", query.Family, query.Since, query.Until)
+		}
+	}
+
+	backupQueries := got["backup"]
+	if len(backupQueries) != 2 {
+		t.Fatalf("backup query count = %d, want 2: %#v", len(backupQueries), backupQueries)
+	}
+	backupStores := map[string]bool{}
+	for _, query := range backupQueries {
+		if query.TypeFilter != "backup" {
+			t.Fatalf("backup typefilter = %q, want backup", query.TypeFilter)
+		}
+		backupStores[query.Store] = true
+	}
+	if !backupStores["fast"] || !backupStores["slow"] {
+		t.Fatalf("backup stores = %#v, want fast and slow", backupStores)
+	}
+
+	for family, want := range map[string]string{
+		"sync":    "syncjob",
+		"verify":  "verificationjob",
+		"prune":   "prunejob",
+		"garbage": "garbage_collection",
+	} {
+		familyQueries := got[family]
+		if len(familyQueries) != 1 {
+			t.Fatalf("%s query count = %d, want 1: %#v", family, len(familyQueries), familyQueries)
+		}
+		query := familyQueries[0]
+		if query.TypeFilter != want {
+			t.Fatalf("%s typefilter = %q, want %q", family, query.TypeFilter, want)
+		}
+		if query.Store != "" {
+			t.Fatalf("%s store filter = %q, want empty", family, query.Store)
+		}
+	}
+}
+
 func TestClient_GetJobHealthEvidence_UsesBoundedFilteredTaskHistory(t *testing.T) {
 	oldLimit := pbsTaskHistoryPageLimit
 	oldPages := pbsTaskHistoryMaxPages