Merge branch 'master' into log-message

longhorn · Jul 16, 2023 · 9914ab0 · 9914ab0
2 parents 25d5ccf + c59efbf
commit 9914ab0
Show file tree

Hide file tree

Showing 3 changed files with 584 additions and 452 deletions.
diff --git a/controller/snapshot_controller.go b/controller/snapshot_controller.go
@@ -335,7 +335,8 @@ func (sc *SnapshotController) reconcile(snapshotName string) (err error) {
 			}
 		}()
 
-		if _, ok := snapshot.Status.Children["volume-head"]; ok && snapshot.Status.MarkRemoved {
+		_, snapshotExistInEngineCR := engine.Status.Snapshots[snapshot.Name]
+		if _, hasVolumeHeadChild := snapshot.Status.Children["volume-head"]; snapshotExistInEngineCR && hasVolumeHeadChild && snapshot.Status.MarkRemoved {
 			// This snapshot is the parent of volume-head, so it cannot be purged immediately.
 			// We do not want to keep the volume stuck in attached state.
 			return sc.handleAttachmentTicketDeletion(snapshot)