DAOS-18899 control: Prevent duplicate rank entries for same engine by tanabarr · Pull Request #18127 · daos-stack/daos

tanabarr · 2026-04-28T15:07:14Z

Prevent a rank from joining the DAOS system if all management service
database fields or the joining rank match apart from the UUID. This
avoids the situation where we have multiple ranks matching the same
engine specification. If a rank needs to be added back to an engine
that matches entries in the database then it needs to be formatted
with the dmg storage format --replace command.

Features: control

Steps for the author:

Commit message follows the guidelines.
Appropriate Features or Test-tag pragmas were used.
Appropriate Functional Test Stages were run.
At least two positive code reviews including at least one code owner from each category referenced in the PR.
Testing is complete. If necessary, forced-landing label added and a reason added in a comment.

After all prior steps are complete:

Gatekeeper requested (daos-gatekeeper added as a reviewer).

daosbuild3 · 2026-04-28T18:09:45Z

Test stage Unit Test completed with status UNSTABLE. https://jenkins-3.daos.hpc.amslabs.hpecorp.net/job/daos-stack/job/daos//view/change-requests/job/PR-18127/1/testReport/

daosbuild3 · 2026-04-28T18:28:16Z

Test stage NLT completed with status FAILURE. https://jenkins-3.daos.hpc.amslabs.hpecorp.net//job/daos-stack/job/daos/view/change-requests/job/PR-18127/1/execution/node/680/log

github-actions · 2026-04-28T18:29:21Z

Ticket title is 'Prevent multiple rank entries for the same engine'
Status is 'In Review'
https://daosio.atlassian.net/browse/DAOS-18899

kjacque

Looks pretty straightforward. Nice job.

kjacque · 2026-06-05T21:21:26Z

