mirrors/kube-arangodb
1
0
Fork 0
mirror of https://github.com/arangodb/kube-arangodb.git synced 2024-12-14 11:57:37 +00:00
Code Activity

[Feature] Do not remove Agency members (#535)

Browse source
This commit is contained in:
Adam Janikowski 2020-03-23 20:37:08 +01:00 committed by GitHub
parent d8c9f5a536
commit 397712df50
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 54 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -1,6 +1,7 @@
# Change Log
## [master](https://github.com/arangodb/kube-arangodb/tree/master) (N/A)
- Prevent Agency Members recreation
- Added Customizable Volumes and VolumeMounts for ArangoDB server container
- Added MemoryOverride flag for ArangoDB >= 3.6.3
- Improved Rotation discovery process

2
pkg/deployment/reconcile/action_recreate_member.go
View file

@ -63,7 +63,7 @@ func (a *actionRecreateMember) Start(ctx context.Context) (bool, error) {
_, err := a.actionCtx.GetPvc(m.PersistentVolumeClaimName)
if err != nil {
if kubeErrors.IsNotFound(err) {
return false, fmt.Errorf("PVC is missing %s. DBServer wont be recreated without old PV", m.PersistentVolumeClaimName)
return false, fmt.Errorf("PVC is missing %s. Members won't be recreated without old PV", m.PersistentVolumeClaimName)
}
return false, maskAny(err)

21
pkg/deployment/reconcile/plan_builder.go
View file

@ -155,15 +155,20 @@ func createPlan(log zerolog.Logger, apiObject k8sutil.APIObject,
// Everything is fine, proceed
}
memberLog.Msg("Creating member replacement plan because member has failed")
newID := ""
if group == api.ServerGroupAgents {
newID = m.ID // Agents cannot (yet) be replaced with new IDs
switch group {
case api.ServerGroupAgents:
// For agents just recreate member do not rotate ID, do not remove PVC or service
memberLog.Msg("Restoring old member. For agency members recreation of PVC is not supported - to prevent DataLoss")
plan = append(plan,
api.NewAction(api.ActionTypeRecreateMember, group, m.ID))
default:
memberLog.Msg("Creating member replacement plan because member has failed")
plan = append(plan,
api.NewAction(api.ActionTypeRemoveMember, group, m.ID),
api.NewAction(api.ActionTypeAddMember, group, ""),
)
}
plan = append(plan,
api.NewAction(api.ActionTypeRemoveMember, group, m.ID),
api.NewAction(api.ActionTypeAddMember, group, newID),
)
}
return nil
})

42
pkg/deployment/reconcile/plan_builder_test.go
View file

@ -681,7 +681,7 @@ func TestCreatePlan(t *testing.T) {
ExpectedLog: "Creating rotation plan",
},
{
Name: "Member in failed state",
Name: "Agent in failed state",
context: &testContext{
ArangoDeployment: deploymentTemplate.DeepCopy(),
},
@ -690,10 +690,46 @@ func TestCreatePlan(t *testing.T) {
Count: util.NewInt(2),
}
ad.Status.Members.Agents[0].Phase = api.MemberPhaseFailed
ad.Status.Members.Agents[0].ID = "id"
},
ExpectedPlan: []api.Action{
api.NewAction(api.ActionTypeRemoveMember, api.ServerGroupAgents, ""),
api.NewAction(api.ActionTypeAddMember, api.ServerGroupAgents, ""),
api.NewAction(api.ActionTypeRecreateMember, api.ServerGroupAgents, "id"),
},
ExpectedLog: "Restoring old member. For agency members recreation of PVC is not supported - to prevent DataLoss",
},
{
Name: "Coordinator in failed state",
context: &testContext{
ArangoDeployment: deploymentTemplate.DeepCopy(),
},
Helper: func(ad *api.ArangoDeployment) {
ad.Spec.Coordinators = api.ServerGroupSpec{
Count: util.NewInt(2),
}
ad.Status.Members.Coordinators[0].Phase = api.MemberPhaseFailed
ad.Status.Members.Coordinators[0].ID = "id"
},
ExpectedPlan: []api.Action{
api.NewAction(api.ActionTypeRemoveMember, api.ServerGroupCoordinators, "id"),
api.NewAction(api.ActionTypeAddMember, api.ServerGroupCoordinators, ""),
},
ExpectedLog: "Creating member replacement plan because member has failed",
},
{
Name: "DBServer in failed state",
context: &testContext{
ArangoDeployment: deploymentTemplate.DeepCopy(),
},
Helper: func(ad *api.ArangoDeployment) {
ad.Spec.DBServers = api.ServerGroupSpec{
Count: util.NewInt(2),
}
ad.Status.Members.DBServers[0].Phase = api.MemberPhaseFailed
ad.Status.Members.DBServers[0].ID = "id"
},
ExpectedPlan: []api.Action{
api.NewAction(api.ActionTypeRemoveMember, api.ServerGroupDBServers, "id"),
api.NewAction(api.ActionTypeAddMember, api.ServerGroupDBServers, ""),
},
ExpectedLog: "Creating member replacement plan because member has failed",
},