Rollback1 (apache#360)

* feat: rollback * feat: add at rollback sampel * feat: update
georgehao · Dec 5, 2022 · 9e10939 · 9e10939
1 parent 050b13d
commit 9e10939
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 15 deletions.
diff --git a/sample/at/gin/client/main.go b/sample/at/gin/client/main.go
@@ -19,8 +19,10 @@ package main
 
 import (
 	"context"
+	"errors"
 	"flag"
 	"fmt"
+	"net/http"
 	"time"
 
 	"github.com/parnurzeal/gorequest"
@@ -57,8 +59,8 @@ func updateData(ctx context.Context) (re error) {
 	request.Post(serverIpPort+"/updateDataSuccess").
 		Set(constant.XidKey, tm.GetXID(ctx)).
 		End(func(response gorequest.Response, body string, errs []error) {
-			if len(errs) != 0 {
-				re = errs[0]
+			if response.StatusCode != http.StatusOK {
+				re = errors.New("update data fail")
 			}
 		})
 	return

diff --git a/sample/at/gin/server/main.go b/sample/at/gin/server/main.go
@@ -41,7 +41,7 @@ func main() {
 	r.POST("/updateDataSuccess", func(c *gin.Context) {
 		log.Infof("get tm updateData")
 		if err := updateDataSuccess(c); err != nil {
-			c.JSON(http.StatusOK, "updateData failure")
+			c.JSON(http.StatusBadRequest, "updateData failure")
 			return
 		}
 		c.JSON(http.StatusOK, "updateData ok")

diff --git a/sample/at/rollback/client/main.go b/sample/at/rollback/client/main.go
@@ -19,8 +19,10 @@ package main
 
 import (
 	"context"
+	"errors"
 	"flag"
 	"fmt"
+	"net/http"
 	"time"
 
 	"github.com/parnurzeal/gorequest"
@@ -58,18 +60,17 @@ func updateData(ctx context.Context) (re error) {
 	request.Post(serverIpPort+"/updateDataSuccess").
 		Set(constant.XidKey, tm.GetXID(ctx)).
 		End(func(response gorequest.Response, body string, errs []error) {
-			if len(errs) != 0 {
-				re = errs[0]
+			if response.StatusCode != http.StatusOK {
+				re = errors.New("update data fail")
 			}
 		})
 
 	request.Post(serverIpPort2+"/updateDataFail").
 		Set(constant.XidKey, tm.GetXID(ctx)).
-		End(func(response gorequest.Response, body string, errs []error) {
-			if len(errs) != 0 {
-				re = errs[0]
+		End(func(response gorequest.Response, body string, errs1 []error) {
+			if response.StatusCode != http.StatusOK {
+				re = errors.New("update data fail")
 			}
 		})
-
 	return
 }
diff --git a/sample/at/rollback/server/main.go b/sample/at/rollback/server/main.go
@@ -41,7 +41,7 @@ func main() {
 	r.POST("/updateDataSuccess", func(c *gin.Context) {
 		log.Infof("get tm updateData")
 		if err := updateDataSuccess(c); err != nil {
-			c.JSON(http.StatusOK, "updateData failure")
+			c.JSON(http.StatusBadRequest, "updateData failure")
 			return
 		}
 		c.JSON(http.StatusOK, "updateData ok")

diff --git a/sample/at/rollback/server/service.go b/sample/at/rollback/server/service.go
@@ -43,13 +43,13 @@ func updateDataSuccess(ctx context.Context) error {
 	ret, err := db.ExecContext(ctx, sql, fmt.Sprintf("NewDescs100-%d", time.Now().UnixMilli()), 1)
 	if err != nil {
 		fmt.Printf("update failed, err:%v\n", err)
-		return nil
+		return err
 	}
 
 	rows, err := ret.RowsAffected()
 	if err != nil {
 		fmt.Printf("update failed, err:%v\n", err)
-		return nil
+		return err
 	}
 	fmt.Printf("update success： %d.\n", rows)
 	return nil

diff --git a/sample/at/rollback/server2/main.go b/sample/at/rollback/server2/main.go
@@ -41,7 +41,7 @@ func main() {
 	r.POST("/updateDataFail", func(c *gin.Context) {
 		log.Infof("get tm updateData")
 		if err := updateDataFail(c); err != nil {
-			c.JSON(http.StatusOK, "updateData failure")
+			c.JSON(http.StatusBadRequest, "updateData failure")
 			return
 		}
 		c.JSON(http.StatusOK, "updateData ok")

diff --git a/sample/at/rollback/server2/service.go b/sample/at/rollback/server2/service.go
@@ -43,13 +43,13 @@ func updateDataFail(ctx context.Context) error {
 	ret, err := db.ExecContext(ctx, sql, fmt.Sprintf("NewDescs1-%d", time.Now().UnixMilli()), 10000)
 	if err != nil {
 		fmt.Printf("update failed, err:%v\n", err)
-		return nil
+		return err
 	}
 
 	rows, err := ret.RowsAffected()
 	if err != nil {
 		fmt.Printf("update failed, err:%v\n", err)
-		return nil
+		return err
 	}
 	fmt.Printf("update success： %d.\n", rows)
 	return nil