Merge branch '605-branch-name-of-snapshot' into 'dle-4-0'

fix: display the actual branch name of a snapshot even if not the latest (#605)

See merge request postgres-ai/database-lab!1016

Author: bogdan-ts

engine/internal/provision/mode_local_test.go

@@ -214,10 +214,6 @@ func (m mockFSManager) KeepRelation(_ string) error {
 	return nil
 }
 
-func (m mockFSManager) FindBranchBySnapshot(snapshot string) (string, error) {
-	return "", nil
-}
-
 func TestBuildPoolEntry(t *testing.T) {
 	testCases := []struct {
 		pool          *resources.Pool

engine/internal/provision/pool/manager.go

@@ -78,7 +78,6 @@ type Branching interface {
 	Reset(snapshotID string, options thinclones.ResetOptions) error
 	HasDependentEntity(snapshotName string) ([]string, error)
 	KeepRelation(snapshotName string) error
-	FindBranchBySnapshot(snapshot string) (string, error)
 }
 
 // Pooler describes methods for Pool providing.

engine/internal/provision/thinclones/lvm/lvmanager.go

@@ -316,10 +316,3 @@ func (m *LVManager) KeepRelation(_ string) error {
 
 	return nil
 }
-
-// FindBranchBySnapshot finds the branch which the snapshot belongs to.
-func (m *LVManager) FindBranchBySnapshot(_ string) (string, error) {
-	log.Msg("KeepRelation is not supported for LVM. Skip the operation")
-
-	return "", nil
-}

engine/internal/provision/thinclones/zfs/branching.go

@@ -582,29 +582,6 @@ func (m *Manager) KeepRelation(snapshotName string) error {
 	return nil
 }
 
-// FindBranchBySnapshot finds the branch which the snapshot belongs to.
-func (m *Manager) FindBranchBySnapshot(snapshot string) (string, error) {
-	branch, err := m.getProperty(branchProp, snapshot)
-	if err != nil {
-		return "", err
-	}
-
-	if branch != "" {
-		return branch, nil
-	}
-
-	child, err := m.getProperty(childProp, snapshot)
-	if err != nil {
-		return "", fmt.Errorf("failed to check snapshot child property: %w", err)
-	}
-
-	if child != "" {
-		return m.FindBranchBySnapshot(child)
-	}
-
-	return "", nil
-}
-
 func (m *Manager) addToSet(property, snapshot, value string) error {
 	original, err := m.getProperty(property, snapshot)
 	if err != nil {

engine/internal/provision/thinclones/zfs/zfs.go

@@ -33,6 +33,9 @@ const (
 
 	// PoolMode defines the zfs filesystem name.
 	PoolMode = "zfs"
+
+	// Clone must have 3 segments: branch, name, revision.
+	numCloneSegments = 3
 )
 
 // ListEntry defines entry of ZFS list command.
@@ -285,7 +288,7 @@ func (m *Manager) ListClonesNames() ([]string, error) {
 
 		segments := strings.Split(bc, "/")
 
-		if len(segments) <= 1 {
+		if len(segments) != numCloneSegments {
 			// It's a branch dataset, not a clone. Skip it.
 			continue
 		}
@@ -696,14 +699,24 @@ func (m *Manager) getSnapshots() ([]resources.Snapshot, error) {
 			continue
 		}
 
+		branch := entry.Branch
+
+		if branch == empty {
+			if parsedBranch := branching.ParseBranchNameFromSnapshot(entry.Name, m.config.Pool.Name); parsedBranch != "" {
+				branch = parsedBranch
+			} else {
+				branch = branching.DefaultBranch
+			}
+		}
+
 		snapshot := resources.Snapshot{
 			ID:                entry.Name,
 			CreatedAt:         entry.Creation,
 			DataStateAt:       entry.DataStateAt,
 			Used:              entry.Used,
 			LogicalReferenced: entry.LogicalReferenced,
 			Pool:              m.config.Pool.Name,
-			Branch:            entry.Branch,
+			Branch:            branch,
 			Message:           entry.Message,
 		}
 

engine/internal/provision/thinclones/zfs/zfs_test.go

@@ -37,7 +37,7 @@ func TestListClones(t *testing.T) {
 		{
 			caseName: "single clone",
 			cmdOutput: `datastore/branch/main/clone_pre_20200831030000
-datastore/branch/main/cls19p20l4rc73bc2v9g
+datastore/branch/main/cls19p20l4rc73bc2v9g/r0
 `,
 			cloneNames: []string{
 				"cls19p20l4rc73bc2v9g",
@@ -46,8 +46,8 @@ datastore/branch/main/cls19p20l4rc73bc2v9g
 		{
 			caseName: "multiple clones",
 			cmdOutput: `datastore/branch/main/clone_pre_20200831030000
-datastore/branch/main/cls19p20l4rc73bc2v9g
-datastore/branch/main/cls184a0l4rc73bc2v90
+datastore/branch/main/cls19p20l4rc73bc2v9g/r0
+datastore/branch/main/cls184a0l4rc73bc2v90/r0
 `,
 			cloneNames: []string{
 				"cls19p20l4rc73bc2v9g",
@@ -57,8 +57,8 @@ datastore/branch/main/cls184a0l4rc73bc2v90
 		{
 			caseName: "clone duplicate",
 			cmdOutput: `datastore/branch/main/clone_pre_20200831030000
-datastore/branch/main/cls19p20l4rc73bc2v9g
-datastore/branch/main/cls19p20l4rc73bc2v9g
+datastore/branch/main/cls19p20l4rc73bc2v9g/r0
+datastore/branch/main/cls19p20l4rc73bc2v9g/r1
 `,
 			cloneNames: []string{
 				"cls19p20l4rc73bc2v9g",
@@ -67,8 +67,8 @@ datastore/branch/main/cls19p20l4rc73bc2v9g
 		{
 			caseName: "different pool",
 			cmdOutput: `datastore/branch/main/clone_pre_20200831030000
-dblab_pool/branch/main/cls19p20l4rc73bc2v9g
-datastore/branch/main/cls184a0l4rc73bc2v90
+dblab_pool/branch/main/cls19p20l4rc73bc2v9g/r0
+datastore/branch/main/cls184a0l4rc73bc2v90/r0
 `,
 			cloneNames: []string{
 				"cls184a0l4rc73bc2v90",
@@ -77,7 +77,7 @@ datastore/branch/main/cls184a0l4rc73bc2v90
 		{
 			caseName: "no matched clone",
 			cmdOutput: `datastore/branch/main/clone_pre_20200831030000
-dblab_pool/branch/main/cls19p20l4rc73bc2v9g
+dblab_pool/branch/main/cls19p20l4rc73bc2v9g/r0
 `,
 			cloneNames: []string{},
 		},