github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Fix tx closed error when upperdirlabel specified

Browse Source 
When upperdirLabel specified, overlay Update will throw tx closed error since Commit is invoked before GetInfo

Signed-off-by: cardy.tang <zuniorone@gmail.com>
This commit is contained in:
cardy.tang 2022-05-24 00:05:36 +08:00
parent b5107a8984
commit 9f9ebbd991
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
snapshots/overlay/overlay.go
View File

@ -160,10 +160,6 @@ func (o *snapshotter) Update(ctx context.Context, info snapshots.Info, fieldpath
return snapshots.Info{}, err return snapshots.Info{}, err
} }
if err := t.Commit(); err != nil {
return snapshots.Info{}, err
}
if o.upperdirLabel { if o.upperdirLabel {
id, _, _, err := storage.GetInfo(ctx, info.Name) id, _, _, err := storage.GetInfo(ctx, info.Name)
if err != nil { if err != nil {
@ -175,6 +171,10 @@ func (o *snapshotter) Update(ctx context.Context, info snapshots.Info, fieldpath
info.Labels[upperdirKey] = o.upperPath(id) info.Labels[upperdirKey] = o.upperPath(id)
} }
if err := t.Commit(); err != nil {
return snapshots.Info{}, err
}
return info, nil return info, nil
} }