DAOS-18779 client: reset per-thread based variable after fork - b28

Nasf-Fan · Nasf-Fan · commit 6135ca38ab00 · 2026-04-13T20:12:38.000+08:00
DAOS maintains some per-thread based variables on client. They
are usually used to distinguish current process from the others.
If application creates new process (such as via fork()), these
per-thread variables will inherit the values from parents, and
if without reset, we cannot distinguish the children processes
from the parents via these per-thread based variables. That is
not only confused but also may cause correctness issues.

The patch offers related reset interfaces, and application can
trigger them via after_fork() callback.

Allow-unstable-test: true

Signed-off-by: Fan Yong &lt;fan.yong@hpe.com&gt;
diff --git a/src/client/api/event.c b/src/client/api/event.c
@@ -1,7 +1,7 @@
 /**
  * (C) Copyright 2016-2024 Intel Corporation.
- * (C) Copyright 2025 Hewlett Packard Enterprise Development LP
  * (C) Copyright 2025 Google LLC
+ * (C) Copyright 2025-2026 Hewlett Packard Enterprise Development LP
  *
  * SPDX-License-Identifier: BSD-2-Clause-Patent
  */
@@ -18,6 +18,7 @@
 #include "client_internal.h"
 #include <daos/mgmt.h>
 #include <daos/rpc.h>
+#include <daos/tls.h>
 
 /** thread-private event */
 static __thread daos_event_t	ev_thpriv;
