add cancel check in drainBackOff

cybozu-go · Apr 19, 2024 · f27329c · f27329c
1 parent 5798f89
commit f27329c
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/op/reboot.go b/op/reboot.go
@@ -568,6 +568,14 @@ func drainBackOff(ctx context.Context, inf cke.Infrastructure, entry *cke.Reboot
 		"name":      entry.Node,
 		log.FnError: err,
 	})
+
+	etcdEntry, err := inf.Storage().GetRebootsEntry(ctx, entry.Index)
+	if err != nil {
+		return err
+	}
+	if etcdEntry.Status == cke.RebootStatusCancelled {
+		return nil
+	}
 	entry.Status = cke.RebootStatusQueued
 	entry.LastTransitionTime = time.Now().Truncate(time.Second).UTC()
 	entry.DrainBackOffCount++