This is an automated cherry-pick of pingcap#4117

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot · Dec 29, 2021 · df8908d · df8908d
1 parent f4048d8
commit df8908d
Show file tree

Hide file tree

Showing 3 changed files with 25 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
@@ -544,12 +544,28 @@ func (h *HTTPHandler) GetProcessor(c *gin.Context) {
 		_ = c.Error(err)
 		return
 	}
+<<<<<<< HEAD
+=======
+	status, exist := statuses[captureID]
+	if !exist {
+		_ = c.Error(cerror.ErrCaptureNotExist.GenWithStackByArgs(captureID))
+		return
+	}
+>>>>>>> 998ec3ad3 (http_api (ticdc): fix http api 'get processor' panic. (#4117))
 
 	_, position, err := h.capture.etcdClient.GetTaskPosition(ctx, changefeedID, captureID)
 	if err != nil {
 		_ = c.Error(err)
 		return
 	}
+<<<<<<< HEAD
+=======
+	position, exist := positions[captureID]
+	if !exist {
+		_ = c.Error(cerror.ErrCaptureNotExist.GenWithStackByArgs(captureID))
+		return
+	}
+>>>>>>> 998ec3ad3 (http_api (ticdc): fix http api 'get processor' panic. (#4117))
 
 	processorDetail := &model.ProcessorDetail{CheckPointTs: position.CheckPointTs, ResolvedTs: position.ResolvedTs, Error: position.Error}
 	tables := make([]int64, 0)

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")