Skip to content

K8SPSMDB-1541: fix PSA #2153

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

Open
pooknull wants to merge 4 commits into
base: main
Choose a base branch
from
+29 −10
Open

K8SPSMDB-1541: fix PSA #2153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
549e8cf
K8SPSMDB-1541: fix PSA
pooknull Dec 18, 2025
ced2562
add unit_test case
pooknull Dec 18, 2025
75daeb1
Merge branch 'main' into K8SPSMDB-1541
pooknull Dec 18, 2025
473e29e
Merge branch 'main' into K8SPSMDB-1541
hors Dec 19, 2025
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
8 changes: 1 addition & 7 deletions pkg/controller/perconaservermongodb/mgo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,14 +376,8 @@ func (r *ReconcilePerconaServerMongoDB) getConfigMemberForExternalNode(id int, e
func (r *ReconcilePerconaServerMongoDB) updateConfigMembers(ctx context.Context, cli mongo.Client, cr *api.PerconaServerMongoDB, rs *api.ReplsetSpec) (map[string]api.ReplsetMemberStatus, int, error) {
log := logf.FromContext(ctx)
// Primary with a Secondary and an Arbiter (PSA)
unsafePSA := false
rsMembers := make(map[string]api.ReplsetMemberStatus)

if cr.CompareVersion("1.15.0") <= 0 {
unsafePSA = cr.Spec.UnsafeConf && rs.Arbiter.Enabled && rs.Arbiter.Size == 1 && !rs.NonVoting.Enabled && rs.Size == 2
} else {
unsafePSA = cr.Spec.Unsafe.ReplsetSize && rs.Arbiter.Enabled && rs.Arbiter.Size == 1 && !rs.NonVoting.Enabled && rs.Size == 2
}
unsafePSA := cr.Spec.Unsafe.ReplsetSize && rs.Arbiter.Enabled && rs.Arbiter.Size == 1 && !rs.NonVoting.Enabled && rs.Size == 2

pods, err := psmdb.GetRSPods(ctx, r.client, cr, rs.Name)
if err != nil {
Expand Down
3 changes: 1 addition & 2 deletions pkg/psmdb/mongo/mongo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,6 @@ func (client *mongoClient) UpdateRole(ctx context.Context, db string, role Role)
}

return nil

}

func (client *mongoClient) GetRole(ctx context.Context, db, role string) (*Role, error) {
Expand Down Expand Up @@ -990,7 +989,7 @@ func (m *ConfigMembers) SetVotes(compareWith ConfigMembers, unsafePSA bool) {
return
}

if votes%2 == 0 {
if votes%2 == 0 && !unsafePSA {
for j := lastVoteIdx; j >= 0; j-- {
if []ConfigMember(*m)[j].Votes == 0 {
continue
Expand Down
28 changes: 27 additions & 1 deletion pkg/psmdb/mongo/mongo_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,32 @@ func TestVoting(t *testing.T) {
},
true,
},
{
"2 members (unsafe PSA start): 2 rs0 without arbiter",
&mongo.ConfigMembers{
mongo.ConfigMember{
Host: "host0",
Votes: mongo.DefaultVotes,
Priority: mongo.DefaultPriority,
},
mongo.ConfigMember{
Host: "host1",
Votes: mongo.DefaultVotes,
Priority: mongo.DefaultPriority,
},
},
&mongo.ConfigMembers{
mongo.ConfigMember{
Votes: mongo.DefaultVotes,
Priority: mongo.DefaultPriority,
},
mongo.ConfigMember{
Votes: mongo.DefaultVotes,
Priority: mongo.DefaultPriority,
},
},
true,
},
{
"4 members: 4 rs0",
&mongo.ConfigMembers{
Expand Down Expand Up @@ -1297,7 +1323,7 @@ func TestVoting(t *testing.T) {
}

assert.Falsef(t, votes > mongo.MaxVotingMembers, "there should be max (%d) votes in replset", mongo.MaxVotingMembers)
if votes != 0 {
if votes != 0 && !c.unsafePSA {
assert.Falsef(t, votes%2 == 0, "total votes (%d) should be an odd number", votes)
}
})
Expand Down
Loading