Merge pull request #200 from cybozu-go/fix/snapid-number

fix: ignore node on snapIDPreconditionSatisfied()

Author: satoru-takeuchi

internal/controller/finbackup_controller.go

@@ -672,9 +672,6 @@ func snapIDPreconditionSatisfied(backup *finv1.FinBackup, otherFinBackups []finv
 		if fb.Status.SnapID == nil {
 			return fmt.Errorf("found another FinBackup with nil SnapID: %s", fb.Name)
 		}
-		if fb.Spec.Node != backup.Spec.Node {
-			continue
-		}
 
 		snapID := *fb.Status.SnapID
 		if snapID > targetSnapID {

internal/controller/finbackup_controller_test.go

@@ -1322,7 +1322,15 @@ func Test_snapIDPreconditionSatisfied(t *testing.T) {
 			backup: createFinBackup("new-backup", 3, "node1", true, nil),
 			otherFinBackups: []finv1.FinBackup{
 				*createFinBackup("backup", 2, "node1", true, nil),
-				*createFinBackup("other-backup", 1, "node2", false, nil),
+				*createFinBackup("other-backup", 1, "node2", true, nil),
+			},
+			wantErr: true,
+		},
+		{
+			name:   "only FinBackup in different node",
+			backup: createFinBackup("new-backup", 2, "node1", true, nil),
+			otherFinBackups: []finv1.FinBackup{
+				*createFinBackup("other-backup", 1, "node2", true, nil),
 			},
 			wantErr: false,
 		},
@@ -1369,16 +1377,6 @@ func Test_snapIDPreconditionSatisfied(t *testing.T) {
 			},
 			wantErr: true,
 		},
-		{
-			name:   "two smaller SnapIDs on different node",
-			backup: createFinBackup("new-backup", 4, "node2", true, nil),
-			otherFinBackups: []finv1.FinBackup{
-				*createFinBackup("other-1", 3, "node1", true, nil),
-				*createFinBackup("backup", 1, "node2", true, nil),
-				*createFinBackup("other-2", 2, "node1", true, nil),
-			},
-			wantErr: false,
-		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {