From 7890c946ddc05f1ca6af40a8b89b9d8b1b660f95 Mon Sep 17 00:00:00 2001 From: Ewout Prangsma Date: Fri, 6 Apr 2018 13:31:12 +0200 Subject: [PATCH 1/2] Fixed down/upgrading resilientsingle deployments --- pkg/deployment/reconcile/action_wait_for_member_up.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/deployment/reconcile/action_wait_for_member_up.go b/pkg/deployment/reconcile/action_wait_for_member_up.go index 922fd4593..fb3462412 100644 --- a/pkg/deployment/reconcile/action_wait_for_member_up.go +++ b/pkg/deployment/reconcile/action_wait_for_member_up.go @@ -69,6 +69,11 @@ func (a *actionWaitForMemberUp) CheckProgress(ctx context.Context) (bool, error) switch a.actionCtx.GetMode() { case api.DeploymentModeSingle: return a.checkProgressSingle(ctx) + case api.DeploymentModeResilientSingle: + if a.action.Group == api.ServerGroupAgents { + return a.checkProgressAgent(ctx) + } + return a.checkProgressSingle(ctx) default: if a.action.Group == api.ServerGroupAgents { return a.checkProgressAgent(ctx) From 05682ccb55c1e287772c21b4dfb94ce48aae9712 Mon Sep 17 00:00:00 2001 From: Ewout Prangsma Date: Fri, 6 Apr 2018 13:31:12 +0200 Subject: [PATCH 2/2] Fixed down/upgrading resilientsingle deployments [ci LONG=1] [ci TESTOPTIONS="-test.run ^TestDowngradeResilientSingleRocksDB333to332$"] --- pkg/deployment/reconcile/action_wait_for_member_up.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/deployment/reconcile/action_wait_for_member_up.go b/pkg/deployment/reconcile/action_wait_for_member_up.go index 922fd4593..fb3462412 100644 --- a/pkg/deployment/reconcile/action_wait_for_member_up.go +++ b/pkg/deployment/reconcile/action_wait_for_member_up.go @@ -69,6 +69,11 @@ func (a *actionWaitForMemberUp) CheckProgress(ctx context.Context) (bool, error) switch a.actionCtx.GetMode() { case api.DeploymentModeSingle: return a.checkProgressSingle(ctx) + case api.DeploymentModeResilientSingle: + if a.action.Group == api.ServerGroupAgents { + return a.checkProgressAgent(ctx) + } + return a.checkProgressSingle(ctx) default: if a.action.Group == api.ServerGroupAgents { return a.checkProgressAgent(ctx)