fs: Fix setting new deployment ID in format when not present (#8517)

The code does not properly set a new deployemnt ID when not present
in format.json: it loops twice without releasing write lock on format.json
causing an infinite locking error on the same file.

This commit fixes and simplifies a little the code.
This commit is contained in:
Anis Elleuch 2019-11-13 21:18:23 +01:00 committed by kannappanr
parent e9b2bf00ad
commit 60690a7e1d

View File

@ -350,27 +350,24 @@ func formatFSFixDeploymentID(fsFormatPath string) error {
logger.Info("Another minio process(es) might be holding a lock to the file %s. Please kill that minio process(es) (elapsed %s)\n", fsFormatPath, getElapsedTime())
continue
}
if err != nil {
break
}
if err = jsonLoad(wlk, format); err != nil {
break
}
// Check if format needs to be updated
if format.ID != "" {
err = nil
break
}
format.ID = mustGetUUID()
if err = jsonSave(wlk, format); err != nil {
break
}
break
}
if wlk != nil {
wlk.Close()
if err != nil {
return err
}
return err
defer wlk.Close()
if err = jsonLoad(wlk, format); err != nil {
return err
}
// Check if format needs to be updated
if format.ID != "" {
return nil
}
// Set new UUID to the format and save it
format.ID = mustGetUUID()
return jsonSave(wlk, format)
}