DAOS-19087 container: Disallow user-specified UUIDs

src/container/cli.c

@@ -365,10 +365,6 @@ dc_cont_create(tse_task_t *task)
 
 	args = dc_task_get_args(task);
 
-	if (!daos_uuid_valid(args->uuid))
-		/** generate a UUID for the new container */
-		uuid_generate(args->uuid);
-
 	entry = daos_prop_entry_get(args->prop, DAOS_PROP_CO_STATUS);
 	if (entry != NULL) {
 		rc = -DER_INVAL;
@@ -391,6 +387,9 @@ dc_cont_create(tse_task_t *task)
 		rc = cont_task_create_priv(task, &tpriv);
 		if (rc != 0)
 			goto err_prop;
+
+		/** generate a UUID for the new container */
+		uuid_generate(args->uuid);
 	}
 
 	D_DEBUG(DB_MD, DF_UUID": creating "DF_UUIDF"\n",

src/include/daos_uns.h

@@ -1,5 +1,5 @@
 /*
  * (C) Copyright 2019-2024 Intel Corporation.
  *
  * SPDX-License-Identifier: BSD-2-Clause-Patent
  */
@@ -111,11 +111,11 @@
 	 * is returned as a string in \a da_pool with duns_resolve_path().
 	 */
 	uuid_t			da_puuid;
-	/** IN/OUT: (Deprecated) Optional UUID of the cont to be created in duns_create_path().
+	/** OUT: (Deprecated) Optional UUID of the cont created in duns_create_path().
 	 *
-	 * The UUID will be used to create the container in duns_create_path() if set, otherwise a
-	 * random one will be generated. The cont UUID or label is returned as a string in \a
-	 * da_cont with duns_resolve_path().
+	 * The container UUID is always generated by the DAOS system and users are not permitted to
+	 * specify it; any value set on input is ignored. The generated cont UUID or the label is
+	 * returned as a string in \a da_cont with duns_resolve_path().
 	 */
 	uuid_t			da_cuuid;
 	/** IN: (Optional) For a POSIX container, set a default object class for all directories. */

src/tests/daos_perf.c

@@ -1,5 +1,5 @@
 /**
  * (C) Copyright 2018-2023 Intel Corporation.
  *
  * SPDX-License-Identifier: BSD-2-Clause-Patent
  */
@@ -439,16 +439,26 @@
 
 	/*
 	 * For daos_perf, if pool/cont uuids are supplied as command line
-	 * arguments it's assumed that the pool/cont were created. If only a
-	 * cont uuid is supplied then a pool and container will be created and
-	 * the cont uuid will be used during creation
+	 * arguments it's assumed that the pool/cont were already created and
+	 * will be opened. Creating a container with a user-specified UUID is
+	 * not allowed; a container UUID may only be supplied together with a
+	 * pool UUID to open an existing container.
 	 */
 	if (!uuid_is_null(ts_ctx.tsc_pool_uuid)) {
 		ts_ctx.tsc_skip_pool_create = true;
 		if (!uuid_is_null(ts_ctx.tsc_cont_uuid))
 			ts_ctx.tsc_skip_cont_create = true;
 	}
 
+	if (!uuid_is_null(ts_ctx.tsc_cont_uuid) && !ts_ctx.tsc_skip_cont_create) {
+		if (ts_ctx.tsc_mpi_rank == 0)
+			fprintf(stderr,
+				"creating a container with a user-specified UUID is not "
+				"allowed; a container UUID may only be provided together "
+				"with a pool UUID to open an existing container\n");
+		return -1;
+	}
+
 	if (ts_ctx.tsc_mpi_rank == 0) {
 		if (!ts_ctx.tsc_skip_cont_create)
 			uuid_generate(ts_ctx.tsc_cont_uuid);

src/tests/daos_racer.c

@@ -1,5 +1,5 @@
 /**
  * (C) Copyright 2019-2023 Intel Corporation.
  *
  * SPDX-License-Identifier: BSD-2-Clause-Patent
  */
@@ -529,16 +529,26 @@
 
 	/*
 	 * For daos_racer, if pool/cont uuids are supplied as command line
-	 * arguments it's assumed that the pool/cont were created. If only a
-	 * cont uuid is supplied then a pool and container will be created and
-	 * the cont uuid will be used during creation
+	 * arguments it's assumed that the pool/cont were already created and
+	 * will be opened. Creating a container with a user-specified UUID is
+	 * not allowed; a container UUID may only be supplied together with a
+	 * pool UUID to open an existing container.
 	 */
 	if (!uuid_is_null(ts_ctx.tsc_pool_uuid)) {
 		ts_ctx.tsc_skip_pool_create = true;
 		if (!uuid_is_null(ts_ctx.tsc_cont_uuid))
 			ts_ctx.tsc_skip_cont_create = true;
 	}
 
+	if (!uuid_is_null(ts_ctx.tsc_cont_uuid) && !ts_ctx.tsc_skip_cont_create) {
+		if (ts_ctx.tsc_mpi_rank == 0)
+			fprintf(stderr,
+				"creating a container with a user-specified UUID is not "
+				"allowed; a container UUID may only be provided together "
+				"with a pool UUID to open an existing container\n");
+		D_GOTO(out, rc = -1);
+	}
+
 	if (seed == 0) {
 		gettimeofday(&tv, NULL);
 		seed = tv.tv_usec;