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

Jump to bottom

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

merged 6 commits into from
Jan 30, 2024

Conversation

tanabarr
Copy link
Contributor

@tanabarr tanabarr commented Jan 18, 2024 •
edited
Loading

JSON output format of dmg storage query list-devices changed in commit
8e1c846 and specifically dev_state
and health_stats were moved to a ctrlr sub-node of smd_info. This has
broken parse_device_info() and dmg_storage_query_device_health() in
src/common/tests_dmg_helpers.c. This change updates the function to
look for dev_state and health_stats keys inside the ctrlr sub-node.

Also fix NVMe recovery test 4 by removing check for non-existent error
message in control log as noted in DAOS-14907.

Features: DaosCoreTestNvme
Required-githooks: true

Before requesting gatekeeper:

  • Two review approvals and any prior change requests have been resolved.
  • Testing is complete and all tests passed or there is a reason documented in the PR why it should be force landed and forced-landing tag is set.
  • Features: (or Test-tag*) commit pragma was used or there is a reason documented that there are no appropriate tags for this PR.
  • Commit messages follows the guidelines outlined here.
  • Any tests skipped by the ticket being addressed have been run and passed in the PR.

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.
  • 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.
  • Sufficient testing is done. Check feature pragmas and test tags and that tests skipped for the ticket are run and now pass with the changes.
  • If applicable, the PR has addressed any potential version compatibility issues.
  • Check the target branch. If it is master branch, should the PR go to a feature branch? If it is a release branch, does it have merge approval in the JIRA ticket.
  • Extra checks if forced landing is requested
    • Review comments are sufficiently resolved, particularly by prior reviewers that requested changes.
    • No new NLT or valgrind warnings. Check the classic view.
    • Quick-build or Quick-functional is not used.
  • Fix the commit message upon landing. Check the standard here. Edit it to create a single commit. If necessary, ask submitter for a new summary.

@tanabarr
DAOS-15038 test: Parsing device state from SMD info JSON is failing
4eeeeaa 
JSON output format of dmg storage query list-devices changed in
commit 8e1c846 and specifically
dev_state was moved to a ctrlr sub-node of smd_info. This has broken
src/common/tests_dmg_helpers.c:parse_device_info() which looks for
dev_state in smd_info. This change updates the function to look
for dev_state inside the ctrlr sub-node.

Features: DaosCoreTestNvme
Required-githooks: true

Signed-off-by: Tom Nabarro <tom.nabarro@intel.com>
@github-actions GitHub Actions
Copy link

github-actions bot commented Jan 18, 2024 •
edited
Loading

Bug-tracker data:
Ticket title is 'Parsing device state from SMD info JSON is failing'
Status is 'In Review'
https://daosio.atlassian.net/browse/DAOS-15038

@tanabarr tanabarr self-assigned this Jan 18, 2024
@tanabarr tanabarr added the bug label Jan 18, 2024
@tanabarr tanabarr mentioned this pull request Jan 18, 2024
Merged
18 tasks
daltonbohning
daltonbohning previously approved these changes Jan 18, 2024
View reviewed changes
NiuYawei
NiuYawei previously approved these changes Jan 19, 2024
View reviewed changes
knard-intel
knard-intel previously approved these changes Jan 19, 2024
View reviewed changes
@daosbuild1
Copy link
Collaborator

Test stage Functional Hardware Medium completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-13630/1/execution/node/1387/log

@tanabarr
Merge remote-tracking branch 'origin/master' into tanabarr/test-fix-d…
352ba64 
…evlist-c-helpers

Features: DaosCoreTestNvme
Signed-off-by: Tom Nabarro <tom.nabarro@intel.com>
@daosbuild1
Copy link
Collaborator

Test stage Functional Hardware Medium completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-13630/2/execution/node/1387/log

@tanabarr
fix parsing of health stats from JSON in C helper
362fa6b 
Features: DaosCoreTestNvme
Required-githooks: true

Signed-off-by: Tom Nabarro <tom.nabarro@intel.com>
@tanabarr
Merge remote-tracking branch 'origin/master' into tanabarr/test-fix-d…
a216e18 
…evlist-c-helpers

Features: DaosCoreTestNvme
Required-githooks: true

Signed-off-by: Tom Nabarro <tom.nabarro@intel.com>
@tanabarr tanabarr changed the title DAOS-15038 test: Parsing device state from SMD info JSON is failing DAOS-15038 test: Parsing NVMe controller details from SMD info JSON is failing Jan 25, 2024
knard-intel
knard-intel previously approved these changes Jan 25, 2024
View reviewed changes
Copy link
Contributor

@knard-intel knard-intel left a comment

Choose a reason for hiding this comment

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

LGTM