-		}
-
-		if len(missing) != 0 {
+		if !memberFieldsMatch(cm, req) {


Maybe the helper function could return the missing values as well, to avoid having to check twice?

kjacque · 2026-06-05T21:23:22Z

+		// Fixed DAOS-15947: Now refused as duplicate addresses/URIs with different UUID
+		//                   requiring --replace option.


minor - I'd pull out the ticket number reference at this point

Signed-off-by: Tom Nabarro <thomas.nabarro@hpe.com>

daosbuild3 · 2026-06-15T13:50:06Z

Test stage NLT completed with status FAILURE. https://jenkins-3.daos.hpc.amslabs.hpecorp.net//job/daos-stack/job/daos/view/change-requests/job/PR-18127/2/execution/node/639/log

daosbuild3 · 2026-06-15T14:05:43Z

Test stage Unit Test completed with status UNSTABLE. https://jenkins-3.daos.hpc.amslabs.hpecorp.net/job/daos-stack/job/daos//view/change-requests/job/PR-18127/2/testReport/

Features: control Signed-off-by: Tom Nabarro <thomas.nabarro@hpe.com>

…treplace-rank-erase Features: control Signed-off-by: Tom Nabarro <thomas.nabarro@hpe.com>

Features: control Signed-off-by: Tom Nabarro <thomas.nabarro@hpe.com>

Signed-off-by: Tom Nabarro <thomas.nabarro@hpe.com>

…treplace-rank-erase Signed-off-by: Tom Nabarro <thomas.nabarro@hpe.com>

Features: control Signed-off-by: Tom Nabarro <thomas.nabarro@hpe.com>

knard38

Nothing blocking from my side, just a minor fix which could be done in a follow-up PR if the author considers it as relevant.

knard38 · 2026-06-23T12:17:12Z

+		if matched, _ := memberFieldsMatch(cm, req); !matched {
+			continue // Fields don't match, skip
+		}
+


If a matching member is in AdminExcluded state, the operator is directed to use --replace, but joinReplace will also fail with ErrJoinAdminExcluded. Would it make sense to branch on the state and return a dedicated fault with the correct two-step resolution?

if cm.State == MemberStateAdminExcluded { return FaultJoinMemberExistsAdminExcluded(req.UUID, cm.UUID) } return FaultJoinMemberExists(req.UUID, cm.UUID)

func FaultJoinMemberExistsAdminExcluded(newUUID, dbUUID uuid.UUID) *fault.Fault { return systemFault( code.SystemJoinMemberExists, fmt.Sprintf("... already exists with UUID %s and is admin-excluded", dbUUID), "clear the exclusion first with 'dmg system exclude --clear <rank>', "+ "then reformat with 'dmg storage format --replace'", ) }

No issue to keep as-is if this scenario is considered out-of-scope.

good suggestion I've added the change to #18142

daosbuild3 · 2026-06-23T16:25:28Z

Test stage Functional Hardware Medium MD on SSD completed with status UNSTABLE. https://jenkins-3.daos.hpc.amslabs.hpecorp.net/job/daos-stack/job/daos//view/change-requests/job/PR-18127/7/testReport/

The base branch was changed.

…in-no-dupes Signed-off-by: Tom Nabarro <thomas.nabarro@hpe.com>

tanabarr · 2026-06-26T19:25:25Z

annoyingly it cleared the reviews even though I only merged master, apologies @knard38 @mjmac could I please have re-reviews, nothing changed

…in-no-dupes Features: control Signed-off-by: Tom Nabarro <thomas.nabarro@hpe.com>

tanabarr self-assigned this Apr 28, 2026

kjacque reviewed Jun 5, 2026

View reviewed changes

tanabarr added 3 commits June 10, 2026 12:25

DAOS-19008 control: Erase formatting after failed format --replace

e1e035a

Signed-off-by: Tom Nabarro <thomas.nabarro@hpe.com>

consolidate test engine setup logic into helpers

f343e59

Signed-off-by: Tom Nabarro <thomas.nabarro@hpe.com>

add unit tests for cleanup function

550d853

Signed-off-by: Tom Nabarro <thomas.nabarro@hpe.com>

tanabarr mentioned this pull request Jun 15, 2026

DAOS-19008 control: Erase formatting after failed format --replace #18446

Merged

6 tasks

tanabarr changed the base branch from master to tanabarr/control-fmtreplace-rank-erase June 15, 2026 13:08

tanabarr requested a review from kjacque June 15, 2026 13:09

tanabarr added 2 commits June 16, 2026 14:07

fix unit tests and address review comments

65ff26e

Features: control Signed-off-by: Tom Nabarro <thomas.nabarro@hpe.com>

Merge remote-tracking branch 'origin/master' into tanabarr/control-fm…

d49d274

…treplace-rank-erase Features: control Signed-off-by: Tom Nabarro <thomas.nabarro@hpe.com>

tanabarr force-pushed the tanabarr/control-join-no-dupes branch from 6428f4f to df1b32e Compare June 16, 2026 13:17

tanabarr requested review from knard38 and mjmac June 16, 2026 13:19

tanabarr marked this pull request as ready for review June 16, 2026 13:19

tanabarr requested review from a team as code owners June 16, 2026 13:19

reinstate Adminexcluded check for joinReplace

710d497

Features: control Signed-off-by: Tom Nabarro <thomas.nabarro@hpe.com>

tanabarr force-pushed the tanabarr/control-join-no-dupes branch 2 times, most recently from a5ff888 to 3a802ac Compare June 16, 2026 19:51

tanabarr added 4 commits June 18, 2026 12:35

consistency improvement

4f87d31

Signed-off-by: Tom Nabarro <thomas.nabarro@hpe.com>

address review comments from knard38

8f3ef7f

Signed-off-by: Tom Nabarro <thomas.nabarro@hpe.com>

Merge remote-tracking branch 'origin/master' into tanabarr/control-fm…

944dee3

…treplace-rank-erase Signed-off-by: Tom Nabarro <thomas.nabarro@hpe.com>

DAOS-18899 control: Prevent duplicate rank entries for same engine

acd0383

Features: control Signed-off-by: Tom Nabarro <thomas.nabarro@hpe.com>

tanabarr force-pushed the tanabarr/control-join-no-dupes branch from 3a802ac to acd0383 Compare June 18, 2026 12:59

mjmac previously approved these changes Jun 18, 2026

View reviewed changes

knard38 previously approved these changes Jun 23, 2026

View reviewed changes

Base automatically changed from tanabarr/control-fmtreplace-rank-erase to master June 26, 2026 17:59

daltonbohning requested a review from a team as a code owner June 26, 2026 17:59

Merge remote-tracking branch 'origin/master' into tanabarr/control-jo…

63b5986

…in-no-dupes Signed-off-by: Tom Nabarro <thomas.nabarro@hpe.com>

tanabarr requested review from knard38 and mjmac June 26, 2026 19:24

mjmac approved these changes Jun 26, 2026

View reviewed changes

knard38 approved these changes Jun 26, 2026

View reviewed changes

Merge remote-tracking branch 'origin/master' into tanabarr/control-jo…

e188c13

…in-no-dupes Features: control Signed-off-by: Tom Nabarro <thomas.nabarro@hpe.com>

tanabarr requested a review from a team June 30, 2026 10:31

		// Fixed DAOS-15947: Now refused as duplicate addresses/URIs with different UUID
		// requiring --replace option.

Uh oh!

Conversation

tanabarr commented Apr 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Steps for the author:

After all prior steps are complete:

Uh oh!

daosbuild3 commented Apr 28, 2026

Uh oh!

daosbuild3 commented Apr 28, 2026

Uh oh!

github-actions Bot commented Apr 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kjacque left a comment

Choose a reason for hiding this comment

Uh oh!

kjacque Jun 5, 2026

Choose a reason for hiding this comment

Uh oh!

tanabarr Jun 15, 2026

Choose a reason for hiding this comment

Uh oh!

kjacque Jun 5, 2026

Choose a reason for hiding this comment

Uh oh!

tanabarr Jun 15, 2026

Choose a reason for hiding this comment

Uh oh!

daosbuild3 commented Jun 15, 2026

Uh oh!

daosbuild3 commented Jun 15, 2026

Uh oh!

knard38 left a comment

Choose a reason for hiding this comment

Uh oh!

knard38 Jun 23, 2026

Choose a reason for hiding this comment

Uh oh!

tanabarr Jun 26, 2026

Choose a reason for hiding this comment

Uh oh!

daosbuild3 commented Jun 23, 2026

Uh oh!

tanabarr commented Jun 26, 2026

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

5 participants

tanabarr commented Apr 28, 2026 •

edited

Loading

github-actions Bot commented Apr 28, 2026 •

edited

Loading