fix(rest): roll a clone or restore back when its parent group is deleted

config/manager/manager.yaml

@@ -104,4 +104,7 @@ spec:
         volumeMounts: []
       volumes: []
       serviceAccountName: controller-manager
-      terminationGracePeriodSeconds: 10
+      # The REST server's graceful-shutdown window is derived from the
+      # detached rollback budget (pkg/rest/rg_deleted_race.go); this has to
+      # outlive it, or a SIGTERM kills a compensation mid-cascade.
+      terminationGracePeriodSeconds: 20

internal/cli/local_props_test.go

@@ -0,0 +1,100 @@
+// SPDX-License-Identifier: Apache-2.0
+
+package cli_test
+
+import (
+	"context"
+	"testing"
+
+	apiv1 "github.com/cozystack/blockstor/pkg/api/v1"
+	"github.com/cozystack/blockstor/pkg/store"
+)
+
+func markPVCX(ctx context.Context, backend store.Store) {
+	def, err := backend.ResourceDefinitions().Get(ctx, "pvc-x")
+	if err != nil {
+		return
+	}
+
+	if def.Props == nil {
+		def.Props = map[string]string{}
+	}
+
+	def.Props[store.RollbackAbandonedProp] = "snapshots"
+	_ = backend.ResourceDefinitions().Update(ctx, &def)
+}
+
+// The CLI copies a definition's props onward on the same two paths the REST
+// door does, and the abandoned-rollback mark is about the definition it sits
+// on, never about a copy of it.
+func TestCLIDoesNotCarryTheAbandonedRollbackMarkOnward(t *testing.T) {
+	t.Parallel()
+
+	t.Run("snapshot-create", func(t *testing.T) {
+		t.Parallel()
+
+		app, _, errBuf := newApp(t, func(ctx context.Context, backend store.Store) {
+			seedSnapshotSource(ctx, backend)
+			markPVCX(ctx, backend)
+		})
+
+		if got := app.Run(t.Context(), []string{"s", "c", "pvc-x", "snap-m"}); got != 0 {
+			t.Fatalf("create exit = %d (stderr: %s)", got, errBuf.String())
+		}
+
+		snap, err := appStore(t, app).Snapshots().Get(t.Context(), "pvc-x", "snap-m")
+		if err != nil {
+			t.Fatalf("get snapshot: %v", err)
+		}
+
+		if step, ok := snap.Props[store.RollbackAbandonedProp]; ok {
+			t.Errorf("the snapshot carries the source's mark %q", step)
+		}
+	})
+
+	for _, tc := range []struct {
+		name string
+		seed func(context.Context, store.Store)
+	}{
+		{name: "restore-from-a-snapshot-carrying-it", seed: func(ctx context.Context, backend store.Store) {
+			seedSnapshotSource(ctx, backend)
+			_ = backend.Snapshots().Create(ctx, &apiv1.Snapshot{
+				Name: "snap-m", ResourceName: "pvc-x", Nodes: []string{"node-1", "node-2"},
+				Props:             map[string]string{store.RollbackAbandonedProp: "snapshots"},
+				VolumeDefinitions: []apiv1.SnapshotVolumeDef{{VolumeNumber: 0, SizeKib: 1 << 20}},
+			})
+		}},
+		{name: "restore-falling-back-to-the-source-props", seed: func(ctx context.Context, backend store.Store) {
+			seedSnapshotSource(ctx, backend)
+			markPVCX(ctx, backend)
+			_ = backend.Snapshots().Create(ctx, &apiv1.Snapshot{
+				Name: "snap-m", ResourceName: "pvc-x", Nodes: []string{"node-1", "node-2"},
+				VolumeDefinitions: []apiv1.SnapshotVolumeDef{{VolumeNumber: 0, SizeKib: 1 << 20}},
+			})
+		}},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			t.Parallel()
+
+			app, _, errBuf := newApp(t, tc.seed)
+
+			argv := []string{
+				"s", "resource", "restore",
+				"--from-resource", "pvc-x", "--from-snapshot", "snap-m", "--to-resource", "pvc-m",
+			}
+
+			if got := app.Run(t.Context(), argv); got != 0 {
+				t.Fatalf("restore exit = %d (stderr: %s)", got, errBuf.String())
+			}
+
+			def, err := appStore(t, app).ResourceDefinitions().Get(t.Context(), "pvc-m")
+			if err != nil {
+				t.Fatalf("get restored definition: %v", err)
+			}
+
+			if step, ok := def.Props[store.RollbackAbandonedProp]; ok {
+				t.Errorf("the restored definition carries the mark %q", step)
+			}
+		})
+	}
+}

internal/cli/snapshot.go

@@ -22,7 +22,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"maps"
 	"slices"
 	"strings"
 
@@ -235,7 +234,7 @@ func hydrateSnapshot(ctx context.Context, run *runContext, snap *apiv1.Snapshot)
 	}
 
 	if snap.Props == nil {
-		snap.Props = def.Props
+		snap.Props = store.TravellingProps(def.Props)
 	}
 
 	if snap.SnapshotDefinitionProps == nil {
@@ -327,11 +326,11 @@ func snapshotRestoreResource(ctx context.Context, run *runContext) error {
 		// group breaks the restore-then-list workflow.
 		ResourceGroupName: src.ResourceGroupName,
 		LayerStack:        src.LayerStack,
-		Props:             maps.Clone(snap.Props),
+		Props:             store.TravellingProps(snap.Props),
 	}
 
 	if def.Props == nil {
-		def.Props = maps.Clone(src.Props)
+		def.Props = store.TravellingProps(src.Props)
 	}
 
 	if def.Props == nil {

pkg/rest/cache_invalidation_bug_124_test.go

@@ -155,6 +155,10 @@ func (l *laggingRDs) Get(ctx context.Context, name string) (apiv1.ResourceDefini
 	return l.inner.Get(ctx, name) //nolint:wrapcheck // test helper
 }
 
+func (l *laggingRDs) GetUncached(ctx context.Context, name string) (apiv1.ResourceDefinition, error) {
+	return l.inner.GetUncached(ctx, name) //nolint:wrapcheck // test helper
+}
+
 func (l *laggingRDs) Create(ctx context.Context, rd *apiv1.ResourceDefinition) error {
 	return l.inner.Create(ctx, rd) //nolint:wrapcheck // test helper
 }