Merge pull request #290 from arangodb/bug-fix/broken-ui-redeployed-op

neunhoef · web-flow · commit 2f2347dbe612 · 2018-11-02T11:34:49.000+01:00
UI Fix
diff --git a/pkg/deployment/cluster_scaling_integration.go b/pkg/deployment/cluster_scaling_integration.go
@@ -132,11 +132,11 @@ func (ci *clusterScalingIntegration) inspectCluster(ctx context.Context, expectS
 	ci.lastNumberOfServers.mutex.Lock()
 	defer ci.lastNumberOfServers.mutex.Unlock()
 	desired := ci.lastNumberOfServers.NumberOfServers
-	if req.Coordinators != nil && desired.Coordinators != nil && req.GetCoordinators() != desired.GetCoordinators() {
+	if req.Coordinators != nil && req.GetCoordinators() != desired.GetCoordinators() {
 		// #Coordinator has changed
 		coordinatorsChanged = true
 	}
-	if req.DBServers != nil && desired.DBServers != nil && req.GetDBServers() != desired.GetDBServers() {
+	if req.DBServers != nil && req.GetDBServers() != desired.GetDBServers() {
 		// #DBServers has changed
 		dbserversChanged = true
 	}

Original file line number	Diff line number	Diff line change
`@@ -132,11 +132,11 @@ func (ci *clusterScalingIntegration) inspectCluster(ctx context.Context, expectS`
`132`	`132`	`ci.lastNumberOfServers.mutex.Lock()`
`133`	`133`	`defer ci.lastNumberOfServers.mutex.Unlock()`
`134`	`134`	`desired := ci.lastNumberOfServers.NumberOfServers`
`135`		`- if req.Coordinators != nil && desired.Coordinators != nil && req.GetCoordinators() != desired.GetCoordinators() {`
	`135`	`+ if req.Coordinators != nil && req.GetCoordinators() != desired.GetCoordinators() {`
`136`	`136`	`// #Coordinator has changed`
`137`	`137`	`coordinatorsChanged = true`
`138`	`138`	`}`
`139`		`- if req.DBServers != nil && desired.DBServers != nil && req.GetDBServers() != desired.GetDBServers() {`
	`139`	`+ if req.DBServers != nil && req.GetDBServers() != desired.GetDBServers() {`
`140`	`140`	`// #DBServers has changed`
`141`	`141`	`dbserversChanged = true`
`142`	`142`	`}`