fix merge leftovers; use canary driver-registrar image, as v1.0.0 is not hosted in quay.io

Signed-off-by: Huamin Chen <hchen@redhat.com>
This commit is contained in:
Huamin Chen
2019-01-15 13:30:59 -05:00
parent 684f753581
commit aed7506d88
3 changed files with 2 additions and 5 deletions

View File

@ -86,9 +86,6 @@ func (cs *controllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
volumeNameMutex.LockKey(req.GetName())
defer volumeNameMutex.UnlockKey(req.GetName())
volumeNameMutex.LockKey(req.GetName())
defer volumeNameMutex.UnlockKey(req.GetName())
// Need to check for already existing volume name, and if found
// check for the requested capacity and already allocated capacity
if exVol, err := getRBDVolumeByName(req.GetName()); err == nil {