@@ -48,6 +49,9 @@ daos_eq_lib_init(crt_init_options_t *crt_info)
 {
 	int rc;
 
+	dc_tls_reset();
+	daos_dti_reset();
+
 	D_MUTEX_LOCK(&daos_eq_lock);
 	if (eq_ref > 0) {
 		eq_ref++;
@@ -92,8 +96,6 @@ daos_eq_lib_init(crt_init_options_t *crt_info)
 
 unlock:
 	D_MUTEX_UNLOCK(&daos_eq_lock);
-	if (rc == 0)
-		daos_dti_reset();
 
 	return rc;
 crt:
@@ -107,6 +109,8 @@ daos_eq_lib_reset_after_fork(void)
 	crt_init_options_t *crt_info;
 	int                 rc;
 
+	d_log_reset();
+
 	eq_ref            = 0;
 	ev_thpriv_is_init = false;
 	crt_info          = daos_crt_init_opt_get(false, 1);
diff --git a/src/client/dfuse/il/int_posix.c b/src/client/dfuse/il/int_posix.c
@@ -1,5 +1,6 @@
 /**
  * (C) Copyright 2017-2024 Intel Corporation.
+ * (C) Copyright 2026 Hewlett Packard Enterprise Development LP
  *
  * SPDX-License-Identifier: BSD-2-Clause-Patent
  */
@@ -827,6 +828,8 @@ child_hdlr(void)
 	/** Reset event queue */
 	ioil_eqh = ioil_iog.iog_main_eqh = DAOS_HDL_INVAL;
 
+	saved_errno = 0;
+
 	if (ioil_iog.iog_eq_count_max) {
 		rc = daos_eq_create(&ioil_eqh);
 		if (rc)
diff --git a/src/common/tls.c b/src/common/tls.c
@@ -1,5 +1,6 @@
 /**
  * (C) Copyright 2016-2023 Intel Corporation.
+ * (C) Copyright 2026 Hewlett Packard Enterprise Development LP
  *
  * SPDX-License-Identifier: BSD-2-Clause-Patent
  */
@@ -206,6 +207,15 @@ dc_tls_get(unsigned int tag)
 	return (struct daos_thread_local_storage *)pthread_getspecific(dc_tls_key);
 }
 
+void
+dc_tls_reset(void)
+{
+	if (dc_tls_thread_init)
+		dc_tls_fini();
+
+	dc_tls_thread_init = false;
+}
+
 struct daos_thread_local_storage *
 dss_tls_get()
 {
diff --git a/src/gurt/dlog.c b/src/gurt/dlog.c
@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2016-2024 Intel Corporation.
- * (C) Copyright 2025 Hewlett Packard Enterprise Development LP
+ * (C) Copyright 2025-2026 Hewlett Packard Enterprise Development LP
  *
  * SPDX-License-Identifier: BSD-2-Clause-Patent
  */
@@ -551,6 +551,9 @@ d_log_disable_logging(void)
 	mst.log_old_fd = -1;
 }
 
+static __thread uint32_t dlog_tid = -1;
+static __thread uint32_t dlog_pid = -1;
+
 /**
  * d_vlog: core log function, front-ended by d_log
  * we vsnprintf the message into a holding buffer to format it.  then we
@@ -569,8 +572,6 @@ void d_vlog(int flags, const char *fmt, va_list ap)
 {
 #define DLOG_TBSIZ    1024	/* bigger than any line should be */
 	static __thread char b[DLOG_TBSIZ];
-	static __thread uint32_t tid = -1;
-	static __thread uint32_t pid = -1;
 	static uint64_t	last_flush;
 
 	uint64_t uid = 0;
@@ -608,14 +609,14 @@ void d_vlog(int flags, const char *fmt, va_list ap)
 
 	if ((mst.oflags & DLOG_FLV_TAG) && (mst.oflags & DLOG_FLV_LOGPID)) {
 		/* Init static members in ahead of lock */
-		if (pid == (uint32_t)(-1))
-			pid = (uint32_t)getpid();
+		if (unlikely(dlog_pid == (uint32_t)(-1)))
+			dlog_pid = (uint32_t)getpid();
 
-		if (tid == (uint32_t)(-1)) {
+		if (unlikely(dlog_tid == (uint32_t)(-1))) {
 			if (mst.log_id_cb)
-				mst.log_id_cb(&tid, NULL);
+				mst.log_id_cb(&dlog_tid, NULL);
 			else
-				tid = (uint32_t)syscall(SYS_gettid);
+				dlog_tid = (uint32_t)syscall(SYS_gettid);
 		}
 
 		if (mst.log_id_cb)
@@ -653,9 +654,8 @@ void d_vlog(int flags, const char *fmt, va_list ap)
 
 	if (mst.oflags & DLOG_FLV_TAG) {
 		if (mst.oflags & DLOG_FLV_LOGPID) {
-			hlen += snprintf(b + hlen, sizeof(b) - hlen,
-					 "%s%d/%d/"DF_U64"] ", d_log_xst.tag,
-					 pid, tid, uid);
+			hlen += snprintf(b + hlen, sizeof(b) - hlen, "%s%d/%d/" DF_U64 "] ",
+					 d_log_xst.tag, dlog_pid, dlog_tid, uid);
 		} else {
 			hlen += snprintf(b + hlen, sizeof(b) - hlen, "%s ",
 					 d_log_xst.tag);
@@ -1405,3 +1405,13 @@ int d_log_getmasks(char *buf, int discard, int len, int unterm)
 	/* buf == NULL means probe for length ... */
 	return ((buf == NULL) ? total : len - resid);
 }
+
+void
+d_log_reset(void)
+{
+	dlog_tid     = -1;
+	dlog_pid     = -1;
+	pre_err      = 0;
+	pre_err_line = 0;
+	pre_err_time = 0;
+}
diff --git a/src/include/daos/tls.h b/src/include/daos/tls.h
@@ -1,5 +1,6 @@
 /**
  * (C) Copyright 2016-2024 Intel Corporation.
+ * (C) Copyright 2026 Hewlett Packard Enterprise Development LP
  *
  * SPDX-License-Identifier: BSD-2-Clause-Patent
  */
@@ -62,6 +63,8 @@ struct daos_thread_local_storage *
 dss_tls_get(void);
 struct daos_thread_local_storage *
 dc_tls_get(unsigned int tag);
+void
+dc_tls_reset(void);
 
 int
 ds_tls_key_create(void);
diff --git a/src/include/gurt/dlog.h b/src/include/gurt/dlog.h
@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2016-2024 Intel Corporation.
- * (C) Copyright 2025 Hewlett Packard Enterprise Development LP
+ * (C) Copyright 2025-2026 Hewlett Packard Enterprise Development LP
  *
  * SPDX-License-Identifier: BSD-2-Clause-Patent
  */
@@ -456,6 +456,12 @@ void d_log_sync(void);
 void
 d_log_disable_logging(void);
 
+/**
+ * Reset __thread variables (after fork).
+ */
+void
+d_log_reset(void);
+
 #if defined(__cplusplus)
 }
 #endif
diff --git a/src/pool/rpc.h b/src/pool/rpc.h
@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2016-2024 Intel Corporation.
- * (C) Copyright 2025 Hewlett Packard Enterprise Development LP
+ * (C) Copyright 2025-2026 Hewlett Packard Enterprise Development LP
  *
  * SPDX-License-Identifier: BSD-2-Clause-Patent
  */
@@ -958,12 +958,8 @@ pool_req_create_common(crt_context_t crt_ctx, crt_endpoint_t *tgt_ep, crt_opcode
 {
 	int                    rc;
 	crt_opcode_t           opcode;
-	static __thread uuid_t cli_id;
 	struct pool_op_in     *in;
 
-	if (uuid_is_null(cli_id))
-		uuid_generate(cli_id);
-
 	opcode = DAOS_RPC_OPCODE(opc, DAOS_POOL_MODULE, proto_ver);
 	/* call daos_rpc_tag to get the target tag/context idx */
 	tgt_ep->ep_tag = daos_rpc_tag(DAOS_REQ_POOL, tgt_ep->ep_tag);
@@ -982,7 +978,7 @@ pool_req_create_common(crt_context_t crt_ctx, crt_endpoint_t *tgt_ep, crt_opcode
 		*req_timep = d_hlc_get();
 
 	if (req_timep) {
-		uuid_copy(in->pi_cli_id, cli_id);
+		daos_get_client_uuid(&in->pi_cli_id);
 		in->pi_time = *req_timep;
 	}
 	return 0;
