Merge pull request #740 from Icinga/retry-schema-check

icingadb.DB: Retry Schema Checks
Icinga · Apr 11, 2024 · 889a153 · 889a153
2 parents 109372f + fab2765
commit 889a153
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/pkg/icingadb/db.go b/pkg/icingadb/db.go
@@ -110,7 +110,19 @@ func (db *DB) CheckSchema(ctx context.Context) error {
 
 	var version uint16
 
-	err := db.QueryRowxContext(ctx, "SELECT version FROM icingadb_schema ORDER BY id DESC LIMIT 1").Scan(&version)
+	err := retry.WithBackoff(
+		ctx,
+		func(ctx context.Context) (err error) {
+			query := "SELECT version FROM icingadb_schema ORDER BY id DESC LIMIT 1"
+			err = db.QueryRowxContext(ctx, query).Scan(&version)
+			if err != nil {
+				err = internal.CantPerformQuery(err, query)
+			}
+			return
+		},
+		retry.Retryable,
+		backoff.NewExponentialWithJitter(128*time.Millisecond, 1*time.Minute),
+		db.getDefaultRetrySettings())
 	if err != nil {
 		return errors.Wrap(err, "can't check database schema version")
 	}