cleanup <ID>-init dir and the symlink in <rootdir>/l on failure #49974
Conversation
|
@thaJeztah @vvoland Could you please review this pr, thanks. |
There was a problem hiding this comment.
This seems to make sense, but I'm also slightly wondering if there's possible errors that should be handled differently (although it looks like Removee already handles "not found" errors for at least some implementations).
I could definitely use some more eyes on this to make sure this is the correct approach.
I noticed there's another location where ls.driver.CreateReadWrite is called, and at a quick glance I didn't see a cleanup there as well;
Lines 531 to 536 in c3f484d
| @@ -659,15 +659,19 @@ func (ls *layerStore) initMount(graphID, parent, mountLabel string, initFunc Mou | |||
| } | |||
There was a problem hiding this comment.
If we need to remove on any failure, we could use a defer;
- add a
retErroutput variable
func (ls *layerStore) initMount(graphID, parent, mountLabel string, initFunc MountInit, storageOpt map[string]string) (_ string, retErr error) {- define a defer here that attempts to remove on failure;
defer func() {
if retErr != nil {
// cleanup on failure
if err := ls.driver.Remove(initID); err != nil {
log.G(context.TODO()).WithFields(log.Fields{
"initID": initID,
"error": err,
}).Warnf("Removing init layer after failure: %v", retErr)
}
}
}()3a1c2e9 to
43aa788
Compare
|
Done, thank you for your suggestion. @thaJeztah |
Signed-off-by: zzzzzzzzzy9 <zhang.yu58@zte.com.cn>
43aa788 to
16cf038
Compare
|
cc @dmcgowan ISTR you wanted to have a look |
- What I did
This code is used to clean up init when
initMountfails, including the<initID>-initfolder and<rootdir>/lfolder.- How I did it
Use the
ls.driver.Remove()function to cleanup on failure.- How to verify it
- Human readable description for the release notes
- A picture of a cute animal (not mandatory but encouraged)