mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-22 14:20:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: address wasted assign issues

Browse Source 
At places variable is reassigned without
being used.

Signed-off-by: Yati Padia <ypadia@redhat.com>
This commit is contained in:
Yati Padia 2021-05-11 18:13:39 +05:30 committed by mergify[bot]
parent bfe64d4aee
commit 0f44c6acb7
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
e2e/utils.go
View File

@ -587,7 +587,7 @@ func validatePVCClone(totalCount int, sourcePvcPath, sourceAppPath, clonePvcPath
wgErrs[n] = createPVCAndApp(name, f, &p, &a, deployTimeout) wgErrs[n] = createPVCAndApp(name, f, &p, &a, deployTimeout)
if *pvc.Spec.VolumeMode == v1.PersistentVolumeFilesystem && wgErrs[n] == nil { if *pvc.Spec.VolumeMode == v1.PersistentVolumeFilesystem && wgErrs[n] == nil {
filePath := a.Spec.Containers[0].VolumeMounts[0].MountPath + "/test" filePath := a.Spec.Containers[0].VolumeMounts[0].MountPath + "/test"
checkSumClone := "" var checkSumClone string
e2elog.Logf("Calculating checksum clone for filepath %s", filePath) e2elog.Logf("Calculating checksum clone for filepath %s", filePath)
checkSumClone, chErrs[n] = calculateSHA512sum(f, &a, filePath, &opt) checkSumClone, chErrs[n] = calculateSHA512sum(f, &a, filePath, &opt)
e2elog.Logf("checksum for clone is %s", checkSumClone) e2elog.Logf("checksum for clone is %s", checkSumClone)
@ -779,7 +779,7 @@ func validatePVCSnapshot(totalCount int, pvcPath, appPath, snapshotPath, pvcClon
wgErrs[n] = createPVCAndApp(name, f, &p, &a, deployTimeout) wgErrs[n] = createPVCAndApp(name, f, &p, &a, deployTimeout)
if wgErrs[n] == nil { if wgErrs[n] == nil {
filePath := a.Spec.Containers[0].VolumeMounts[0].MountPath + "/test" filePath := a.Spec.Containers[0].VolumeMounts[0].MountPath + "/test"
checkSumClone := "" var checkSumClone string
e2elog.Logf("calculating checksum clone for filepath %s", filePath) e2elog.Logf("calculating checksum clone for filepath %s", filePath)
checkSumClone, chErrs[n] = calculateSHA512sum(f, &a, filePath, &opt) checkSumClone, chErrs[n] = calculateSHA512sum(f, &a, filePath, &opt)
e2elog.Logf("checksum value for the clone is %s with pod name %s", checkSumClone, name) e2elog.Logf("checksum value for the clone is %s with pod name %s", checkSumClone, name)

2
internal/rbd/controllerserver.go
View File

@ -794,7 +794,7 @@ func (cs *ControllerServer) CreateSnapshot(ctx context.Context, req *csi.CreateS
} }
}() }()
ready := false var ready bool
var vol = new(rbdVolume) var vol = new(rbdVolume)
ready, vol, err = cs.doSnapshotClone(ctx, rbdVol, rbdSnap, cr) ready, vol, err = cs.doSnapshotClone(ctx, rbdVol, rbdSnap, cr)

2
internal/util/vault.go
View File

@ -168,7 +168,7 @@ func (vc *vaultConnection) initConnection(config map[string]interface{}) error {
return err return err
} }
if firstInit || !errors.Is(err, errConfigOptionMissing) { if firstInit || !errors.Is(err, errConfigOptionMissing) {
vaultCAVerify := false var vaultCAVerify bool
vaultCAVerify, err = strconv.ParseBool(verifyCA) vaultCAVerify, err = strconv.ParseBool(verifyCA)
if err != nil { if err != nil {
return fmt.Errorf("failed to parse 'vaultCAVerify': %w", err) return fmt.Errorf("failed to parse 'vaultCAVerify': %w", err)