src/common/tests_dmg_helpers.c
@@ -1277,9 +1283,10 @@ dmg_storage_query_device_health(const char *dmg_config_file, char *host,
struct json_object *storage_map = NULL;
struct json_object *smd_info = NULL;
struct json_object *storage_info = NULL;
struct json_object *health_info = NULL;
struct json_object *health_stats = NULL;
Copy link
Contributor

Choose a reason for hiding this comment

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

NIT indentation issue

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I will fix these either if I repush or in a subsequent PR

src/common/tests_dmg_helpers.c
struct json_object *devices = NULL;
struct json_object *dev_info = NULL;
struct json_object *ctrlr_info = NULL;
Copy link
Contributor

Choose a reason for hiding this comment

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

NIT indentation issue

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I will fix these either if I repush or in a subsequent PR

NiuYawei
NiuYawei previously approved these changes Jan 25, 2024
View reviewed changes
@tanabarr
Copy link
Contributor Author

GATEKEEPER: Please use the PR title and description above as the commit message when landing. TIA

kjacque
kjacque previously approved these changes Jan 25, 2024
View reviewed changes
Copy link
Contributor

@kjacque kjacque left a comment

Choose a reason for hiding this comment

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

LGTM

daltonbohning
daltonbohning previously approved these changes Jan 25, 2024
View reviewed changes
@daosbuild1
Copy link
Collaborator

Test stage Functional Hardware Medium completed with status FAILURE. https://build.hpdd.intel.com//job/daos-stack/job/daos/view/change-requests/job/PR-13630/3/execution/node/1451/log

@tanabarr
Merge remote-tracking branch 'origin/master' into tanabarr/test-fix-d…
076abf1 
…evlist-c-helpers

Signed-off-by: Tom Nabarro <tom.nabarro@intel.com>
@tanabarr
Fix NVMe recovery test 4 by removing check for non-existent error mes…
a9180ac 
…sage in control log

Features: DaosCoreTestNvme
Required-githooks: true

Signed-off-by: Tom Nabarro <tom.nabarro@intel.com>
@daosbuild1
Copy link
Collaborator

Test stage Unit Test on EL 8.8 completed with status UNSTABLE. https://build.hpdd.intel.com/job/daos-stack/job/daos//view/change-requests/job/PR-13630/4/testReport/

@daosbuild1
Copy link
Collaborator

Test stage Functional Hardware Medium completed with status UNSTABLE. https://build.hpdd.intel.com/job/daos-stack/job/daos//view/change-requests/job/PR-13630/4/testReport/

@tanabarr
Copy link
Contributor Author

In CI run https://build.hpdd.intel.com/blue/organizations/jenkins/daos-stack%2Fdaos/detail/PR-13630/4/tests/ the unit tests failed as expected due to breakage that has been addressed by the landing of PR-13672. NVMe recovery tests have been fixed but there is an unrelated known failure on REBUILD15 - DER_BUSY DAOS-14682.

@phender @NiuYawei do you think it's feasible requesting forced landing given the above test results or should I rebase and repush?

@tanabarr tanabarr added the forced-landing The PR has known failures or has intentionally reduced testing, but should still be landed. label Jan 30, 2024
@tanabarr tanabarr requested a review from a team January 30, 2024 13:14
@gnailzenh gnailzenh merged commit 6f084bc into master Jan 30, 2024
48 of 52 checks passed
@gnailzenh gnailzenh deleted the tanabarr/test-fix-devlist-c-helpers branch January 30, 2024 13:26
@tanabarr tanabarr mentioned this pull request Jan 30, 2024
Closed
18 tasks
brianjmurrell pushed a commit that referenced this pull request Jan 31, 2024
@tanabarr @brianjmurrell
DAOS-15038 test: Parsing NVMe controller details from SMD info JSON i…
95683aa 
…s failing (#13630)

* DAOS-15038 test: Parsing device state from SMD info JSON is failing

JSON output format of dmg storage query list-devices changed in
commit 8e1c846 and specifically
dev_state was moved to a ctrlr sub-node of smd_info. This has broken
src/common/tests_dmg_helpers.c:parse_device_info() which looks for
dev_state in smd_info. This change updates the function to look
for dev_state inside the ctrlr sub-node.


#Pragmas from previous commit message:
Skip-checkpatch: true
Skip-python-bandit: true
Skip-build: true
Quick-build: true
Quick-Functional: true
Allow-unstable-test: true
#RPM-test-version: version[-release]
#RPM-test-version: 2.5.100
# VM1-label: ci_vm1
# Ubuntu-VM9-label: ci_vm9
# Leap15-VM9-label: ci_vm9
# EL8-VM9-label: ci_vm9
# HW-medium-label: ci_nvme5
# HW-large-label: ci_nvme9
Signed-off-by: Tom Nabarro <tom.nabarro@intel.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@knard-intel knard-intel knard-intel approved these changes

@gnailzenh gnailzenh gnailzenh approved these changes

@NiuYawei NiuYawei NiuYawei approved these changes

@phender phender Awaiting requested review from phender

@daltonbohning daltonbohning Awaiting requested review from daltonbohning

@kjacque kjacque Awaiting requested review from kjacque

Assignees

@tanabarr tanabarr

Labels
bug forced-landing The PR has known failures or has intentionally reduced testing, but should still be landed.
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@tanabarr @daosbuild1 @NiuYawei @gnailzenh @daltonbohning @kjacque @knard-intel