Merge pull request #1082 from flanksource/check-deleted-at

fix: check deleted_at before running canaries and update cron management
flanksource · Jun 19, 2023 · 8763b85 · 8763b85
2 parents 27fe7cc + cde3b6d
commit 8763b85
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/checks/namespace.go b/checks/namespace.go
@@ -390,7 +390,8 @@ func (c *NamespaceChecker) getHTTP(url string, timeout int64, deadline time.Time
 		hardDeadline = softTimeoutDeadline
 	}
 
-	ctx, _ := gocontext.WithDeadline(gocontext.Background(), hardDeadline) // nolint: govet
+	ctx, cancelFunc := gocontext.WithDeadline(gocontext.Background(), hardDeadline)
+	defer cancelFunc()
 
 	req, err := http.NewRequest("GET", url, nil)
 	if err != nil {

diff --git a/checks/pod.go b/checks/pod.go
@@ -465,7 +465,8 @@ func (c *PodChecker) getHTTP(url string, timeout int64, deadline time.Time) (str
 		hardDeadline = softTimeoutDeadline
 	}
 
-	ctx, _ := gocontext.WithDeadline(gocontext.Background(), hardDeadline) // nolint: govet
+	ctx, cancelFunc := gocontext.WithDeadline(gocontext.Background(), hardDeadline)
+	defer cancelFunc()
 
 	req, err := http.NewRequest("GET", url, nil)
 	if err != nil {

diff --git a/checks/runchecks.go b/checks/runchecks.go
@@ -1,16 +1,28 @@
 package checks
 
 import (
+	"database/sql"
 	"time"
 
 	"github.com/flanksource/canary-checker/api/context"
 	v1 "github.com/flanksource/canary-checker/api/v1"
 	"github.com/flanksource/canary-checker/pkg"
+	"github.com/flanksource/canary-checker/pkg/db"
 	"github.com/flanksource/commons/logger"
 )
 
 func RunChecks(ctx *context.Context) []*pkg.CheckResult {
 	var results []*pkg.CheckResult
+
+	// Check if canary is not marked deleted in DB
+	if db.Gorm != nil {
+		var deletedAt sql.NullTime
+		err := db.Gorm.Table("canaries").Select("deleted_at").Where("id = ?", ctx.Canary.GetPersistedID()).Scan(&deletedAt).Error
+		if err == nil && deletedAt.Valid {
+			return results
+		}
+	}
+
 	checks := ctx.Canary.Spec.GetAllChecks()
 	ctx.Debugf("[%s] checking %d checks", ctx.Canary.Name, len(checks))
 	for _, c := range All {

diff --git a/pkg/jobs/canary/canary_jobs.go b/pkg/jobs/canary/canary_jobs.go
@@ -3,7 +3,6 @@ package canary
 import (
 	"fmt"
 	"path"
-	"reflect"
 	"sync"
 	"time"
 
@@ -243,13 +242,7 @@ func SyncCanaryJob(canary v1.Canary) error {
 
 	entry := findCronEntry(canary)
 	if entry != nil {
-		job := entry.Job.(CanaryJob)
-		if !reflect.DeepEqual(job.Canary.Spec, canary.Spec) {
-			logger.Infof("Rescheduling %s canary with updated specs", canary)
-			CanaryScheduler.Remove(entry.ID)
-		} else {
-			return nil
-		}
+		CanaryScheduler.Remove(entry.ID)
 	}
 
 	job := CanaryJob{