Skip to content

[Bugfix] Fix ActiveFailover upgrade proceure #620

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
Aug 19, 2020
Merged

[Bugfix] Fix ActiveFailover upgrade proceure #620

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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## [master](https://github.com/arangodb/kube-arangodb/tree/master) (N/A)
- Add Operator Namespaced mode (Alpha)
- Fix ActiveFailover Upgrade procedure

## [1.0.5](https://github.com/arangodb/kube-arangodb/tree/1.0.5) (2020-08-05)
- Add Labels and Annotations to ServiceMonitor
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/deployment/v1/server_group.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ const (
var (
// AllServerGroups contains a constant list of all known server groups
AllServerGroups = []ServerGroup{
ServerGroupSingle,
ServerGroupAgents,
ServerGroupSingle,
ServerGroupDBServers,
ServerGroupCoordinators,
ServerGroupSyncMasters,
Expand Down
6 changes: 1 addition & 5 deletions pkg/deployment/reconcile/action_wait_for_member_up.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ func (a *actionWaitForMemberUp) checkProgressSingle(ctx context.Context) (bool,
// of a single server as part of an active failover deployment.
func (a *actionWaitForMemberUp) checkProgressSingleInActiveFailover(ctx context.Context) (bool, bool, error) {
log := a.log
c, err := a.actionCtx.GetDatabaseClient(ctx)
c, err := a.actionCtx.GetServerClient(ctx, a.action.Group, a.action.MemberID)
if err != nil {
log.Debug().Err(err).Msg("Failed to create database client")
return false, false, maskAny(err)
Expand All @@ -120,10 +120,6 @@ func (a *actionWaitForMemberUp) checkProgressSingleInActiveFailover(ctx context.
log.Debug().Err(err).Msg("Failed to get version")
return false, false, maskAny(err)
}
if _, err := c.Databases(ctx); err != nil {
log.Debug().Err(err).Msg("Failed to get databases")
return false, false, maskAny(err)
}
return true, false, nil
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/deployment/reconcile/plan_builder_rotate_upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ import (
var (
// rotationByAnnotationOrder - Change order of execution - Coordinators and Agents should be executed before DBServer to save time
rotationByAnnotationOrder = []api.ServerGroup{
api.ServerGroupSingle,
api.ServerGroupAgents,
api.ServerGroupSingle,
api.ServerGroupCoordinators,
api.ServerGroupDBServers,
api.ServerGroupSyncMasters,
Expand Down