Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/control/cmd/daos/container.go
Original file line number Diff line number Diff line change
@@ -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
//
Expand Down Expand Up @@ -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))
Comment on lines +401 to +406
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be better to add these C layout types as Go constants in src/control/lib/daos/container_property.go, and then use the constant here.

I wouldn't block on this -- we're still making some changes around the way we organize the cgo code.

}

return createPropList, nil
Expand Down
1 change: 1 addition & 0 deletions src/tests/ftest/checksum/csum_basic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ pool:

container:
properties: cksum:crc16,cksum_size:16384
type: NONE

dkeys:
no_of_dkeys: 50
Expand Down
1 change: 1 addition & 0 deletions src/tests/ftest/container/boundary.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ container:
run_time: 10
rank: 1
obj_classs: "OC_RP_3G1"
type: NONE

boundary_test: !mux
test_1:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ pool:
threshold_percent: 0.1 # 10%
container:
control_method: daos
type: NONE
1 change: 1 addition & 0 deletions src/tests/ftest/container/label.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ pool:
size: 1G
container:
control_method: daos
type: NONE
1 change: 1 addition & 0 deletions src/tests/ftest/container/list.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ pool:

container:
control_method: daos
type: NONE
1 change: 1 addition & 0 deletions src/tests/ftest/container/open.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ pool:
scm_size: 1G
container:
control_method: daos
type: NONE
uuid_poh: !mux
good_uuid_good_poh:
uuid: PASS
Expand Down
1 change: 1 addition & 0 deletions src/tests/ftest/container/query_attribute.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ pool:
scm_size: 1G
container:
properties: cksum:crc16,cksum_size:16384
type: NONE
1 change: 1 addition & 0 deletions src/tests/ftest/container/rf_enforcement.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ container:
properties: rd_fac:3
rf_4:
properties: rd_fac:4
type: NONE
rebuild:
traffic_oc: !mux
object_class_sx:
Expand Down
1 change: 1 addition & 0 deletions src/tests/ftest/control/daos_snapshot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ pool:
scm_size: 1G
container:
control_method: daos
type: NONE
stress_test: !mux
small:
snapshot_count: 5
Expand Down
1 change: 1 addition & 0 deletions src/tests/ftest/control/dmg_system_cleanup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ container:
data_size: 32
object_qty: 1
record_qty: 1
type: NONE
1 change: 1 addition & 0 deletions src/tests/ftest/control/dmg_telemetry_basic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ pool:
scm_size: 2G
container:
control_method: daos
type: NONE
test:
container_qty: 5
open_close_qty: 3
1 change: 1 addition & 0 deletions src/tests/ftest/datamover/dst_create.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ pool:
container:
control_method: daos
properties: compression:lz4
type: NONE
ior:
client_processes:
np: 1
Expand Down
1 change: 1 addition & 0 deletions src/tests/ftest/deployment/io_sys_admin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ pool_3:
size: 90%

container_1:
type: NONE
properties: cksum:crc16,cksum_size:16384,srv_cksum:on
control_method: daos

