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.

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

b/340244046 initial port collect command from master to 2.4 #14409

Merged
merged 1 commit into from
May 21, 2024

Conversation

cdavis28
Copy link
Contributor

Manual cherry-pick of code from master for the "collect-log" command.

@cdavis28 cdavis28 requested review from mjmac and jolivier23 May 20, 2024 18:36
@jolivier23
Copy link
Contributor

Could you add a list of backport titles to the description

e.g. backports the following PRs

DAOS-XYZ blah: ..... (# PR number)

That would help understanding the patch

Comment on lines 4 to 7
for debugging purpose.This options is available for `daos_server`, `dmg` and `daos_agent` binaries.
It will collect the specific logs, config and other DAOS related metrics and system information.

`dmg support collect-log` is the single command, which will initiate the log collection
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
for debugging purpose.This options is available for `daos_server`, `dmg` and `daos_agent` binaries.
It will collect the specific logs, config and other DAOS related metrics and system information.
`dmg support collect-log` is the single command, which will initiate the log collection
for debugging purpose.This options is available for `daos_server`, `dmg` and `daos_agent` binaries.
It will collect the specific logs, config and other DAOS related metrics and system information.
`dmg support collect-log` is the single command, which will initiate the log collection

# go get -u $(PROTOC_GEN_GO_IMP) &&\
# cd $(GOPATH)/src/$(PROTOC_GEN_GO_IMP) &&\
# git checkout $(PROTOC_GEN_GO_TAG) &&\
go install $(PROTOC_GEN_GO_IMP)@$(PROTOC_GEN_GO_TAG)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
go install $(PROTOC_GEN_GO_IMP)@$(PROTOC_GEN_GO_TAG)
go install $(PROTOC_GEN_GO_IMP)@$(PROTOC_GEN_GO_TAG)

self.log.info("Support collect-log on servers: %s", str(cmd))
cmd.set_command(("support", "collect-log"), **kwargs)
return run_remote(
self.log, self._hosts, cmd.with_exports, timeout=self.collect_log_timeout.value)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
self.log, self._hosts, cmd.with_exports, timeout=self.collect_log_timeout.value)
self.log, self._hosts, cmd.with_exports, timeout=self.collect_log_timeout.value)

@daosbuild1
Copy link
Collaborator

Copy link

Bug-tracker data:
Errors are component not formatted correctly,Ticket number prefix incorrect,PR title is malformatted. See https://daosio.atlassian.net/wiki/spaces/DC/pages/11133911069/Commit+Comments,Unable to load ticket data
https://daosio.atlassian.net/browse/b/340244046

@cdavis28 cdavis28 force-pushed the dev/chrd/collect branch from cfb5da6 to ced5905 Compare May 20, 2024 21:31
@jolivier23
Copy link
Contributor

Could you add a list of backport titles to the description

e.g. backports the following PRs

DAOS-XYZ blah: ..... (# PR number)

That would help understanding the patch

And if you didn't bring in the whole PR, "partial cherry-pick of ...."

@daosbuild1 daosbuild1 dismissed their stale review May 20, 2024 21:42

Updated patch

for debugging purpose.This options is available for `daos_server`, `dmg` and `daos_agent` binaries.
It will collect the specific logs, config and other DAOS related metrics and system information.

`dmg support collect-log` is the single command, which will initiate the log collection
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
`dmg support collect-log` is the single command, which will initiate the log collection
`dmg support collect-log` is the single command, which will initiate the log collection

@daosbuild1
Copy link
Collaborator

@cdavis28 cdavis28 force-pushed the dev/chrd/collect branch from ced5905 to fe6a957 Compare May 20, 2024 21:48
@daosbuild1 daosbuild1 dismissed their stale review May 20, 2024 21:50

Updated patch

for debugging purpose.This options is available for `daos_server`, `dmg` and `daos_agent` binaries.
It will collect the specific logs, config and other DAOS related metrics and system information.

`dmg support collect-log` is the single command, which will initiate the log collection
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
`dmg support collect-log` is the single command, which will initiate the log collection
`dmg support collect-log` is the single command, which will initiate the log collection

self.archive = FormattedParameter("--archive", False)
self.extra_logs_dir = FormattedParameter("--extra-logs-dir={}")
self.target_host = FormattedParameter("--target-host={}")

Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change

@daosbuild1
Copy link
Collaborator

@cdavis28 cdavis28 force-pushed the dev/chrd/collect branch from fe6a957 to 2913a20 Compare May 20, 2024 21:51
@daosbuild1 daosbuild1 dismissed their stale review May 20, 2024 21:54

Updated patch

for debugging purpose.This options is available for `daos_server`, `dmg` and `daos_agent` binaries.
It will collect the specific logs, config and other DAOS related metrics and system information.

`dmg support collect-log` is the single command, which will initiate the log collection
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
`dmg support collect-log` is the single command, which will initiate the log collection
`dmg support collect-log` is the single command, which will initiate the log collection

@daosbuild1
Copy link
Collaborator

@cdavis28 cdavis28 force-pushed the dev/chrd/collect branch from 2913a20 to 746ce35 Compare May 20, 2024 21:57
@daosbuild1 daosbuild1 dismissed their stale review May 20, 2024 22:00

Updated patch

Copy link
Collaborator

@daosbuild1 daosbuild1 left a comment

Choose a reason for hiding this comment

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

LGTM. No errors found by checkpatch.

Test daos_agent support collect-log command completes successfully.

:avocado: tags=all,full_regression
:avocado: tags=hw,medium
Copy link
Contributor

Choose a reason for hiding this comment

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

I wonder if these tests actually need hw to pass...

Anyway, with google/2.4 we explicitely disable hardware testing but for a one off run of these tests, you can do this

Test-tag: support pr
Skip-func-hw-test-medium: false

in the last commit. If you want to do this but not making any changes, I suggest

git commit --allow-empty

Also the DCO check wants commits to have Signed-off-by so git commit -s will do that.

Although this port copies the code from master to 2.4, there
are issues related to permissions making it non-functional.

This is a partial cherry-pick of the following PR's on master:
DAOS-10625 control: Create the tool to collect the logs/config for support purpose (#11094)
DAOS-13759 control: Update support collect-log tool. (#12906)
DAOS-13763 control: Fix daos_metrics collection for support collect-log. (#12555)
DAOS-13936 support: Collect the specific logs and Time range log for support (#13325)

Signed-off-by: Chris Davis <[email protected]>
@cdavis28 cdavis28 force-pushed the dev/chrd/collect branch from 746ce35 to b9bdc26 Compare May 20, 2024 23:40
Copy link
Collaborator

@daosbuild1 daosbuild1 left a comment

Choose a reason for hiding this comment

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

LGTM. No errors found by checkpatch.

@cdavis28 cdavis28 merged commit 6d6b3ca into google/2.4 May 21, 2024
33 of 35 checks passed
@cdavis28 cdavis28 deleted the dev/chrd/collect branch May 21, 2024 01:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants