diff --git a/src/control/cmd/daos/container.go b/src/control/cmd/daos/container.go index 9ecbc493e93..47d1f821118 100644 --- a/src/control/cmd/daos/container.go +++ b/src/control/cmd/daos/container.go @@ -1,6 +1,7 @@ // // (C) Copyright 2021-2024 Intel Corporation. // (C) Copyright 2025 Google LLC +// (C) Copyright 2026 Hewlett Packard Enterprise Development LP // // SPDX-License-Identifier: BSD-2-Clause-Patent // @@ -397,9 +398,12 @@ func (cmd *containerCreateCmd) getCreateProps() (*daos.ContainerPropertyList, er grpProp.SetString(cmd.Group.String()) } + // Use POSIX container type by default, if none is specified + typeProp := createPropList.MustAddEntryByType(daos.ContainerPropLayoutType) if hasType() { - typeProp := createPropList.MustAddEntryByType(daos.ContainerPropLayoutType) typeProp.SetValue(uint64(cmd.Type.Type)) + } else { + typeProp.SetValue(uint64(C.DAOS_PROP_CO_LAYOUT_POSIX)) } return createPropList, nil diff --git a/src/tests/ftest/checksum/csum_basic.yaml b/src/tests/ftest/checksum/csum_basic.yaml index c8546cc8c90..376e11b6041 100644 --- a/src/tests/ftest/checksum/csum_basic.yaml +++ b/src/tests/ftest/checksum/csum_basic.yaml @@ -23,6 +23,7 @@ pool: container: properties: cksum:crc16,cksum_size:16384 + type: NONE dkeys: no_of_dkeys: 50 diff --git a/src/tests/ftest/container/boundary.yaml b/src/tests/ftest/container/boundary.yaml index 8dfd797a69e..a09da0e20b0 100644 --- a/src/tests/ftest/container/boundary.yaml +++ b/src/tests/ftest/container/boundary.yaml @@ -37,6 +37,7 @@ container: run_time: 10 rank: 1 obj_classs: "OC_RP_3G1" + type: NONE boundary_test: !mux test_1: diff --git a/src/tests/ftest/container/full_pool_container_create.yaml b/src/tests/ftest/container/full_pool_container_create.yaml index 53289dd5a70..af3e14c447a 100644 --- a/src/tests/ftest/container/full_pool_container_create.yaml +++ b/src/tests/ftest/container/full_pool_container_create.yaml @@ -17,3 +17,4 @@ pool: threshold_percent: 0.1 # 10% container: control_method: daos + type: NONE diff --git a/src/tests/ftest/container/label.yaml b/src/tests/ftest/container/label.yaml index d7a105d366f..d9068b18175 100644 --- a/src/tests/ftest/container/label.yaml +++ b/src/tests/ftest/container/label.yaml @@ -22,3 +22,4 @@ pool: size: 1G container: control_method: daos + type: NONE diff --git a/src/tests/ftest/container/list.yaml b/src/tests/ftest/container/list.yaml index 77ca02a2ca3..858f7c89305 100644 --- a/src/tests/ftest/container/list.yaml +++ b/src/tests/ftest/container/list.yaml @@ -22,3 +22,4 @@ pool: container: control_method: daos + type: NONE diff --git a/src/tests/ftest/container/open.yaml b/src/tests/ftest/container/open.yaml index 6604fd3bde1..0e8a76ec39b 100644 --- a/src/tests/ftest/container/open.yaml +++ b/src/tests/ftest/container/open.yaml @@ -18,6 +18,7 @@ pool: scm_size: 1G container: control_method: daos + type: NONE uuid_poh: !mux good_uuid_good_poh: uuid: PASS diff --git a/src/tests/ftest/container/query_attribute.yaml b/src/tests/ftest/container/query_attribute.yaml index 9fddc54b147..53fe8bb6280 100644 --- a/src/tests/ftest/container/query_attribute.yaml +++ b/src/tests/ftest/container/query_attribute.yaml @@ -18,3 +18,4 @@ pool: scm_size: 1G container: properties: cksum:crc16,cksum_size:16384 + type: NONE diff --git a/src/tests/ftest/container/rf_enforcement.yaml b/src/tests/ftest/container/rf_enforcement.yaml index 201435aa576..ec50bcdca6e 100644 --- a/src/tests/ftest/container/rf_enforcement.yaml +++ b/src/tests/ftest/container/rf_enforcement.yaml @@ -36,6 +36,7 @@ container: properties: rd_fac:3 rf_4: properties: rd_fac:4 + type: NONE rebuild: traffic_oc: !mux object_class_sx: diff --git a/src/tests/ftest/control/daos_snapshot.yaml b/src/tests/ftest/control/daos_snapshot.yaml index bf67c6552bc..ecfb3a8908e 100644 --- a/src/tests/ftest/control/daos_snapshot.yaml +++ b/src/tests/ftest/control/daos_snapshot.yaml @@ -18,6 +18,7 @@ pool: scm_size: 1G container: control_method: daos + type: NONE stress_test: !mux small: snapshot_count: 5 diff --git a/src/tests/ftest/control/dmg_system_cleanup.yaml b/src/tests/ftest/control/dmg_system_cleanup.yaml index 2041338d76e..08eafeb89b3 100644 --- a/src/tests/ftest/control/dmg_system_cleanup.yaml +++ b/src/tests/ftest/control/dmg_system_cleanup.yaml @@ -22,3 +22,4 @@ container: data_size: 32 object_qty: 1 record_qty: 1 + type: NONE diff --git a/src/tests/ftest/control/dmg_telemetry_basic.yaml b/src/tests/ftest/control/dmg_telemetry_basic.yaml index 69af131fc6f..2723528b502 100644 --- a/src/tests/ftest/control/dmg_telemetry_basic.yaml +++ b/src/tests/ftest/control/dmg_telemetry_basic.yaml @@ -20,6 +20,7 @@ pool: scm_size: 2G container: control_method: daos + type: NONE test: container_qty: 5 open_close_qty: 3 diff --git a/src/tests/ftest/datamover/dst_create.yaml b/src/tests/ftest/datamover/dst_create.yaml index 33846b24c9c..c178f8614a2 100644 --- a/src/tests/ftest/datamover/dst_create.yaml +++ b/src/tests/ftest/datamover/dst_create.yaml @@ -19,6 +19,7 @@ pool: container: control_method: daos properties: compression:lz4 + type: NONE ior: client_processes: np: 1 diff --git a/src/tests/ftest/deployment/io_sys_admin.yaml b/src/tests/ftest/deployment/io_sys_admin.yaml index ce1a0b36667..61835188c22 100644 --- a/src/tests/ftest/deployment/io_sys_admin.yaml +++ b/src/tests/ftest/deployment/io_sys_admin.yaml @@ -36,6 +36,7 @@ pool_3: size: 90% container_1: + type: NONE properties: cksum:crc16,cksum_size:16384,srv_cksum:on control_method: daos diff --git a/src/tests/ftest/dfuse/container_type.py b/src/tests/ftest/dfuse/container_type.py index b14a3d7c4b6..eaf46a065f5 100644 --- a/src/tests/ftest/dfuse/container_type.py +++ b/src/tests/ftest/dfuse/container_type.py @@ -1,5 +1,6 @@ """ (C) Copyright 2020-2024 Intel Corporation. + (C) Copyright 2026 Hewlett Packard Enterprise Development LP SPDX-License-Identifier: BSD-2-Clause-Patent """ @@ -40,14 +41,10 @@ def test_dfuse_container_check(self): pool = self.get_pool(connect=False) for cont_type in cont_types: - description = f"{cont_type if cont_type == 'POSIX' else 'non-POSIX'}" + description = f"type={cont_type}" # Get container params self.log_step(f'Creating a {description} container') - container = self.get_container(pool, create=False) - # create container - if cont_type == 'POSIX': - container.type.update(cont_type) - container.create() + container = self.get_container(pool, type=cont_type) # Attempt to mount the dfuse mount point - this should only succeed # with a POSIX container diff --git a/src/tests/ftest/dfuse/container_type.yaml b/src/tests/ftest/dfuse/container_type.yaml index 7e4d2d77020..5d82a55a09d 100644 --- a/src/tests/ftest/dfuse/container_type.yaml +++ b/src/tests/ftest/dfuse/container_type.yaml @@ -18,6 +18,6 @@ pool: scm_size: 500000000 container: cont_types: - - "" + - "NONE" - "POSIX" control_method: daos diff --git a/src/tests/ftest/fault_injection/pool.yaml b/src/tests/ftest/fault_injection/pool.yaml index dc31c0bc6f5..4fb76ac8769 100644 --- a/src/tests/ftest/fault_injection/pool.yaml +++ b/src/tests/ftest/fault_injection/pool.yaml @@ -35,6 +35,7 @@ container: dkey_size: 10 data_array: 10 control_method: daos + type: NONE object_class: OC_RP_3G1 diff --git a/src/tests/ftest/nvme/object.yaml b/src/tests/ftest/nvme/object.yaml index 6fdac0a0a41..5bed6610405 100644 --- a/src/tests/ftest/nvme/object.yaml +++ b/src/tests/ftest/nvme/object.yaml @@ -44,3 +44,4 @@ container: dkey_size: 10 data_size: 4096 array_size: 1 + type: NONE diff --git a/src/tests/ftest/object/same_key_different_value.yaml b/src/tests/ftest/object/same_key_different_value.yaml index b2b5e075028..9e1968b2e71 100644 --- a/src/tests/ftest/object/same_key_different_value.yaml +++ b/src/tests/ftest/object/same_key_different_value.yaml @@ -18,3 +18,4 @@ pool: scm_size: 160000000 container: control_method: daos + type: NONE diff --git a/src/tests/ftest/osa/dmg_negative_test.yaml b/src/tests/ftest/osa/dmg_negative_test.yaml index f9e943defd6..6e0d0cf0e58 100644 --- a/src/tests/ftest/osa/dmg_negative_test.yaml +++ b/src/tests/ftest/osa/dmg_negative_test.yaml @@ -41,6 +41,7 @@ pool: container: properties: cksum:crc16,cksum_size:16384 + type: NONE test_sequence: dmg_cmd_test: diff --git a/src/tests/ftest/pool/destroy.yaml b/src/tests/ftest/pool/destroy.yaml index f2da22876bd..f34e85dc6ce 100644 --- a/src/tests/ftest/pool/destroy.yaml +++ b/src/tests/ftest/pool/destroy.yaml @@ -26,6 +26,7 @@ container: dkey_size: 4 data_size: 9 control_method: daos + type: NONE setnames: validsetname: setname: daos_server diff --git a/src/tests/ftest/pool/evict.yaml b/src/tests/ftest/pool/evict.yaml index 0699888de5f..fbbe9ec9519 100644 --- a/src/tests/ftest/pool/evict.yaml +++ b/src/tests/ftest/pool/evict.yaml @@ -26,3 +26,4 @@ container: data_size: 32 object_qty: 1 record_qty: 1 + type: NONE diff --git a/src/tests/ftest/pool/permission.yaml b/src/tests/ftest/pool/permission.yaml index 789c45a35dc..8fa47333a50 100644 --- a/src/tests/ftest/pool/permission.yaml +++ b/src/tests/ftest/pool/permission.yaml @@ -22,6 +22,7 @@ pool: container: control_method: API + type: NONE createtests: permissions: !mux diff --git a/src/tests/ftest/rebuild/basic.yaml b/src/tests/ftest/rebuild/basic.yaml index e1dc513a44e..6e2637850c9 100644 --- a/src/tests/ftest/rebuild/basic.yaml +++ b/src/tests/ftest/rebuild/basic.yaml @@ -31,6 +31,7 @@ container: dkey_size: 5 debug: true properties: rd_fac:2 + type: NONE testparams: num_pools: 2 diff --git a/src/tests/ftest/rebuild/cascading_failures.yaml b/src/tests/ftest/rebuild/cascading_failures.yaml index 294332d854b..c6bddc2a606 100644 --- a/src/tests/ftest/rebuild/cascading_failures.yaml +++ b/src/tests/ftest/rebuild/cascading_failures.yaml @@ -28,6 +28,7 @@ container: object_qty: 50 record_qty: 50 properties: rd_fac:2 + type: NONE rebuild: object_class: OC_RP_3G1 rank: diff --git a/src/tests/ftest/rebuild/container_rf.yaml b/src/tests/ftest/rebuild/container_rf.yaml index ce318786cc3..139a9cb9206 100644 --- a/src/tests/ftest/rebuild/container_rf.yaml +++ b/src/tests/ftest/rebuild/container_rf.yaml @@ -31,6 +31,7 @@ container: data_size: 5 object_qty: 50 record_qty: 50 + type: NONE rebuild: object_class: OC_RP_3G1 cont_rf: !mux diff --git a/src/tests/ftest/rebuild/delete_objects.yaml b/src/tests/ftest/rebuild/delete_objects.yaml index e80a2aec9c4..c68d0fae97a 100644 --- a/src/tests/ftest/rebuild/delete_objects.yaml +++ b/src/tests/ftest/rebuild/delete_objects.yaml @@ -32,6 +32,7 @@ container: object_qty: 30 record_qty: 1 debug: true + type: NONE rebuild: rank: 4 object_class: OC_RP_3G1 diff --git a/src/tests/ftest/rebuild/no_cap.yaml b/src/tests/ftest/rebuild/no_cap.yaml index 2f4f287a5a8..01e5cb1f729 100644 --- a/src/tests/ftest/rebuild/no_cap.yaml +++ b/src/tests/ftest/rebuild/no_cap.yaml @@ -29,6 +29,7 @@ server_config: container: control_method: daos properties: "rd_fac:1" + type: NONE pool: scm_size: 1G diff --git a/src/tests/ftest/rebuild/read_array.yaml b/src/tests/ftest/rebuild/read_array.yaml index b7a64dfc3e2..9a4a3cfd0ee 100644 --- a/src/tests/ftest/rebuild/read_array.yaml +++ b/src/tests/ftest/rebuild/read_array.yaml @@ -28,6 +28,7 @@ container: akey_size: 5 dkey_size: 5 data_size: 5 + type: NONE rebuild: object_class: OC_RP_3G1 rank: 3 diff --git a/src/tests/ftest/rebuild/with_io.yaml b/src/tests/ftest/rebuild/with_io.yaml index 49e793285ef..b786a2cc8b6 100644 --- a/src/tests/ftest/rebuild/with_io.yaml +++ b/src/tests/ftest/rebuild/with_io.yaml @@ -19,6 +19,7 @@ pool: pool_query_timeout: 30 container: properties: rd_fac:2 + type: NONE control_method: daos akey_size: 5 dkey_size: 5 diff --git a/src/tests/ftest/recovery/check_policy.yaml b/src/tests/ftest/recovery/check_policy.yaml index 55d0111c106..13d93569371 100644 --- a/src/tests/ftest/recovery/check_policy.yaml +++ b/src/tests/ftest/recovery/check_policy.yaml @@ -21,3 +21,4 @@ pool: container: control_method: daos + type: NONE diff --git a/src/tests/ftest/recovery/check_start_options.yaml b/src/tests/ftest/recovery/check_start_options.yaml index ad603b0d728..4bb21dbb753 100644 --- a/src/tests/ftest/recovery/check_start_options.yaml +++ b/src/tests/ftest/recovery/check_start_options.yaml @@ -20,3 +20,4 @@ pool: container: control_method: daos + type: NONE diff --git a/src/tests/ftest/recovery/pool_list_consolidation.yaml b/src/tests/ftest/recovery/pool_list_consolidation.yaml index 2ea68fd69e4..e22318cb7f3 100644 --- a/src/tests/ftest/recovery/pool_list_consolidation.yaml +++ b/src/tests/ftest/recovery/pool_list_consolidation.yaml @@ -27,3 +27,4 @@ pool: container: control_method: daos + type: NONE diff --git a/src/tests/ftest/security/cont_acl.yaml b/src/tests/ftest/security/cont_acl.yaml index a767b32a63a..f6aee0a50a7 100644 --- a/src/tests/ftest/security/cont_acl.yaml +++ b/src/tests/ftest/security/cont_acl.yaml @@ -22,6 +22,7 @@ pool: scm_size: 138374182 container: control_method: daos + type: NONE container_acl: acl_file_name: cont_test_acl1.txt new_user: root diff --git a/src/tests/ftest/security/cont_create_acl.yaml b/src/tests/ftest/security/cont_create_acl.yaml index 4eedd0342d8..179e172cdd5 100644 --- a/src/tests/ftest/security/cont_create_acl.yaml +++ b/src/tests/ftest/security/cont_create_acl.yaml @@ -19,3 +19,4 @@ pool: scm_size: 1073741824 container: control_method: daos + type: NONE diff --git a/src/tests/ftest/security/cont_owner.yaml b/src/tests/ftest/security/cont_owner.yaml index 4a086144711..5aa7d21477d 100644 --- a/src/tests/ftest/security/cont_owner.yaml +++ b/src/tests/ftest/security/cont_owner.yaml @@ -20,3 +20,4 @@ pool: size: 1G container: control_method: daos + type: NONE diff --git a/src/tests/ftest/security/pool_acl.yaml b/src/tests/ftest/security/pool_acl.yaml index 2f58323be57..ec31a48fe07 100644 --- a/src/tests/ftest/security/pool_acl.yaml +++ b/src/tests/ftest/security/pool_acl.yaml @@ -29,6 +29,7 @@ server_config: # allow_insecure: False container: control_method: daos + type: NONE pool_acl: scm_size: 134217728 user_prefix: daos_ci diff --git a/src/tests/ftest/security/pool_groups.yaml b/src/tests/ftest/security/pool_groups.yaml index 81a5b3a2b30..dfe071c94f2 100644 --- a/src/tests/ftest/security/pool_groups.yaml +++ b/src/tests/ftest/security/pool_groups.yaml @@ -18,6 +18,7 @@ server_config: system_ram_reserved: 1 container: control_method: daos + type: NONE pool_acl: scm_size: 134217728 user_prefix: daos_ci diff --git a/src/tests/ftest/server/daos_server_restart.yaml b/src/tests/ftest/server/daos_server_restart.yaml index 99263715abf..5ab099eab78 100644 --- a/src/tests/ftest/server/daos_server_restart.yaml +++ b/src/tests/ftest/server/daos_server_restart.yaml @@ -32,3 +32,4 @@ pool: container: control_method: daos + type: NONE diff --git a/src/tests/ftest/server/metadata.yaml b/src/tests/ftest/server/metadata.yaml index 93ca27ab35b..2d2e1a8fac6 100644 --- a/src/tests/ftest/server/metadata.yaml +++ b/src/tests/ftest/server/metadata.yaml @@ -55,6 +55,7 @@ container: control_method: API silent: true register_cleanup: False + type: NONE ior: np: 1 diff --git a/utils/node_local_test.py b/utils/node_local_test.py index 18337560726..a0ee9cdde2c 100755 --- a/utils/node_local_test.py +++ b/utils/node_local_test.py @@ -1778,7 +1778,13 @@ def run_daos_cmd(conf, conf.valgrind_errors = True rc.returncode = 0 if use_json: - rc.json = json.loads(rc.stdout.decode('utf-8')) + try: + rc.json = json.loads(rc.stdout.decode('utf-8')) + except json.JSONDecodeError: + print("Failed to decode json output") + print(f"command={exec_cmd}") + print(rc.stdout.decode('utf-8')) + raise dcr.rc = rc return dcr