Merge branch 'release_24' into wangdi/release-24_15045

Required-githooks: true

Signed-off-by: Di Wang <di.wang@intel.com>

.github/CODEOWNERS

@@ -4,22 +4,25 @@
 # or updates packaging in any way
 utils/rpms @daos-stack/build-and-release-watchers
 
+src/gurt @daos-stack/common-watchers
+src/common @daos-stack/common-watchers
+
 # any PR that touches Go files should get a review from go-owners
-*.go @daos-stack/go-watchers
+*.go @daos-stack/go-owners @daos-stack/go-watchers
 
 # Notify vos-watcher of files touched affecting VOS
-src/vos/ @daos-stack/vos-watchers
-src/common/btree*.* @daos-stack/vos-watchers
-src/include/daos/btree*.* @daos-stack/vos-watchers
-src/include/daos_srv/vos*.* @daos-stack/vos-watchers
-src/include/daos_srv/evtree.h @daos-stack/vos-watchers
+src/vos/ @daos-stack/vos-owners @daos-stack/vos-watchers
+src/common/btree*.* @daos-stack/vos-owners @daos-stack/vos-watchers
+src/include/daos/btree*.* @daos-stack/vos-owners @daos-stack/vos-watchers
+src/include/daos_srv/vos*.* @daos-stack/vos-owners @daos-stack/vos-watchers
+src/include/daos_srv/evtree.h @daos-stack/vos-owners @daos-stack/vos-watchers
 
 # Jenkinsfile changes should be reviewed by Release Engineering
 Jenkinsfile @daos-stack/build-and-release-watchers
 
 # any PR that touches client API or high level client code
-src/client @daos-stack/client-api-watchers
-src/include/daos_*.* @daos-stack/client-api-watchers
+src/client @daos-stack/client-api-owners @daos-stack/client-api-watchers
+src/include/daos_*.* @daos-stack/client-api-owners @daos-stack/client-api-watchers
 
 # doc-watchers: files affecting documentation (docs, doxygen, etc.)
 mkdocs.yml @daos-stack/doc-watchers
@@ -29,10 +32,28 @@ docs/ @daos-stack/doc-watchers
 *.md @daos-stack/doc-watchers
 
 # dev-build-watchers: Files affecting local builds (e.g. SCons)
-SConstruct @daos-stack/dev-build-watchers
-SConscript @daos-stack/dev-build-watchers
-site_scons/ @daos-stack/dev-build-watchers
-utils/sl @daos-stack/dev-build-watchers
+SConstruct @daos-stack/dev-build-owners @daos-stack/dev-build-watchers
+SConscript @daos-stack/dev-build-owners @daos-stack/dev-build-watchers
+site_scons/ @daos-stack/dev-build-owners @daos-stack/dev-build-watchers
+utils/sl @daos-stack/dev-build-owners @daos-stack/dev-build-watchers
 
 # ftest-watchers: files affecting functional tests
-src/tests/ftest @daos-stack/ftest-watchers
+src/tests/ftest @daos-stack/ftest-owners @daos-stack/ftest-watchers
+
+# telem-watchers: Changes related to the telemetry library
+src/utils/daos_metrics @daos-stack/telem-watchers
+src/gurt/telemetry.c @daos-stack/telem-watchers
+
+# PRs that touch the object layer
+src/object/ @daos-stack/object-owners @daos-stack/object-watchers
+src/rebuild/ @daos-stack/object-owners @daos-stack/object-watchers
+src/dtx/ @daos-stack/object-owners @daos-stack/object-watchers
+
+# PRs that touch the CaRT layer
+src/cart/ @daos-stack/cart-owners @daos-stack/cart-watchers
+
+# PRs that touch the metadata
+src/pool/ @daos-stack/metadata-owners @daos-stack/metadata-watchers
+src/container/ @daos-stack/metadata-owners @daos-stack/metadata-watchers
+src/rdb/ @daos-stack/metadata-owners @daos-stack/metadata-watchers
+src/rsvc/ @daos-stack/metadata-owners @daos-stack/metadata-watchers

