Merge pull request #214 from clintonskitson/bugfix/ec2_createcheck

Added getvolume check on create
rexray · Dec 15, 2015 · 6f214ca · 6f214ca
2 parents d38ab94 + 1d076f2
commit 6f214ca
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/drivers/storage/ec2/ec2.go b/drivers/storage/ec2/ec2.go
@@ -376,6 +376,15 @@ func (d *driver) CreateVolume(
 	runAsync bool, volumeName, volumeID, snapshotID, volumeType string,
 	IOPS, size int64, availabilityZone string) (*core.Volume, error) {
 
+	volumes, err := d.GetVolume("", volumeName)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(volumes) > 0 {
+		return nil, goof.WithField("volumeName", volumeName, "volume name already exists")
+	}
+
 	resp, err := d.createVolume(
 		runAsync, volumeName, volumeID, snapshotID, volumeType,
 		IOPS, size, availabilityZone)
@@ -384,7 +393,7 @@ func (d *driver) CreateVolume(
 		return nil, err
 	}
 
-	volumes, err := d.GetVolume(resp.VolumeId, "")
+	volumes, err = d.GetVolume(resp.VolumeId, "")
 	if err != nil {
 		return nil, err
 	}