Listen to vetshadow

Author: Matthew Wong

gluster/file/cmd/glusterfile-provisioner/glusterfile-provisioner.go

@@ -556,10 +556,10 @@ func getClusterNodes(cli *gcli.Client, cluster string) (dynamicHostIps []string,
 	// of the cluster on which provisioned volume belongs to, as there can be multiple
 	// clusters.
 	for _, node := range clusterinfo.Nodes {
-		nodei, err := cli.NodeInfo(string(node))
-		if err != nil {
-			glog.Errorf("failed to get host ipaddress: %v", err)
-			return nil, fmt.Errorf("failed to get host ipaddress: %v", err)
+		nodei, err2 := cli.NodeInfo(string(node))
+		if err2 != nil {
+			glog.Errorf("failed to get host ipaddress: %v", err2)
+			return nil, fmt.Errorf("failed to get host ipaddress: %v", err2)
 		}
 		ipaddr := dstrings.Join(nodei.NodeAddRequest.Hostnames.Storage, "")
 		dynamicHostIps = append(dynamicHostIps, ipaddr)

iscsi/targetd/provisioner/iscsi-provisioner.go

@@ -236,15 +236,15 @@ func (p *iscsiProvisioner) createVolume(options controller.VolumeOptions) (vol s
 	chapCredentials := &chapSessionCredentials{}
 	//read chap session authentication credentials
 	if getBool(options.Parameters["chapAuthSession"]) {
-		prop, err := properties.LoadFile(viper.GetString("session-chap-credential-file-path"), properties.UTF8)
-		if err != nil {
-			log.Warnln(err)
-			return "", 0, "", err
+		prop, err2 := properties.LoadFile(viper.GetString("session-chap-credential-file-path"), properties.UTF8)
+		if err2 != nil {
+			log.Warnln(err2)
+			return "", 0, "", err2
 		}
-		err = prop.Decode(chapCredentials)
-		if err != nil {
-			log.Warnln(err)
-			return "", 0, "", err
+		err2 = prop.Decode(chapCredentials)
+		if err2 != nil {
+			log.Warnln(err2)
+			return "", 0, "", err2
 		}
 	}
 

lib/controller/controller.go

@@ -1033,7 +1033,7 @@ func (ctrl *ProvisionController) provisionClaimOperation(claim *v1.PersistentVol
 	}
 
 	// Check if this provisioner can provision this claim.
-	if err := ctrl.canProvision(claim); err != nil {
+	if err = ctrl.canProvision(claim); err != nil {
 		ctrl.eventRecorder.Event(claim, v1.EventTypeWarning, "ProvisioningFailed", err.Error())
 		glog.Errorf("Failed to provision volume for claim %q with StorageClass %q: %v",
 			claimToClaimKey(claim), claimClass, err)