.github/pull_request_template.md

@@ -9,7 +9,7 @@
 ### Gatekeeper:
 
 * [ ] You are the appropriate gatekeeper to be landing the patch.
-* [ ] The PR has 2 reviews by people familiar with the code, including appropriate watchers.
+* [ ] The PR has 2 reviews by people familiar with the code, including appropriate owners.
 * [ ] Githooks were used. If not, request that user install them and check copyright dates.
 * [ ] Checkpatch issues are resolved.  Pay particular attention to ones that will show up on future PRs.
 * [ ] All builds have passed.  Check non-required builds for any new compiler warnings.

site_scons/site_tools/go_builder.py

@@ -70,6 +70,8 @@ def _check_go_version(context):
 
         # go version go1.2.3 Linux/amd64
         go_version = out.split(' ')[2].replace('go', '')
+        if '-' in go_version:
+            go_version = go_version.split('-')[0]
         if len([x for x, y in
                 zip(go_version.split('.'), MIN_GO_VERSION.split('.'))
                 if int(x) < int(y)]) > 0:

src/client/dfs/dfs.c

@@ -1,5 +1,5 @@
 /**
- * (C) Copyright 2018-2023 Intel Corporation.
+ * (C) Copyright 2018-2024 Intel Corporation.
  *
  * SPDX-License-Identifier: BSD-2-Clause-Patent
  */
