From 943040d8278884e6d33ad3ca06ccdb236e2dcf8c Mon Sep 17 00:00:00 2001 From: zouyee Date: Tue, 5 Dec 2017 08:47:55 +0800 Subject: [PATCH] outdent err block --- pkg/volume/util.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkg/volume/util.go b/pkg/volume/util.go index e289051698..ab394fe8be 100644 --- a/pkg/volume/util.go +++ b/pkg/volume/util.go @@ -87,9 +87,8 @@ func internalRecycleVolumeByWatchingPodUntilCompletion(pvName string, pod *v1.Po // Recycler will try again and the old pod will be hopefuly deleted // at that time. return fmt.Errorf("old recycler pod found, will retry later") - } else { - return fmt.Errorf("unexpected error creating recycler pod: %+v\n", err) } + return fmt.Errorf("unexpected error creating recycler pod: %+v", err) } err = waitForPod(pod, recyclerClient, podCh) @@ -274,9 +273,8 @@ func CalculateTimeoutForVolume(minimumTimeout, timeoutIncrement int, pv *v1.Pers timeout := (pvSize / giSize) * int64(timeoutIncrement) if timeout < int64(minimumTimeout) { return int64(minimumTimeout) - } else { - return timeout } + return timeout } // RoundUpSize calculates how many allocation units are needed to accommodate @@ -304,7 +302,7 @@ func GenerateVolumeName(clusterName, pvName string, maxLength int) string { return prefix + "-" + pvName } -// Check if the path from the mounter is empty. +// GetPath checks if the path from the mounter is empty. func GetPath(mounter Mounter) (string, error) { path := mounter.GetPath() if path == "" { @@ -313,7 +311,7 @@ func GetPath(mounter Mounter) (string, error) { return path, nil } -// ChooseZone implements our heuristics for choosing a zone for volume creation based on the volume name +// ChooseZoneForVolume implements our heuristics for choosing a zone for volume creation based on the volume name // Volumes are generally round-robin-ed across all active zones, using the hash of the PVC Name. // However, if the PVCName ends with `-`, we will hash the prefix, and then add the integer to the hash. // This means that a StatefulSet's volumes (`claimname-statefulsetname-id`) will spread across available zones,