app: disable routes rebuild during app update

tsuru · Nov 30, 2018 · d8ff339 · d8ff339
1 parent 8a82867
commit d8ff339
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/app/actions.go b/app/actions.go
@@ -23,6 +23,7 @@ import (
 	"github.com/tsuru/tsuru/provision"
 	"github.com/tsuru/tsuru/repository"
 	"github.com/tsuru/tsuru/router"
+	"github.com/tsuru/tsuru/router/rebuild"
 	"github.com/tsuru/tsuru/servicemanager"
 	appTypes "github.com/tsuru/tsuru/types/app"
 	permTypes "github.com/tsuru/tsuru/types/permission"
@@ -476,7 +477,7 @@ var provisionAppNewProvisioner = action.Action{
 
 var provisionAppAddUnits = action.Action{
 	Name: "provision-app-add-unit",
-	Forward: func(ctx action.FWContext) (action.Result, error) {
+	Forward: func(ctx action.FWContext) (result action.Result, err error) {
 		app, ok := ctx.Params[0].(*App)
 		if !ok {
 			return nil, errors.New("expected app ptr as first arg")
@@ -494,6 +495,17 @@ var provisionAppAddUnits = action.Action{
 		for _, u := range units {
 			unitCount[u.ProcessName]++
 		}
+		routers := app.Routers
+		router := app.Router
+		app.Routers = nil
+		app.Router = ""
+		defer func() {
+			app.Routers = routers
+			app.Router = router
+			if err == nil {
+				_, err = rebuild.RebuildRoutes(app, false)
+			}
+		}()
 		for process, count := range unitCount {
 			err = app.AddUnits(count, process, w)
 			if err != nil {
@@ -503,6 +515,8 @@ var provisionAppAddUnits = action.Action{
 		return nil, err
 	},
 	Backward: func(ctx action.BWContext) {
+		app := ctx.Params[0].(*App)
+		rebuild.RoutesRebuildOrEnqueue(app.Name)
 	},
 }
 

diff --git a/app/app.go b/app/app.go
@@ -508,7 +508,6 @@ func (app *App) Update(updateData App, w io.Writer) (err error) {
 	if updateData.UpdatePlatform {
 		app.UpdatePlatform = true
 	}
-
 	err = app.validate()
 	if err != nil {
 		return err
@@ -520,11 +519,13 @@ func (app *App) Update(updateData App, w io.Writer) (err error) {
 		actions = append(actions, &updateAppProvisioner)
 	}
 	if newProv.GetName() != oldProv.GetName() {
+		defer func() {
+			rebuild.RoutesRebuildOrEnqueue(app.Name)
+		}()
 		err = validateVolumes(app)
 		if err != nil {
 			return err
 		}
-
 		actions = append(actions,
 			&provisionAppNewProvisioner,
 			&provisionAppAddUnits,