Fix original error being overwritten before returned

This commit is contained in:
Alistair Scott 2017-02-18 10:35:44 +03:30
parent 4d11cbc577
commit fc62687b2c

View File

@ -750,9 +750,9 @@ func (p *glusterfsVolumeProvisioner) CreateVolume(gid int) (r *v1.GlusterfsVolum
endpoint, service, err := p.createEndpointService(epNamespace, epServiceName, dynamicHostIps, p.options.PVC.Name) endpoint, service, err := p.createEndpointService(epNamespace, epServiceName, dynamicHostIps, p.options.PVC.Name)
if err != nil { if err != nil {
glog.Errorf("glusterfs: failed to create endpoint/service: %v", err) glog.Errorf("glusterfs: failed to create endpoint/service: %v", err)
err = cli.VolumeDelete(volume.Id) delete_err := cli.VolumeDelete(volume.Id)
if err != nil { if delete_err != nil {
glog.Errorf("glusterfs: error when deleting the volume :%v , manual deletion required", err) glog.Errorf("glusterfs: error when deleting the volume :%v , manual deletion required", delete_err)
} }
return nil, 0, fmt.Errorf("failed to create endpoint/service %v", err) return nil, 0, fmt.Errorf("failed to create endpoint/service %v", err)
} }