Skip to content

fix: transaction in routes and upstreams #306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 12, 2020
Merged

fix: transaction in routes and upstreams #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
148 changes: 106 additions & 42 deletions api/route/route.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,30 +134,45 @@ func listRoute(c *gin.Context) {

func deleteRoute(c *gin.Context) {
rid := c.Param("rid")
// todo params check
// delete from apisix
request := &service.ApisixRouteRequest{}
if _, err := request.Delete(rid); err != nil {
e := errno.FromMessage(errno.ApisixRouteDeleteError, err.Error())
db := conf.DB()
tx := db.Begin()
defer func() {
if r := recover(); r != nil {
tx.Rollback()
}
}()
// delete from mysql
rd := &service.Route{}
rd.ID = uuid.FromStringOrNil(rid)
if err := conf.DB().Delete(rd).Error; err != nil {
tx.Rollback()
e := errno.FromMessage(errno.DBRouteDeleteError, err.Error())
logger.Error(e.Msg)
c.AbortWithStatusJSON(http.StatusInternalServerError, e.Response())
return
} else {
// delete from mysql
rd := &service.Route{}
rd.ID = uuid.FromStringOrNil(rid)
if err := conf.DB().Delete(rd).Error; err != nil {
e := errno.FromMessage(errno.DBRouteDeleteError, err.Error())
logger.Error(e.Msg)
c.AbortWithStatusJSON(http.StatusInternalServerError, e.Response())
return
request := &service.ApisixRouteRequest{}
if _, err := request.Delete(rid); err != nil {
tx.Rollback()
if httpError, ok := err.(*errno.HttpError); ok {
c.AbortWithStatusJSON(httpError.Code, httpError.Msg)
return
} else {
e := errno.FromMessage(errno.ApisixRouteDeleteError, err.Error())
logger.Error(e.Msg)
c.AbortWithStatusJSON(http.StatusInternalServerError, e.Response())
return
}
}
}
if err := tx.Commit().Error; err != nil {
e := errno.FromMessage(errno.ApisixRouteDeleteError, err.Error())
logger.Error(e.Msg)
}
c.Data(http.StatusOK, service.ContentType, errno.Success())
}
func updateRoute(c *gin.Context) {
rid := c.Param("rid")
// todo params check
param, exist := c.Get("requestBody")
if !exist || len(param.([]byte)) < 1 {
e := errno.FromMessage(errno.RouteRequestError, "route create with no post data")
Expand All @@ -173,27 +188,52 @@ func updateRoute(c *gin.Context) {
return
}
logger.Info(routeRequest.Plugins)

db := conf.DB()
arr := service.ToApisixRequest(routeRequest)
logger.Info(arr)
if resp, err := arr.Update(rid); err != nil {
e := errno.FromMessage(errno.ApisixRouteUpdateError, err.Error())
logger.Error(e.Msg)
c.AbortWithStatusJSON(http.StatusInternalServerError, e.Response())
var resp *service.ApisixRouteResponse
if rd, err := service.ToRoute(routeRequest, arr, uuid.FromStringOrNil(rid), nil); err != nil {
c.AbortWithStatusJSON(http.StatusInternalServerError, err.Response())
return
} else {
// update mysql
if rd, err := service.ToRoute(routeRequest, arr, uuid.FromStringOrNil(rid), resp); err != nil {
c.AbortWithStatusJSON(http.StatusInternalServerError, err.Response())
tx := db.Begin()
defer func() {
if r := recover(); r != nil {
tx.Rollback()
}
}()
logger.Info(rd)
if err := tx.Model(&service.Route{}).Update(rd).Error; err != nil {
// rollback
tx.Rollback()
e := errno.FromMessage(errno.DBRouteCreateError, err.Error())
logger.Error(e.Msg)
c.AbortWithStatusJSON(http.StatusInternalServerError, e.Response())
return
} else {
if err := conf.DB().Model(&service.Route{}).Update(rd).Error; err != nil {
if resp, err = arr.Update(rid); err != nil {
tx.Rollback()
if httpError, ok := err.(*errno.HttpError); ok {
c.AbortWithStatusJSON(httpError.Code, httpError.Msg)
return
} else {
e := errno.FromMessage(errno.ApisixRouteCreateError, err.Error())
logger.Error(e.Msg)
c.AbortWithStatusJSON(http.StatusInternalServerError, e.Response())
return
}
}
}
if err := tx.Commit().Error; err == nil {
// update content_admin_api
if rd, err := service.ToRoute(routeRequest, arr, uuid.FromStringOrNil(rid), resp); err != nil {
e := errno.FromMessage(errno.DBRouteUpdateError, err.Error())
logger.Error(e.Msg)
c.AbortWithStatusJSON(http.StatusInternalServerError, e.Response())
return
} else {
if err := conf.DB().Model(&service.Route{}).Update(rd).Error; err != nil {
e := errno.FromMessage(errno.DBRouteUpdateError, err.Error())
logger.Error(e.Msg)
}
}
logger.Info(rd)
}
}
c.Data(http.StatusOK, service.ContentType, errno.Success())
Expand Down Expand Up @@ -235,7 +275,6 @@ func findRoute(c *gin.Context) {
func createRoute(c *gin.Context) {
u4 := uuid.NewV4()
rid := u4.String()
// todo params check
param, exist := c.Get("requestBody")
if !exist || len(param.([]byte)) < 1 {
e := errno.FromMessage(errno.RouteRequestError, "route create with no post data")
Expand All @@ -251,26 +290,51 @@ func createRoute(c *gin.Context) {
return
}
logger.Info(routeRequest.Plugins)

db := conf.DB()
arr := service.ToApisixRequest(routeRequest)
logger.Info(arr)
if resp, err := arr.Create(rid); err != nil {
e := errno.FromMessage(errno.ApisixRouteCreateError, err.Error())
logger.Error(e.Msg)
c.AbortWithStatusJSON(http.StatusInternalServerError, e.Response())
var resp *service.ApisixRouteResponse
if rd, err := service.ToRoute(routeRequest, arr, u4, nil); err != nil {
c.AbortWithStatusJSON(http.StatusInternalServerError, err.Response())
return
} else {
// update mysql
if rd, err := service.ToRoute(routeRequest, arr, u4, resp); err != nil {
c.AbortWithStatusJSON(http.StatusInternalServerError, err.Response())
tx := db.Begin()
defer func() {
if r := recover(); r != nil {
tx.Rollback()
}
}()
logger.Info(rd)
if err := tx.Create(rd).Error; err != nil {
// rollback
tx.Rollback()
e := errno.FromMessage(errno.DBRouteCreateError, err.Error())
logger.Error(e.Msg)
c.AbortWithStatusJSON(http.StatusInternalServerError, e.Response())
return
} else {
logger.Info(rd)
if err := conf.DB().Create(rd).Error; err != nil {
e := errno.FromMessage(errno.DBRouteCreateError, err.Error())
if resp, err = arr.Create(rid); err != nil {
tx.Rollback()
if httpError, ok := err.(*errno.HttpError); ok {
c.AbortWithStatusJSON(httpError.Code, httpError.Msg)
return
} else {
e := errno.FromMessage(errno.ApisixRouteCreateError, err.Error())
logger.Error(e.Msg)
c.AbortWithStatusJSON(http.StatusInternalServerError, e.Response())
return
}
}
}
if err := tx.Commit().Error; err == nil {
// update content_admin_api
if rd, err := service.ToRoute(routeRequest, arr, u4, resp); err != nil {
e := errno.FromMessage(errno.DBRouteUpdateError, err.Error())
logger.Error(e.Msg)
c.AbortWithStatusJSON(http.StatusInternalServerError, e.Response())
return
} else {
if err := conf.DB().Model(&service.Route{}).Update(rd).Error; err != nil {
e := errno.FromMessage(errno.DBRouteUpdateError, err.Error())
logger.Error(e.Msg)
}
}
}
}
Expand Down
Loading