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

fix: set gid of volume mount point to avoid the issue of time exceeding #1891

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix: set gid of volume mount point to avoid the issue of time exceeding #1891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2347cae
fix: set gid of volume mount point to avoid the issue of time exceeding
m-anyac Mar 19, 2025
93cdc96
fix mismatch gid on pod and volume
m-anyac Mar 20, 2025
ff556e9
setgid and permission
m-anyac Mar 21, 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
6 changes: 3 additions & 3 deletions pkg/blob/nodeserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,9 +385,9 @@ func (d *Driver) NodeStageVolume(ctx context.Context, req *csi.NodeStageVolumeRe
}

if volumeMountGroup != "" && fsGroupChangePolicy != FSGroupChangeNone {
klog.V(2).Infof("set gid of volume(%s) as %s using fsGroupChangePolicy(%s)", volumeID, volumeMountGroup, fsGroupChangePolicy)
if err := volumehelper.SetVolumeOwnership(targetPath, volumeMountGroup, fsGroupChangePolicy); err != nil {
return nil, status.Error(codes.Internal, fmt.Sprintf("SetVolumeOwnership with volume(%s) on %s failed with %v", volumeID, targetPath, err))
klog.V(2).Infof("set gid of volume(%s) as %s when fsGroupChangePolicy(%s)", volumeID, volumeMountGroup, fsGroupChangePolicy)
if err := volumehelper.SetRootOwnership(targetPath, volumeMountGroup); err != nil {
return nil, status.Error(codes.Internal, fmt.Sprintf("Failed to set GID of root directory %s to %s failed with %v", targetPath, volumeMountGroup, err))
}
}

Expand Down
32 changes: 32 additions & 0 deletions pkg/util/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,38 @@ func SetVolumeOwnership(path, gid, policy string) error {
return volume.SetVolumeOwnership(&VolumeMounter{path: path}, path, &gidInt64, &fsGroupChangePolicy, nil)
}

// SetRootOwnership sets the ownership of the root directory, Setgid bit and permission
func SetRootOwnership(rootDir string, fsgroup string) error {
gid, err := strconv.Atoi(fsgroup)
if err != nil {
return fmt.Errorf("convert %s to int failed with %v", fsgroup, err)
}

if err := os.Lchown(rootDir, -1, gid); err != nil {
return fmt.Errorf("set root ownership failed with %v", err)
}

fsInfo, err := os.Stat(rootDir)
if err != nil {
return fmt.Errorf("failed to get file system info for %s: %v", rootDir, err)
}

if fsInfo.Mode()&os.ModeSymlink != 0 {
return nil
}

unixPerms := os.FileMode(0660)
unixPerms |= os.ModeSetgid
unixPerms |= os.FileMode(0110)

err = os.Chmod(rootDir, fsInfo.Mode()|unixPerms)
if err != nil {
klog.ErrorS(err, "chmod failed", "path", rootDir)
}

return nil
}

// ExecFunc returns a exec function's output and error
type ExecFunc func() (err error)

Expand Down
Loading