Expand Down
9 changes: 3 additions & 6 deletions src/tests/ftest/dfuse/container_type.py
Original file line number Diff line number Diff line change
@@ -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
"""
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/tests/ftest/dfuse/container_type.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ pool:
scm_size: 500000000
container:
cont_types:
- ""
- "NONE"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we still test "" in addition to "NONE"?

Suggested change
- "NONE"
- ""
- "NONE"

We also might want to clarify https://github.com/daos-stack/daos/blob/master/src/tests/ftest/dfuse/container_type.py#L43, now that "NONE" should create a POSIX container.

Either way https://github.com/daos-stack/daos/blob/master/src/tests/ftest/dfuse/container_type.py#L48-L49 will need to be updated to support setting "NONE".

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I fixed the python, but the purpose of this test is to verify dfuse behavior with POSIX and non-POSIX, so I don't think there is any need to create a container with an empty type

- "POSIX"
control_method: daos
1 change: 1 addition & 0 deletions src/tests/ftest/fault_injection/pool.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ container:
dkey_size: 10
data_array: 10
control_method: daos
type: NONE

object_class: OC_RP_3G1

Expand Down
1 change: 1 addition & 0 deletions src/tests/ftest/nvme/object.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,4 @@ container:
dkey_size: 10
data_size: 4096
array_size: 1
type: NONE
1 change: 1 addition & 0 deletions src/tests/ftest/object/same_key_different_value.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ pool:
scm_size: 160000000
container:
control_method: daos
type: NONE
1 change: 1 addition & 0 deletions src/tests/ftest/osa/dmg_negative_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ pool:

container:
properties: cksum:crc16,cksum_size:16384
type: NONE

test_sequence:
dmg_cmd_test:
Expand Down
1 change: 1 addition & 0 deletions src/tests/ftest/pool/destroy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ container:
dkey_size: 4
data_size: 9
control_method: daos
type: NONE
setnames:
validsetname:
setname: daos_server
Expand Down
1 change: 1 addition & 0 deletions src/tests/ftest/pool/evict.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@ container:
data_size: 32
object_qty: 1
record_qty: 1
type: NONE
1 change: 1 addition & 0 deletions src/tests/ftest/pool/permission.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ pool:

container:
control_method: API
type: NONE

createtests:
permissions: !mux
Expand Down
1 change: 1 addition & 0 deletions src/tests/ftest/rebuild/basic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ container:
dkey_size: 5
debug: true
properties: rd_fac:2
type: NONE

testparams:
num_pools: 2
Expand Down
1 change: 1 addition & 0 deletions src/tests/ftest/rebuild/cascading_failures.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ container:
object_qty: 50
record_qty: 50
properties: rd_fac:2
type: NONE
rebuild:
object_class: OC_RP_3G1
rank:
Expand Down
1 change: 1 addition & 0 deletions src/tests/ftest/rebuild/container_rf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/tests/ftest/rebuild/delete_objects.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ container:
object_qty: 30
record_qty: 1
debug: true
type: NONE
rebuild:
rank: 4
object_class: OC_RP_3G1
1 change: 1 addition & 0 deletions src/tests/ftest/rebuild/no_cap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ server_config:
container:
control_method: daos
properties: "rd_fac:1"
type: NONE

pool:
scm_size: 1G
Expand Down
1 change: 1 addition & 0 deletions src/tests/ftest/rebuild/read_array.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ container:
akey_size: 5
dkey_size: 5
data_size: 5
type: NONE
rebuild:
object_class: OC_RP_3G1
rank: 3
1 change: 1 addition & 0 deletions src/tests/ftest/rebuild/with_io.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/tests/ftest/recovery/check_policy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ pool:

container:
control_method: daos
type: NONE
1 change: 1 addition & 0 deletions src/tests/ftest/recovery/check_start_options.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ pool:

container:
control_method: daos
type: NONE
1 change: 1 addition & 0 deletions src/tests/ftest/recovery/pool_list_consolidation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,4 @@ pool:

container:
control_method: daos
type: NONE
1 change: 1 addition & 0 deletions src/tests/ftest/security/cont_acl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/tests/ftest/security/cont_create_acl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ pool:
scm_size: 1073741824
container:
control_method: daos
type: NONE
1 change: 1 addition & 0 deletions src/tests/ftest/security/cont_owner.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ pool:
size: 1G
container:
control_method: daos
type: NONE
1 change: 1 addition & 0 deletions src/tests/ftest/security/pool_acl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ server_config:
# allow_insecure: False
container:
control_method: daos
type: NONE
pool_acl:
scm_size: 134217728
user_prefix: daos_ci
Expand Down
1 change: 1 addition & 0 deletions src/tests/ftest/security/pool_groups.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/tests/ftest/server/daos_server_restart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ pool:

container:
control_method: daos
type: NONE
1 change: 1 addition & 0 deletions src/tests/ftest/server/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ container:
control_method: API
silent: true
register_cleanup: False
type: NONE

ior:
np: 1
Expand Down
8 changes: 7 additions & 1 deletion utils/node_local_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment on lines +1781 to +1787
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure what's going on, but from the log, when this fails, there is no stdout
https://jenkins-3.daos.hpc.amslabs.hpecorp.net/blue/rest/organizations/jenkins/pipelines/daos-stack/pipelines/daos/branches/PR-17516/runs/7/nodes/483/log/?start=0

[2026-02-10T01:26:32.526Z] Failed to decode json output
[2026-02-10T01:26:32.526Z] command=['/opt/daos/bin/daos', '--json', 'container', 'create', 'NLT', '--type', 'POSIX', '--properties', 'cksum:off,srv_cksum:off,rd_fac:0']
[2026-02-10T01:26:32.526Z] 

dcr.rc = rc
return dcr

Expand Down
Loading