Skip to content

[feat.] Refactor Attach/Detach functions from private to public. #333

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

Merged
merged 1 commit into from
Nov 18, 2025
Merged

[feat.] Refactor Attach/Detach functions from private to public. #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions pkg/snapshot/overlay.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ func (o *snapshotter) createMountPoint(ctx context.Context, kind snapshots.Kind,
downloadBlob := info.Labels[label.DownloadRemoteBlob]
if downloadBlob == "download" && stype == storageTypeRemoteBlock {
log.G(ctx).Infof("download blob %s", targetRef)
if err := o.constructOverlayBDSpec(ctx, key, false); err != nil {
if err := o.ConstructOverlayBDSpec(ctx, key, false); err != nil {
return nil, err
}
rollback = false
Expand Down Expand Up @@ -531,7 +531,7 @@ func (o *snapshotter) createMountPoint(ctx context.Context, kind snapshots.Kind,
return nil, err
}

if err := o.constructOverlayBDSpec(ctx, targetRef, false); err != nil {
if err := o.ConstructOverlayBDSpec(ctx, targetRef, false); err != nil {
return nil, err
}

Expand All @@ -552,7 +552,7 @@ func (o *snapshotter) createMountPoint(ctx context.Context, kind snapshots.Kind,
log.G(ctx).Infof("Preparing rootfs(%s). writeType: %s", s.ID, writeType)
if writeType != RoDir {
stype = storageTypeLocalBlock
if err := o.constructOverlayBDSpec(ctx, key, true); err != nil {
if err := o.ConstructOverlayBDSpec(ctx, key, true); err != nil {
log.G(ctx).Errorln(err.Error())
return nil, err
}
Expand Down Expand Up @@ -612,7 +612,7 @@ func (o *snapshotter) createMountPoint(ctx context.Context, kind snapshots.Kind,
}
}
log.G(ctx).Debugf("attachAndMountBlockDevice (obdID: %s, writeType: %s, fsType %s, targetPath: %s)",
obdID, writeType, fsType, o.overlaybdTargetPath(obdID))
obdID, writeType, fsType, overlaybdTargetPath(obdHbaNum(o.tenant), obdID))
if err = o.attachAndMountBlockDevice(ctx, obdID, writeType, fsType, parent == ""); err != nil {
log.G(ctx).Errorf("%v", err)
return nil, fmt.Errorf("failed to attach and mount for snapshot %v: %w", obdID, err)
Expand Down Expand Up @@ -828,7 +828,7 @@ func (o *snapshotter) Commit(ctx context.Context, name, key string, opts ...snap
} else if _, err := o.loadBackingStoreConfig(id); err != nil {
log.G(ctx).Info("not an overlaybd writable layer")
} else {
if err := o.unmountAndDetachBlockDevice(ctx, id, key); err != nil {
if err := o.UnmountAndDetachBlockDevice(ctx, id); err != nil {
return fmt.Errorf("failed to destroy target device for snapshot %s: %w", key, err)
}

Expand Down Expand Up @@ -863,7 +863,7 @@ func (o *snapshotter) Commit(ctx context.Context, name, key string, opts ...snap
// since there could be multiple fs metadata in a turboOCI layer
if isTurboOCI, digest, _ := o.checkTurboOCI(info.Labels); isTurboOCI {
log.G(ctx).Infof("commit turboOCI.v1 layer: (%s, %s)", id, digest)
if err := o.constructOverlayBDSpec(ctx, name, false); err != nil {
if err := o.ConstructOverlayBDSpec(ctx, name, false); err != nil {
return fmt.Errorf("failed to construct overlaybd config: %w", err)
}
stype = storageTypeNormal
Expand All @@ -873,14 +873,14 @@ func (o *snapshotter) Commit(ctx context.Context, name, key string, opts ...snap
// then change stype to 'storageTypeLocalBlock' which can make it attach a overlaybd block
if stype == storageTypeLocalLayer {
log.G(ctx).Infof("convet a local blob to turboOCI layer (sn: %s)", id)
if err := o.constructOverlayBDSpec(ctx, name, false); err != nil {
if err := o.ConstructOverlayBDSpec(ctx, name, false); err != nil {
return fmt.Errorf("failed to construct overlaybd config: %w", err)
}
stype = storageTypeLocalBlock
}

if stype == storageTypeLocalBlock {
if err := o.constructOverlayBDSpec(ctx, name, false); err != nil {
if err := o.ConstructOverlayBDSpec(ctx, name, false); err != nil {
return fmt.Errorf("failed to construct overlaybd config: %w", err)
}

Expand Down Expand Up @@ -1022,7 +1022,7 @@ func (o *snapshotter) Remove(ctx context.Context, key string) (err error) {
if stype != storageTypeNormal {
_, err = os.Stat(o.overlaybdBackstoreMarkFile(id))
if err == nil {
err = o.unmountAndDetachBlockDevice(ctx, id, key)
err = o.UnmountAndDetachBlockDevice(ctx, id)
if err != nil {
return mylog.TracedErrorf(ctx, "failed to destroy target device for snapshot %s: %w", key, err)
}
Expand All @@ -1039,7 +1039,7 @@ func (o *snapshotter) Remove(ctx context.Context, key string) (err error) {

log.G(ctx).Debugf("try to verify parent snapshots format.")
if st, err := o.identifySnapshotStorageType(ctx, s.ParentIDs[0], info); err == nil && st != storageTypeNormal {
err = o.unmountAndDetachBlockDevice(ctx, s.ParentIDs[0], "")
err = o.UnmountAndDetachBlockDevice(ctx, s.ParentIDs[0])
if err != nil {
return mylog.TracedErrorf(ctx, "failed to destroy target device for snapshot %s: %w", key, err)
}
Expand Down
Loading
Loading