add status

Signed-off-by: Shuaipeng Yu <jackysp@gmail.com>

server/http_handler.go

@@ -674,11 +674,13 @@ func (h configReloadHandler) ServeHTTP(w http.ResponseWriter, req *http.Request)
 // ServeHTTP recovers binlog service.
 func (h binlogRecover) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 	op := req.FormValue(qOperation)
-	if op == "reset" {
+	switch op {
+	case "reset":
 		binloginfo.ResetSkippedCommitterCounter()
-	} else if op == "nowait" {
+	case "nowait":
 		binloginfo.DisableSkipBinlogFlag()
-	} else {
+	case "status":
+	default:
 		sec, err := strconv.ParseInt(req.FormValue(qSeconds), 10, 64)
 		if sec <= 0 || err != nil {
 			sec = 1800
@@ -691,7 +693,7 @@ func (h binlogRecover) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 			return
 		}
 	}
-	writeData(w, "success!")
+	writeData(w, binloginfo.GetBinlogStatus())
 }
 
 type tableFlashReplicaInfo struct {

server/http_handler_test.go

@@ -298,6 +298,11 @@ func (ts *HTTPHandlerTestSuite) TestBinlogRecover(c *C) {
 	defer resp.Body.Close()
 	c.Assert(resp.StatusCode, Equals, http.StatusOK)
 	c.Assert(binloginfo.IsBinlogSkipped(), Equals, false)
+
+	resp, err = http.Get(fmt.Sprintf("http://127.0.0.1:10090/binlog/recover?op=status"))
+	c.Assert(err, IsNil)
+	defer resp.Body.Close()
+	c.Assert(resp.StatusCode, Equals, http.StatusOK)
 }
 
 func (ts *HTTPHandlerTestSuite) TestRegionsFromMeta(c *C) {

sessionctx/binloginfo/binloginfo.go

@@ -130,6 +130,20 @@ func IsBinlogSkipped() bool {
 	return atomic.LoadUint32(&skipBinlog) > 0
 }
 
+// BinlogRecoverStatus is used for display the binlog recovered status after some operations.
+type BinlogRecoverStatus struct {
+	Skipped                 bool
+	SkippedCommitterCounter int32
+}
+
+// GetBinlogStatus returns the binlog recovered status.
+func GetBinlogStatus() *BinlogRecoverStatus {
+	return &BinlogRecoverStatus{
+		Skipped:                 IsBinlogSkipped(),
+		SkippedCommitterCounter: SkippedCommitterCount(),
+	}
+}
+
 var skippedCommitterCounter int32
 
 // WaitBinlogRecover returns when all committing transaction finished.
@@ -155,7 +169,6 @@ func WaitBinlogRecover(timeout time.Duration) error {
 }
 
 // SkippedCommitterCount returns the number of alive committers whick skipped the binlog writing.
-// NOTE: it is used *ONLY* for test.
 func SkippedCommitterCount() int32 {
 	return atomic.LoadInt32(&skippedCommitterCounter)
 }