Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DAOS-15038 test: Parsing NVMe controller details from SMD info JSON is failing #13630

Merged
merged 6 commits into from
Jan 30, 2024
Merged

DAOS-15038 test: Parsing NVMe controller details from SMD info JSON is failing #13630

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4eeeeaa
DAOS-15038 test: Parsing device state from SMD info JSON is failing
tanabarr Jan 18, 2024
352ba64
Merge remote-tracking branch 'origin/master' into tanabarr/test-fix-d…
tanabarr Jan 21, 2024
362fa6b
fix parsing of health stats from JSON in C helper
tanabarr Jan 25, 2024
a216e18
Merge remote-tracking branch 'origin/master' into tanabarr/test-fix-d…
tanabarr Jan 25, 2024
076abf1
Merge remote-tracking branch 'origin/master' into tanabarr/test-fix-d…
tanabarr Jan 28, 2024
a9180ac
Fix NVMe recovery test 4 by removing check for non-existent error mes…
tanabarr Jan 28, 2024
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
20 changes: 13 additions & 7 deletions src/common/tests_dmg_helpers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1032,6 +1032,7 @@ parse_device_info(struct json_object *smd_dev, device_list *devices,
{
struct json_object *tmp;
struct json_object *dev = NULL;
struct json_object *ctrlr = NULL;
struct json_object *target = NULL;
struct json_object *targets;
int tgts_len;
Expand Down Expand Up @@ -1081,19 +1082,24 @@ parse_device_info(struct json_object *smd_dev, device_list *devices,
}
devices[*disks].n_tgtidx = tgts_len;

if (!json_object_object_get_ex(dev, "dev_state", &tmp)) {
D_ERROR("unable to extract state from JSON\n");
if (!json_object_object_get_ex(dev, "rank", &tmp)) {
D_ERROR("unable to extract rank from JSON\n");
return -DER_INVAL;
}
devices[*disks].rank = atoi(json_object_to_json_string(tmp));

snprintf(devices[*disks].state, sizeof(devices[*disks].state),
"%s", json_object_to_json_string(tmp));
if (!json_object_object_get_ex(dev, "ctrlr", &ctrlr)) {
D_ERROR("unable to extract ctrlr obj from JSON\n");
return -DER_INVAL;
}

if (!json_object_object_get_ex(dev, "rank", &tmp)) {
D_ERROR("unable to extract rank from JSON\n");
if (!json_object_object_get_ex(ctrlr, "dev_state", &tmp)) {
D_ERROR("unable to extract state from JSON\n");
return -DER_INVAL;
}
devices[*disks].rank = atoi(json_object_to_json_string(tmp));

snprintf(devices[*disks].state, sizeof(devices[*disks].state), "%s",
json_object_to_json_string(tmp));
*disks = *disks + 1;
}

Expand Down