opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 10:46:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(host,region): container rootfs use sub directory (#23289)

Browse Source
This commit is contained in:
Zexi Li
2025-09-12 15:08:01 +08:00
committed by GitHub
parent e85643a005
commit cfc2dc783d
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/container_drivers/volume_mount/disk.go
+3 -2
View File
@@ -145,8 +145,9 @@ func (d disk) ToHostRootFs(rootFs *apis.ContainerRootfs) (*hostapi.ContainerRoot
return &hostapi.ContainerRootfs{
Type: rootFs.Type,
Disk: &hostapi.ContainerVolumeMountDisk{
Index: disk.Index,
Id: disk.Id,
Index: disk.Index,
Id: disk.Id,
SubDirectory: disk.SubDirectory,
},
}, nil
}
pkg/hostman/container/snapshot_service/snapshot_service.go
+6
View File
@@ -85,6 +85,8 @@ func (s *overlayRootFsUpperSnapshotter) Prepare(ctx context.Context, key string,
if err != nil {
return nil, errors.Wrapf(err, "Prepare with %s", key)
}
infoJson := jsonutils.Marshal(mounts)
log.Debugf("prepare request key: %s, parent: %s, mounts: %s", key, parent, infoJson.String())
mounts, err = s.changeUpper(ctx, key, mounts)
if err != nil {
return nil, errors.Wrapf(err, "Prepare.changeUpper with %s", key)
@@ -97,6 +99,8 @@ func (s *overlayRootFsUpperSnapshotter) View(ctx context.Context, key string, pa
if err != nil {
return nil, errors.Wrapf(err, "View with %s", key)
}
infoJson := jsonutils.Marshal(mounts)
log.Debugf("view request key: %s, parent: %s, info: %s", key, parent, infoJson.String())
mounts, err = s.changeUpper(ctx, key, mounts)
if err != nil {
return nil, errors.Wrapf(err, "View.changeUpper with %s", key)
@@ -112,6 +116,7 @@ func (s *overlayRootFsUpperSnapshotter) changeUpper(ctx context.Context, key str
if err != nil {
return nil, errors.Wrapf(err, "Stat with %s", key)
}
log.Debugf("change upper key: %s, info: %s", key, jsonutils.Marshal(info))
serverId, ok := info.Labels[LabelServerId]
if !ok || serverId == "" {
return mounts, nil
@@ -128,6 +133,7 @@ func (s *overlayRootFsUpperSnapshotter) changeUpper(ctx context.Context, key str
if err != nil {
return mounts, errors.Wrapf(err, "GetRootFsMountPath with %s, %s", serverId, containerId)
}
log.Debugf("changeUpper: rootFsPath: %s , container: %s", rootFsPath, containerId)
upperPath := path.Join(rootFsPath, "upper")
workPath := path.Join(rootFsPath, "work")
for _, dir := range []string{upperPath, workPath} {