Merge pull request #80451 from cwdsuzhou/July/fix_error_override

Fix error override when saveVolumeData occurs error
This commit is contained in:
Kubernetes Prow Robot 2019-07-24 02:02:15 -07:00 committed by GitHub
commit da3daf2e8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -440,9 +440,8 @@ func (p *csiPlugin) NewMounter(
if err := saveVolumeData(dataDir, volDataFileName, volData); err != nil {
klog.Error(log("failed to save volume info data: %v", err))
if err := os.RemoveAll(dataDir); err != nil {
klog.Error(log("failed to remove dir after error [%s]: %v", dataDir, err))
return nil, err
if removeErr := os.RemoveAll(dataDir); removeErr != nil {
klog.Error(log("failed to remove dir after error [%s]: %v", dataDir, removeErr))
}
return nil, err
}
@ -685,9 +684,8 @@ func (p *csiPlugin) NewBlockVolumeMapper(spec *volume.Spec, podRef *api.Pod, opt
if err := saveVolumeData(dataDir, volDataFileName, volData); err != nil {
klog.Error(log("failed to save volume info data: %v", err))
if err := os.RemoveAll(dataDir); err != nil {
klog.Error(log("failed to remove dir after error [%s]: %v", dataDir, err))
return nil, err
if removeErr := os.RemoveAll(dataDir); removeErr != nil {
klog.Error(log("failed to remove dir after error [%s]: %v", dataDir, removeErr))
}
return nil, err
}