Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed issue for comments for cg independent fileset #1312

Merged
merged 2 commits into from
Mar 28, 2025
Merged

fixed issue for comments for cg independent fileset #1312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd33049
fixed issue of comments for cg independent fileset
badri-pathak Mar 27, 2025
a91cdf3
Merge branch 'dev' into issue_8456
badri-pathak Mar 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion driver/csiplugin/connectors/connectors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ type SpectrumScaleConnector interface {
UnlinkFileset(ctx context.Context, filesystemName string, filesetName string, force bool) error
//ListFilesets(filesystemName string) ([]resources.Volume, error)
ListFileset(ctx context.Context, filesystemName string, filesetName string) (Fileset_v2, error)
ListCSIIndependentFilesets(ctx context.Context, filesystemName string, pvcName string, namespace string) ([]Fileset_v2, error)
ListCSIIndependentFilesets(ctx context.Context, filesystemName string) ([]Fileset_v2, error)
GetFilesetsInodeSpace(ctx context.Context, filesystemName string, inodeSpace int) ([]Fileset_v2, error)
IsFilesetLinked(ctx context.Context, filesystemName string, filesetName string) (bool, error)
FilesetRefreshTask(ctx context.Context) error
Expand Down
4 changes: 2 additions & 2 deletions driver/csiplugin/connectors/rest_v2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1099,9 +1099,9 @@ func (s *SpectrumRestV2) CheckFilesetWithAFMTarget(ctx context.Context, filesyst
return "", nil
}

func (s *SpectrumRestV2) ListCSIIndependentFilesets(ctx context.Context, filesystemName string, pvcName string, namespace string) ([]Fileset_v2, error) {
func (s *SpectrumRestV2) ListCSIIndependentFilesets(ctx context.Context, filesystemName string) ([]Fileset_v2, error) {
loggerID := utils.GetLoggerId(ctx)
klog.V(4).Infof("[%s] rest_v2 ListCSIIndependentFilesets. filesystem: %s . pvcName %s, namespace %s", loggerID, filesystemName, pvcName, namespace)
klog.V(4).Infof("[%s] rest_v2 ListCSIIndependentFilesets. filesystem: %s .", loggerID, filesystemName)

encodedFilesetComment := strings.ReplaceAll(FilesetComment, " ", "%20")
url := fmt.Sprintf("scalemgmt/v2/filesystems/%s/filesets", filesystemName)
Expand Down
9 changes: 7 additions & 2 deletions driver/csiplugin/controllerserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ func (cs *ScaleControllerServer) validateCG(ctx context.Context, scVol *scaleVol
loggerId := utils.GetLoggerId(ctx)
klog.V(4).Infof("[%s] Validate CG for volume [%v]", loggerId, scVol)

fsetlist, err := scVol.Connector.ListCSIIndependentFilesets(ctx, scVol.VolBackendFs, scVol.PVCName, scVol.Namespace)
fsetlist, err := scVol.Connector.ListCSIIndependentFilesets(ctx, scVol.VolBackendFs)
if err != nil {
return "", err
}
Expand Down Expand Up @@ -559,7 +559,12 @@ func (cs *ScaleControllerServer) createFilesetVol(ctx context.Context, scVol *sc
}
} else {
// This means fileset is not present, create it
opt[connectors.FilesetCommentKey] = fmt.Sprintf(connectors.FilesetCommentValue, scVol.PVCName, scVol.Namespace)
if isCGIndependentFset {
opt[connectors.FilesetCommentKey] = fmt.Sprintf(connectors.FilesetCommentValue, volName, scVol.Namespace)
} else {
opt[connectors.FilesetCommentKey] = fmt.Sprintf(connectors.FilesetCommentValue, scVol.PVCName, scVol.Namespace)
}

fseterr = scVol.Connector.CreateFileset(ctx, scVol.VolBackendFs, volName, opt)
}

Expand Down