Properly initialize http client to fix multiple submission issue (#153)

lyft · Jan 7, 2020 · 7d7379b · 7d7379b
1 parent 7fc2230
commit 7d7379b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/controller/flink/client/api.go b/pkg/controller/flink/client/api.go
@@ -157,7 +157,7 @@ func (c *FlinkJobManagerClient) GetClusterOverview(ctx context.Context, url stri
 // Helper method to execute the requests
 func (c *FlinkJobManagerClient) executeRequest(ctx context.Context,
 	method string, url string, payload interface{}) (*resty.Response, error) {
-	client := resty.SetLogger(logger.GetLogWriter(ctx)).SetTimeout(defaultTimeOut)
+	client := resty.New().SetLogger(logger.GetLogWriter(ctx)).SetTimeout(defaultTimeOut)
 
 	var resp *resty.Response
 	var err error

diff --git a/pkg/controller/flinkapplication/flink_state_machine.go b/pkg/controller/flinkapplication/flink_state_machine.go
@@ -542,7 +542,7 @@ func (s *FlinkStateMachine) handleRollingBack(ctx context.Context, app *v1beta1.
 		// we've failed in our roll back attempt (presumably because something's now wrong with the original cluster)
 		// move immediately to the DeployFailed state so that the user can recover.
 		s.flinkController.LogEvent(ctx, app, corev1.EventTypeWarning, "RollbackFailed",
-			fmt.Sprintf("Failed to rollback to origin deployment, manual intervention needed: %s", reason))
+			fmt.Sprintf("Failed to rollback to original deployment, manual intervention needed: %s", reason))
 		return s.deployFailed(ctx, app)
 	}