vulnstore: fix gc live lock

the previous query took an absurd amount of time to complete. updated with a more performant query. Signed-off-by: ldelossa <[email protected]>
quay · Feb 5, 2021 · 20a4437 · 20a4437
1 parent 966de96
commit 20a4437
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/cmd/libvulnhttp/main.go b/cmd/libvulnhttp/main.go
@@ -6,6 +6,7 @@ import (
 	"net/http"
 	"os"
 	"strings"
+	"time"
 
 	"github.com/crgimenes/goconfig"
 	"github.com/quay/zlog"
@@ -81,6 +82,9 @@ func confToLibvulnOpts(conf Config) *libvuln.Opts {
 		Migrations:               true,
 		UpdaterSets:              nil,
 		DisableBackgroundUpdates: conf.DisableBackgroundUpdates,
+		UpdateInterval:           30 * time.Second,
+		UpdateWorkers:            10,
+		UpdateRetention:          10,
 	}
 
 	return opts

diff --git a/internal/vulnstore/postgres/store.go b/internal/vulnstore/postgres/store.go
@@ -105,7 +105,7 @@ WHERE array_length(ordered_ops.refs, 1) > $2;
 `
 
 		deleteVulns = `
-DELETE FROM vuln WHERE id NOT IN (SELECT vuln FROM uo_vuln);
+DELETE FROM vuln WHERE NOT EXISTS (SELECT * FROM uo_vuln WHERE vuln.id = uo_vuln.vuln);
 `
 	)
-Original file line number
+Diff line change
@@ Expand Up / @@ -105,7 +105,7 @@ WHERE array_length(ordered_ops.refs, 1) > $2; @@
     `
     		deleteVulns = `
-    DELETE FROM vuln WHERE id NOT IN (SELECT vuln FROM uo_vuln);
+    DELETE FROM vuln WHERE NOT EXISTS (SELECT * FROM uo_vuln WHERE vuln.id = uo_vuln.vuln);
     `
     	)
@@ Expand Down @@