Merge branch '605-branching-with-selected-pool' into 'dle-4-0'

fix: filter branches by available pools (#605)

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

Author: Bogdan Tsechoev

engine/internal/provision/mode_local_test.go

@@ -142,7 +142,7 @@ func (m mockFSManager) ListBranches() (map[string]string, error) {
 	return nil, nil
 }
 
-func (m mockFSManager) ListAllBranches() ([]models.BranchEntity, error) {
+func (m mockFSManager) ListAllBranches(_ []string) ([]models.BranchEntity, error) {
 	return nil, nil
 }
 

engine/internal/provision/pool/manager.go

@@ -59,7 +59,7 @@ type Branching interface {
 	CreateBranch(branchName, snapshotID string) error
 	DestroyDataset(branchName string) (err error)
 	ListBranches() (map[string]string, error)
-	ListAllBranches() ([]models.BranchEntity, error)
+	ListAllBranches(filterPools []string) ([]models.BranchEntity, error)
 	GetRepo() (*models.Repo, error)
 	GetAllRepo() (*models.Repo, error)
 	SetRelation(parent, snapshotName string) error

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

@@ -199,7 +199,7 @@ func (m *LVManager) ListBranches() (map[string]string, error) {
 }
 
 // ListAllBranches lists all branches.
-func (m *LVManager) ListAllBranches() ([]models.BranchEntity, error) {
+func (m *LVManager) ListAllBranches(_ []string) ([]models.BranchEntity, error) {
 	log.Msg("ListAllBranches is not supported for LVM. Skip the operation")
 
 	return nil, nil

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

@@ -236,11 +236,17 @@ func (m *Manager) ListBranches() (map[string]string, error) {
 }
 
 // ListAllBranches lists all branches.
-func (m *Manager) ListAllBranches() ([]models.BranchEntity, error) {
+func (m *Manager) ListAllBranches(poolList []string) ([]models.BranchEntity, error) {
+	poolFilter := ""
+
+	if len(poolList) > 0 {
+		poolFilter += "-r " + strings.Join(poolList, " ")
+	}
+
 	cmd := fmt.Sprintf(
 		// Get all ZFS snapshots (-t) with options (-o) without output headers (-H).
 		// Excluding snapshots without "dle:branch" property ("grep -v").
-		`zfs list -H -t snapshot -o %s,name | grep -v "^-" | cat`, branchProp,
+		`zfs list -H -t snapshot -o %s,name %s | grep -v "^-" | cat`, branchProp, poolFilter,
 	)
 
 	out, err := m.runner.Run(cmd)

engine/internal/srv/branch.go

@@ -33,7 +33,7 @@ func (s *Server) listBranches(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	branches, err := fsm.ListAllBranches()
+	branches, err := s.getAllAvailableBranches(fsm)
 	if err != nil {
 		api.SendBadRequestError(w, r, err.Error())
 		return
@@ -85,6 +85,21 @@ func (s *Server) listBranches(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
+func (s *Server) getAllAvailableBranches(fsm pool.FSManager) ([]models.BranchEntity, error) {
+	if fsm == nil {
+		return nil, fmt.Errorf("no available pools")
+	}
+
+	// Filter by available pools in case if two or more DLE is running on the same pool and use the selectedPool feature.
+	poolNames := []string{}
+
+	for _, fsManager := range s.pm.GetFSManagerList() {
+		poolNames = append(poolNames, fsManager.Pool().Name)
+	}
+
+	return fsm.ListAllBranches(poolNames)
+}
+
 func findBranchParent(snapshots map[string]models.SnapshotDetails, parentID, branch string) (int, string) {
 	snapshotCounter := 0
 
@@ -121,13 +136,13 @@ func containsString(slice []string, s string) bool {
 }
 
 func (s *Server) getFSManagerForBranch(branchName string) (pool.FSManager, error) {
-	allBranches, err := s.pm.First().ListAllBranches()
+	allBranches, err := s.getAllAvailableBranches(s.pm.First())
 	if err != nil {
 		return nil, fmt.Errorf("failed to get branch list: %w", err)
 	}
 
 	for _, branchEntity := range allBranches {
-		if branchEntity.Name == branchName {
+		if branchEntity.Name == branchName { // TODO: filter by pool name as well because branch name is ambiguous.
 			return s.getFSManagerForSnapshot(branchEntity.SnapshotID)
 		}
 	}