common: fix "The pool was not closed" message (no ADR failure)

janekmi · janekmi · commit 44060893cb95 · 2026-03-16T19:09:09.000Z
Ref: DAOS-18692 Ref: #1 Signed-off-by: Jan Michalski <jan-marian.michalski@hpe.com>
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+XXX
+
+	* Version X.X.X
+
+	- Fix "The pool was not closed" message (no ADR failure) (daos-stack/pmdk#1, DAOS-18692)
+
 Fri Jan 16 2026 Oksana Sałyk <oksana.salyk@hpe.com>
 
 	* Version 2.1.3
diff --git a/src/common/shutdown_state.c b/src/common/shutdown_state.c
@@ -208,7 +208,7 @@ shutdown_state_check(struct shutdown_state *curr_sds,
 		 * but there wasn't an ADR failure
 		 */
 		CORE_LOG_WARNING(
-			"The ADR failure was detected but the pool was closed properly - reinitializing ADR failure detection.");
+			"The pool was not closed - reinitializing ADR failure detection.");
 		shutdown_state_reinit(curr_sds, pool_sds, rep);
 		return 0;
 	}
diff --git a/src/test/util_sds/grep5.log.match b/src/test/util_sds/grep5.log.match
@@ -1 +1 @@
-<libpmem2>: <2> [shutdown_state.c:$(N) shutdown_state_check] The ADR failure was detected but the pool was closed properly - reinitializing ADR failure detection.
+<libpmem2>: <2> [shutdown_state.c:$(N) shutdown_state_check] The pool was not closed - reinitializing ADR failure detection.
diff --git a/src/test/util_sds_check/out2.log.match b/src/test/util_sds_check/out2.log.match
@@ -3,5 +3,5 @@ util_sds_check$(nW)TEST2: START: util_sds_check
 src version: $(nW)
 compiled with support for shutdown state
 compiled with libndctl $(nW)
-The ADR failure was detected but the pool was closed properly - reinitializing ADR failure detection.
+The pool was not closed - reinitializing ADR failure detection.
 util_sds_check$(nW)TEST2: DONE

Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ shutdown_state_check(struct shutdown_state *curr_sds,`
`208`	`208`	`* but there wasn't an ADR failure`
`209`	`209`	`*/`
`210`	`210`	`CORE_LOG_WARNING(`
`211`		`- "The ADR failure was detected but the pool was closed properly - reinitializing ADR failure detection.");`
	`211`	`+ "The pool was not closed - reinitializing ADR failure detection.");`
`212`	`212`	`shutdown_state_reinit(curr_sds, pool_sds, rep);`
`213`	`213`	`return 0;`
`214`	`214`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<libpmem2>: <2> [shutdown_state.c:$(N) shutdown_state_check] The ADR failure was detected but the pool was closed properly - reinitializing ADR failure detection.`
	`1`	`+<libpmem2>: <2> [shutdown_state.c:$(N) shutdown_state_check] The pool was not closed - reinitializing ADR failure detection.`