@@ -576,7 +576,7 @@ fetch_entry(dfs_layout_ver_t ver, daos_handle_t oh, daos_handle_t th, const char
 
 	/** TODO - not supported yet */
 	if (strcmp(name, ".") == 0)
-		D_ASSERT(0);
+		return ENOTSUP;
 
 	if (xnr) {
 		D_ALLOC_ARRAY(pxnames, xnr);
@@ -3548,13 +3548,10 @@ lookup_rel_path(dfs_t *dfs, dfs_obj_t *root, const char *path, int flags,
 lookup_rel_path_loop:
 
 		/*
-		 * Open the directory object one level up.
-		 * Since fetch_entry does not support ".",
-		 * we can't support ".." as the last entry,
-		 * nor can we support "../.." because we don't
-		 * have parent.parent_oid and parent.mode.
-		 * For now, represent this partial state with
-		 * parent_fully_valid.
+		 * Open the directory object one level up.  Since fetch_entry does not support ".",
+		 * we can't support ".." as the last entry, nor can we support "../.." because we
+		 * don't have parent.parent_oid and parent.mode.  For now, represent this partial
+		 * state with parent_fully_valid.
 		 */
 		parent_fully_valid = true;
 		if (strcmp(token, "..") == 0) {
@@ -3632,15 +3629,23 @@ lookup_rel_path(dfs_t *dfs, dfs_obj_t *root, const char *path, int flags,
 			}
 
 			if (stbuf) {
-				daos_size_t size;
+				daos_array_stbuf_t array_stbuf = {0};
 
-				rc = daos_array_get_size(obj->oh, DAOS_TX_NONE, &size, NULL);
+				rc = daos_array_stat(obj->oh, DAOS_TX_NONE, &array_stbuf, NULL);
 				if (rc) {
 					daos_array_close(obj->oh, NULL);
 					D_GOTO(err_obj, rc = daos_der2errno(rc));
 				}
-				stbuf->st_size = size;
+
+				stbuf->st_size   = array_stbuf.st_size;
 				stbuf->st_blocks = (stbuf->st_size + (1 << 9) - 1) >> 9;
+
+				rc = update_stbuf_times(entry, array_stbuf.st_max_epoch, stbuf,
+							NULL);
+				if (rc) {
+					daos_array_close(obj->oh, NULL);
+					D_GOTO(err_obj, rc);
+				}
 			}
 			break;
 		}
@@ -3741,31 +3746,78 @@ lookup_rel_path(dfs_t *dfs, dfs_obj_t *root, const char *path, int flags,
 		}
 
 		obj->d.chunk_size = entry.chunk_size;
-		obj->d.oclass = entry.oclass;
-		if (stbuf)
-			stbuf->st_size = sizeof(entry);
-
+		obj->d.oclass     = entry.oclass;
 		oid_cp(&parent.oid, obj->oid);
 		oid_cp(&parent.parent_oid, obj->parent_oid);
 		parent.oh = obj->oh;
 		parent.mode = entry.mode;
+
+		if (stbuf) {
+			daos_epoch_t ep;
+
+			rc = daos_obj_query_max_epoch(obj->oh, DAOS_TX_NONE, &ep, NULL);
+			if (rc) {
+				daos_obj_close(obj->oh, NULL);
+				D_GOTO(err_obj, rc = daos_der2errno(rc));
+			}
+
+			rc = update_stbuf_times(entry, ep, stbuf, NULL);
+			if (rc) {
+				daos_obj_close(obj->oh, NULL);
+				D_GOTO(err_obj, rc = daos_der2errno(rc));
+			}
+			stbuf->st_size = sizeof(entry);
+		}
 	}
 
 	if (mode)
 		*mode = obj->mode;
 
 	if (stbuf) {
 		if (is_root) {
+			daos_epoch_t ep;
+
+			/** refresh possibly stale root stbuf */
+			rc = fetch_entry(dfs->layout_v, dfs->super_oh, DAOS_TX_NONE, "/", 1, false,
+					 &exists, &entry, 0, NULL, NULL, NULL);
+			if (rc) {
+				D_ERROR("fetch_entry() failed: %d (%s)\n", rc, strerror(rc));
+				D_GOTO(err_obj, rc);
+			}
+
+			if (!exists || !S_ISDIR(entry.mode)) {
+				/** something really bad happened! */
+				D_ERROR("Root object corrupted!");
+				D_GOTO(err_obj, rc = EIO);
+			}
+
+			if (mode)
+				*mode = entry.mode;
+			dfs->root_stbuf.st_mode = entry.mode;
+			dfs->root_stbuf.st_uid  = entry.uid;
+			dfs->root_stbuf.st_gid  = entry.gid;
+
+			rc = daos_obj_query_max_epoch(dfs->root.oh, DAOS_TX_NONE, &ep, NULL);
+			if (rc)
+				D_GOTO(err_obj, rc = daos_der2errno(rc));
+
+			/** object was updated since creation */
+			rc = update_stbuf_times(entry, ep, &dfs->root_stbuf, NULL);
+			if (rc)
+				D_GOTO(err_obj, rc);
+			if (tspec_gt(dfs->root_stbuf.st_ctim, dfs->root_stbuf.st_mtim)) {
+				dfs->root_stbuf.st_atim.tv_sec  = entry.ctime;
+				dfs->root_stbuf.st_atim.tv_nsec = entry.ctime_nano;
+			} else {
+				dfs->root_stbuf.st_atim.tv_sec  = entry.mtime;
+				dfs->root_stbuf.st_atim.tv_nsec = entry.mtime_nano;
+			}
 			memcpy(stbuf, &dfs->root_stbuf, sizeof(struct stat));
 		} else {
 			stbuf->st_nlink = 1;
 			stbuf->st_mode = obj->mode;
 			stbuf->st_uid = entry.uid;
-			stbuf->st_gid = entry.gid;
-			stbuf->st_mtim.tv_sec = entry.mtime;
-			stbuf->st_mtim.tv_nsec = entry.mtime_nano;
-			stbuf->st_ctim.tv_sec = entry.ctime;
-			stbuf->st_ctim.tv_nsec = entry.ctime_nano;
+			stbuf->st_gid   = entry.gid;
 			if (dfs->layout_v > 2) {
 				if (tspec_gt(stbuf->st_ctim, stbuf->st_mtim)) {
 					stbuf->st_atim.tv_sec = entry.ctime;
@@ -3865,11 +3917,8 @@ readdir_int(dfs_t *dfs, dfs_obj_t *obj, daos_anchor_t *anchor, uint32_t *nr,
 			D_GOTO(out, rc = daos_der2errno(rc));
 
 		for (ptr = enum_buf, i = 0; i < number; i++) {
-			int len;
-
-			len = snprintf(dirs[key_nr].d_name,
-				       kds[i].kd_key_len + 1, "%s", ptr);
-			D_ASSERT(len >= kds[i].kd_key_len);
+			memcpy(dirs[key_nr].d_name, ptr, kds[i].kd_key_len);
+			dirs[key_nr].d_name[kds[i].kd_key_len] = '\0';
 			ptr += kds[i].kd_key_len;
 
 			/** stat the entry if requested */
@@ -5313,11 +5362,12 @@ dfs_osetattr(dfs_t *dfs, dfs_obj_t *obj, struct stat *stbuf, int flags)
 	bool			set_size = false;
 	bool			set_mtime = false;
 	bool			set_ctime = false;
-	int			i = 0;
-	size_t			len;
-	int			rc;
+	int                     i = 0, hlc_recx_idx = 0;
+	size_t                  len;
 	uint64_t		obj_hlc = 0;
 	struct stat		rstat = {};
+	daos_array_stbuf_t      array_stbuf = {0};
+	int                     rc;
 
 	if (dfs == NULL || !dfs->mounted)
 		return EINVAL;
@@ -5414,6 +5464,10 @@ dfs_osetattr(dfs_t *dfs, dfs_obj_t *obj, struct stat *stbuf, int flags)
 		d_iov_set(&sg_iovs[i], &obj_hlc, sizeof(uint64_t));
 		recxs[i].rx_idx = HLC_IDX;
 		recxs[i].rx_nr = sizeof(uint64_t);
+		if (flags & DFS_SET_ATTR_SIZE) {
+			/** we need to update this again after the set size */
+			hlc_recx_idx = i;
+		}
 		i++;
 
 		set_mtime = true;
@@ -5463,38 +5517,41 @@ dfs_osetattr(dfs_t *dfs, dfs_obj_t *obj, struct stat *stbuf, int flags)
 		rstat.st_blocks = (stbuf->st_size + (1 << 9) - 1) >> 9;
 		rstat.st_size = stbuf->st_size;
 
-		/* mtime and ctime need to be updated too only if not set earlier */
-		if (!set_mtime || !set_ctime) {
-			daos_array_stbuf_t	array_stbuf = {0};
+		/**
+		 * if mtime is set, we need to to just update the hlc on the entry. if mtime and/or
+		 * ctime were not set, we need to update the stat buf returned. both cases require
+		 * an array stat for the hlc.
+		 */
+		/** TODO - need an array API to just stat the max epoch without size */
+		rc = daos_array_stat(obj->oh, th, &array_stbuf, NULL);
+		if (rc)
+			D_GOTO(out_obj, rc = daos_der2errno(rc));
 
-			/** TODO - need an array API to just stat the max epoch without size */
-			rc = daos_array_stat(obj->oh, th, &array_stbuf, NULL);
-			if (rc)
+		if (!set_mtime) {
+			rc = d_hlc2timespec(array_stbuf.st_max_epoch, &rstat.st_mtim);
+			if (rc) {
+				D_ERROR("d_hlc2timespec() failed " DF_RC "\n", DP_RC(rc));
 				D_GOTO(out_obj, rc = daos_der2errno(rc));
-
-			if (!set_mtime) {
-				rc = d_hlc2timespec(array_stbuf.st_max_epoch, &rstat.st_mtim);
-				if (rc) {
-					D_ERROR("d_hlc2timespec() failed "DF_RC"\n", DP_RC(rc));
-					D_GOTO(out_obj, rc = daos_der2errno(rc));
-				}
 			}
+		} else {
+			D_ASSERT(hlc_recx_idx > 0);
+			D_ASSERT(recxs[hlc_recx_idx].rx_idx == HLC_IDX);
+			d_iov_set(&sg_iovs[hlc_recx_idx], &array_stbuf.st_max_epoch,
+				  sizeof(uint64_t));
+		}
 
-			if (!set_ctime) {
-				rc = d_hlc2timespec(array_stbuf.st_max_epoch, &rstat.st_ctim);
-				if (rc) {
-					D_ERROR("d_hlc2timespec() failed "DF_RC"\n", DP_RC(rc));
-					D_GOTO(out_obj, rc = daos_der2errno(rc));
-				}
+		if (!set_ctime) {
+			rc = d_hlc2timespec(array_stbuf.st_max_epoch, &rstat.st_ctim);
+			if (rc) {
+				D_ERROR("d_hlc2timespec() failed " DF_RC "\n", DP_RC(rc));
+				D_GOTO(out_obj, rc = daos_der2errno(rc));
 			}
 		}
 	}
 
 	iod.iod_nr = i;
-
 	if (i == 0)
 		D_GOTO(out_stat, rc = 0);
-
 	sgl.sg_nr	= i;
 	sgl.sg_nr_out	= 0;
 	sgl.sg_iovs	= &sg_iovs[0];
@@ -6387,8 +6444,6 @@ dfs_listxattr(dfs_t *dfs, dfs_obj_t *obj, char *list, daos_size_t *size)
 			continue;
 
 		for (ptr = enum_buf, i = 0; i < number; i++) {
-			int len;
-
 			if (strncmp("x:", ptr, 2) != 0) {
 				ptr += kds[i].kd_key_len;
 				continue;
@@ -6401,10 +6456,8 @@ dfs_listxattr(dfs_t *dfs, dfs_obj_t *obj, char *list, daos_size_t *size)
 			if (list_size < kds[i].kd_key_len - 2)
 				continue;
 
-			len = snprintf(ptr_list, kds[i].kd_key_len - 1, "%s",
-				       ptr + 2);
-			D_ASSERT(len >= kds[i].kd_key_len - 2);
-
+			memcpy(ptr_list, ptr + 2, kds[i].kd_key_len - 2);
+			ptr_list[kds[i].kd_key_len - 2] = '\0';
 			list_size -= kds[i].kd_key_len - 1;
 			ptr_list += kds[i].kd_key_len - 1;
 			ptr += kds[i].kd_key_len;
@@ -6591,7 +6644,7 @@ oit_mark_cb(dfs_t *dfs, dfs_obj_t *parent, const char name[], void *args)
 	}
 
 	/** open the entry name and get the oid */
-	rc = dfs_lookup_rel(dfs, parent, name, O_RDONLY, &obj, NULL, NULL);
+	rc = dfs_lookup_rel(dfs, parent, name, O_RDONLY | O_NOFOLLOW, &obj, NULL, NULL);
 	if (rc) {
 		D_ERROR("dfs_lookup_rel() of %s failed: %d\n", name, rc);
 		return rc;

src/client/dfs/duns.c

@@ -1331,14 +1331,6 @@ duns_destroy_path(daos_handle_t poh, const char *path)
 		return rc;
 	}
 
-	/** Destroy the container */
-	rc = daos_cont_destroy(poh, dattr.da_cont, 1, NULL);
-	if (rc) {
-		D_ERROR("Failed to destroy container (%d)\n", rc);
-		/** recreate the link ? */
-		return daos_der2errno(rc);
-	}
-
 	if (dattr.da_type == DAOS_PROP_CO_LAYOUT_POSIX) {
 #ifdef LUSTRE_INCLUDE
 		if (dattr.da_on_lustre)
@@ -1369,6 +1361,14 @@ duns_destroy_path(daos_handle_t poh, const char *path)
 		}
 	}
 
+	/** Destroy the container */
+	rc = daos_cont_destroy(poh, dattr.da_cont, 1, NULL);
+	if (rc) {
+		D_ERROR("Failed to destroy container (%d)\n", rc);
+		/** recreate the link ? */
+		return daos_der2errno(rc);
+	}
+
 	return 0;
 }