Merge pull request #49826 from dixudx/fix_err_msg_on_two_lines

Automatic merge from submit-queue (batch tested with PRs 49826, 53404). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. avoid newline "\n" in the error to break log msg to 2 lines **What this PR does / why we need it**: **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #49813 **Special notes for your reviewer**: /cc @justinsb @rrati **Release note**: ```release-note avoid newline "\n" in the error to break log msg to 2 lines ```

Merge pull request #49826 from dixudx/fix_err_msg_on_two_lines
15992a6a · Kubernetes Submit Queue · GitHub · 41568a06 · 4bef8af6 · 15992a6a
Commit 15992a6a authored Oct 03, 2017 by Kubernetes Submit Queue Committed by GitHub Oct 03, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

exponential_backoff.go ...il/goroutinemap/exponentialbackoff/exponential_backoff.go +2 -3

No files found.
--- a/pkg/util/goroutinemap/exponentialbackoff/exponential_backoff.go
+++ b/pkg/util/goroutinemap/exponentialbackoff/exponential_backoff.go
@@ -69,9 +69,8 @@ func (expBackoff *ExponentialBackoff) Update(err *error) {
 	expBackoff.lastErrorTime = time.Now()
 }
-func (expBackoff *ExponentialBackoff) GenerateNoRetriesPermittedMsg(
+func (expBackoff *ExponentialBackoff) GenerateNoRetriesPermittedMsg(operationName string) string {
-	operationName string) string {
+	return fmt.Sprintf("Operation for %q failed. No retries permitted until %v (durationBeforeRetry %v). Error: %q",
-	return fmt.Sprintf("Operation for %q failed. No retries permitted until %v (durationBeforeRetry %v). Error: %v",
 		operationName,
 		expBackoff.lastErrorTime.Add(expBackoff.durationBeforeRetry),
 		expBackoff.durationBeforeRetry,