Skip to content

Commit d0158b7

Browse files
authored
Merge pull request #2 from lowang-bh/master
fix bug: gluster file params does not take effect
2 parents 08260a4 + 279e805 commit d0158b7

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

cmd/glusterfile-provisioner/glusterfile-provisioner.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ func (p *glusterfileProvisioner) createVolumeClone(sourceVolID string, config *p
304304

305305
volSource, volErr := p.createVolumeSource(cli, cloneVolInfo)
306306
if volErr != nil {
307-
return nil, 0, "", fmt.Errorf("error [%v] when creating volume source for volume %s", err, cloneVolInfo.Name)
307+
return nil, 0, "", fmt.Errorf("error [%v] when creating volume source for volume %s", volErr, cloneVolInfo.Name)
308308
}
309309

310310
if volSource == nil {
@@ -389,7 +389,7 @@ func (p *glusterfileProvisioner) CreateVolume(gid *int, config *provisionerConfi
389389
config.thinPoolSnapFactor,
390390
}
391391

392-
volumeReq := &gapi.VolumeCreateRequest{Size: sz, Name: customVolumeName, Clusters: clusterIDs, Gid: gid64, Durability: p.volumeType, GlusterVolumeOptions: p.volumeOptions, Snapshot: snaps}
392+
volumeReq := &gapi.VolumeCreateRequest{Size: sz, Name: customVolumeName, Clusters: clusterIDs, Gid: gid64, Durability: config.volumeType, GlusterVolumeOptions: config.volumeOptions, Snapshot: snaps}
393393

394394
volume, err := cli.VolumeCreate(volumeReq)
395395
if err != nil {
@@ -402,7 +402,7 @@ func (p *glusterfileProvisioner) CreateVolume(gid *int, config *provisionerConfi
402402

403403
volSource, volErr := p.createVolumeSource(cli, volume)
404404
if volErr != nil {
405-
return nil, 0, "", fmt.Errorf("error [%v] when creating volume source for volume %s", err, volume.Name)
405+
return nil, 0, "", fmt.Errorf("error [%v] when creating volume source for volume %s", volErr, volume.Name)
406406
}
407407

408408
if volSource == nil {

0 commit comments

Comments
 (0)