http_api (ticdc): fix http api 'get processor' panic. (pingcap#4117) (p…

…ingcap#4123) close pingcap#3840
ti-chi-bot · Jan 13, 2022 · 08bd008 · 08bd008
1 parent b55018e
commit 08bd008
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/cdc/capture/http_errors.go b/cdc/capture/http_errors.go
@@ -25,7 +25,7 @@ var httpBadRequestError = []*errors.Error{
 	cerror.ErrAPIInvalidParam, cerror.ErrSinkURIInvalid, cerror.ErrStartTsBeforeGC,
 	cerror.ErrChangeFeedNotExists, cerror.ErrTargetTsBeforeStartTs, cerror.ErrTableIneligible,
 	cerror.ErrFilterRuleInvalid, cerror.ErrChangefeedUpdateRefused, cerror.ErrMySQLConnectionError,
-	cerror.ErrMySQLInvalidConfig,
+	cerror.ErrMySQLInvalidConfig, cerror.ErrCaptureNotExist,
 }
 
 // IsHTTPBadRequestError check if a error is a http bad request error

diff --git a/cdc/capture/http_handler.go b/cdc/capture/http_handler.go
@@ -576,6 +576,7 @@ func (h *HTTPHandler) GetProcessor(c *gin.Context) {
 	status, exist := statuses[captureID]
 	if !exist {
 		_ = c.Error(cerror.ErrCaptureNotExist.GenWithStackByArgs(captureID))
+		return
 	}
 
 	positions, err := statusProvider.GetTaskPositions(ctx, changefeedID)
@@ -586,6 +587,7 @@ func (h *HTTPHandler) GetProcessor(c *gin.Context) {
 	position, exist := positions[captureID]
 	if !exist {
 		_ = c.Error(cerror.ErrCaptureNotExist.GenWithStackByArgs(captureID))
+		return
 	}
 
 	processorDetail := &model.ProcessorDetail{CheckPointTs: position.CheckPointTs, ResolvedTs: position.ResolvedTs, Error: position.Error}

diff --git a/tests/integration_tests/http_api/util/test_case.py b/tests/integration_tests/http_api/util/test_case.py
@@ -243,14 +243,19 @@ def list_processor():
 
 # must at least one table is sync will the test success
 def get_processor():
-    url = BASE_URL0 + "/processors"
-    resp = rq.get(url, cert=CERT, verify=VERIFY)
+    base_url = BASE_URL0 + "/processors"
+    resp = rq.get(base_url, cert=CERT, verify=VERIFY)
     assert resp.status_code == rq.codes.ok
     data = resp.json()[0]
-    url = url + "/" + data["changefeed_id"] + "/" + data["capture_id"]
+    url = base_url + "/" + data["changefeed_id"] + "/" + data["capture_id"]
     resp = rq.get(url, cert=CERT, verify=VERIFY)
     assert resp.status_code == rq.codes.ok
 
+    # test capture_id error and cdc server no panic
+    url = base_url + "/" + data["changefeed_id"] + "/" + "non-exist-capture-id"
+    resp = rq.get(url, cert=CERT, verify=VERIFY)
+    assert resp.status_code == rq.codes.bad_request
+
     print("pass test: get processors")