fix: subvolume path construction

Signed-off-by: Utkarsh Bhatt <utkarsh.bhatt@canonical.com>

Author: UtkarshBhatthere

microceph/ceph/cephfs_mirror.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"slices"
 	"strings"
 
 	"github.com/canonical/microceph/microceph/api/types"
@@ -99,24 +100,15 @@ func GetCephFsAllVolumeMirrorMap(ctx context.Context) (MirrorPathMap, error) {
 
 // GetCephFSSubvolumeMirrorState fetches the subvolume mirroring state for the CephFS volume.
 func GetCephFSSubvolumeMirrorState(rh *CephfsReplicationHandler) (ReplicationState, error) {
-	subvolumegroup := rh.Request.SubvolumeGroup
-	subvolume := rh.Request.Subvolume
-	volume := rh.Request.Volume
+	r := rh.Request
 
-	subvolumePath, err := GetCephFSSubvolumePath(volume, subvolumegroup, subvolume)
-	if err != nil {
-		return StateInvalidReplication, err
-	}
-
-	return GetCephFSMirrorPathState(rh, subvolumePath)
+	return GetCephFSMirrorPathState(rh, GetCephFSSubvolumePath(r.SubvolumeGroup, r.Subvolume))
 }
 
 // GetCephFSMirrorPathState checks whether requested path is in mirror paths list
 func GetCephFSMirrorPathState(rh *CephfsReplicationHandler, path string) (ReplicationState, error) {
-	for _, mirrorPath := range rh.MirrorList {
-		if path == mirrorPath {
-			return StateEnabledReplication, nil
-		}
+	if slices.Contains(rh.MirrorList, path) {
+		return StateEnabledReplication, nil
 	}
 
 	return StateDisabledReplication, nil
@@ -149,29 +141,29 @@ func GetCephFsMirrorPeerStatus(ctx context.Context, adminSockPath string, volume
 // FindCephFsMirrorAdminSockPath tests relevant admin socks and returns the correct one.
 // Some CephFSMirror commands can only work with admin socket.
 func FindCephFsMirrorAdminSockPath() (string, error) {
-	run_path := constants.GetPathConst().RunPath
+	runPath := constants.GetPathConst().RunPath
 
-	open_sockets, err := os.ReadDir(run_path)
+	openSockets, err := os.ReadDir(runPath)
 	if err != nil {
-		logger.Errorf("failed to read run path %s: %v", run_path, err)
+		logger.Errorf("failed to read run path %s: %v", runPath, err)
 		return "", err
 	}
 
-	logger.Debugf("MIRCFS: found %d open sockets in %s", len(open_sockets), run_path)
-	for _, socket := range open_sockets {
+	logger.Debugf("MIRCFS: found %d open sockets in %s", len(openSockets), runPath)
+	for _, socket := range openSockets {
 		logger.Debugf("MIRCFS: checking file : %s", socket.Name())
 
 		if !strings.Contains(socket.Name(), "ceph-client.cephfs-mirror") {
 			continue
 		}
 
-		full_sock_path := filepath.Join(run_path, socket.Name())
-		err = CheckFsMirrorHelperCommands(full_sock_path)
+		fullSockPath := filepath.Join(runPath, socket.Name())
+		err = CheckFsMirrorHelperCommands(fullSockPath)
 		if err != nil {
 			continue
 		}
 
-		return full_sock_path, nil
+		return fullSockPath, nil
 	}
 
 	return "", nil

microceph/ceph/cephfs_volume.go

@@ -66,6 +66,8 @@ func CephFsSubvolumePathDeconstruct(path string) (subvolumegroup string, subvolu
 		return "", "", fmt.Errorf("invalid CephFS subvolume path: %s", path)
 	}
 
+	logger.Debugf("FSVOL: %+v", parts)
+
 	subvolumegroup = parts[CephFsSubVolumeGroupIndex]
 	subvolume = parts[CephFsSubVolumeIndex]
 
@@ -170,14 +172,13 @@ func GetCephFSSubvolumes(volume Volume, subvolumegroup string) ([]Subvolume, err
 }
 
 // GetCephFSSubvolumePath retrieves the full path of a specified subvolume within a CephFS volume and subvolume group.
-func GetCephFSSubvolumePath(volume string, subvolumegroup string, subvolume string) (string, error) {
-	var args []string
-
+func GetCephFSSubvolumePath(subvolumegroup string, subvolume string) string {
+	var retval string
 	if len(subvolumegroup) != 0 {
-		args = []string{"fs", "subvolume", "getpath", volume, subvolume, subvolumegroup}
+		retval = fmt.Sprintf("/volumes/%s/%s/", subvolumegroup, subvolume)
 	} else {
-		args = []string{"fs", "subvolume", "getpath", volume, subvolume}
+		retval = fmt.Sprintf("/volumes/_nogroup/%s/", subvolume)
 	}
 
-	return cephRun(args...)
+	return retval
 }

microceph/ceph/replication_cephfs.go

@@ -160,7 +160,7 @@ func (rh *CephfsReplicationHandler) DisableHandler(ctx context.Context, args ...
 	case types.CephfsResourceVolume:
 		err = disableCephFSVolumeMirror(ctx, rh.Request, rh.MirrorList)
 	case types.CephfsResourceSubvolume:
-		err = cephFSSnapshotMirrorRemovePath(ctx, rh.Request.Volume, fmt.Sprintf("/volumes/%s/%s", rh.Request.SubvolumeGroup, rh.Request.Subvolume))
+		err = cephFSSnapshotMirrorRemovePath(ctx, rh.Request.Volume, GetCephFSSubvolumePath(rh.Request.SubvolumeGroup, rh.Request.Subvolume))
 	case types.CephfsResourceDirectory:
 		err = cephFSSnapshotMirrorRemovePath(ctx, rh.Request.Volume, rh.Request.DirPath)
 	default:
@@ -405,7 +405,7 @@ func enableCephFSResourceMirror(ctx context.Context, request types.CephfsReplica
 
 	switch request.ResourceType {
 	case types.CephfsResourceSubvolume:
-		resourcePath = fmt.Sprintf("/volumes/%s/%s", request.SubvolumeGroup, request.Subvolume)
+		resourcePath = GetCephFSSubvolumePath(request.SubvolumeGroup, request.Subvolume)
 	case types.CephfsResourceDirectory:
 		resourcePath = request.DirPath
 	default: