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

[generate_dump]: Enhance show techsupport for Marvell platform #2676

Merged
merged 1 commit into from
Jun 29, 2023
Merged

[generate_dump]: Enhance show techsupport for Marvell platform #2676

merged 1 commit into from
Jun 29, 2023

Conversation

pavannaregundi
Copy link
Contributor

Change-Id: Ibb5b5a860833e8d7834a1d72756d070c61f2ab37

What I did

Added support for marvell sdk commands in "show techsupport".

How I did it

Modified the generate_dump script, to add marvell sdk commands under a proper platform check.

How to verify it

Verified the change by running "show techsupport" command and check all the newly added marvel sdk commands are collecting the correct information.

Previous command output (if the output of a command-line utility has changed)

New command output (if the output of a command-line utility has changed)

@radha-danda
Copy link

@lguohan, can you help review and merge the PR please?

@lguohan
Copy link
Contributor

lguohan commented Apr 4, 2023

@qiluo-msft can you help?

@qiluo-msft qiluo-msft self-requested a review April 10, 2023 16:22
qiluo-msft
qiluo-msft reviewed Apr 10, 2023
View reviewed changes
scripts/generate_dump Outdated

mkdir -p $LOGDIR/sdkdump
if [ "$1" = "collect SER" ];then
local cmd="sudo cat /var/log/syslog | grep \"Chip MARVELL occurs\""
Copy link
Contributor

@qiluo-msft qiluo-msft Apr 10, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

/var/log/syslog

local cmd="sudo cat /var/log/syslog | grep "Chip MARVELL occurs""

syslog file will be rotated at any time. So this grep may not work. Since all the syslog files are already dumped, why you need grep? #Closed

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Will changed this logic to collect logs from SDK.

qiluo-msft
qiluo-msft reviewed Apr 10, 2023
View reviewed changes
scripts/generate_dump Outdated
if [ "$1" = "collect SER" ];then
local cmd="sudo cat /var/log/syslog | grep \"Chip MARVELL occurs\""
else
local cmd="~/mrvlcmd -c \"$1\""
Copy link
Contributor

@qiluo-msft qiluo-msft Apr 10, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

~/

local cmd="~/mrvlcmd -c "$1""

It is dangerous to copy of one runable file from cotnainer to host, and run as root. show tech is expected to only show. If you really need the script in host, please build into the host image. #Closed

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Will change this, to run command directed using docker exec.

qiluo-msft
qiluo-msft requested changes Apr 10, 2023
View reviewed changes
Copy link
Contributor

@qiluo-msft qiluo-msft left a comment

Choose a reason for hiding this comment

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

As comments

@pavannaregundi
[generate_dump]: Enhance show techsupport for Marvell platform
8e16578 
Change-Id: Ibb5b5a860833e8d7834a1d72756d070c61f2ab37
Signed-off-by: Pavan Naregundi <pnaregundi@marvell.com>
@pavannaregundi
Copy link
Contributor Author

@qiluo-msft I have address your comments and pushed the changes. Please review.

qiluo-msft
qiluo-msft reviewed Jun 14, 2023
View reviewed changes
scripts/generate_dump
save_marvellcmd() {
trap 'handle_error $? $LINENO' ERR

mkdir -p $LOGDIR/sdkdump
Copy link
Contributor

@qiluo-msft qiluo-msft Jun 14, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

sdkdump

Do you want to clean up this folder if there are old files, before you save new file? #Closed

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Full path of the sdkdump will be something like below, where parenet directory(sonic_dump_sonic_XXXXXXX_XXXX) is always new each time we execute "show techsupport" command. So old file will not be present.
"/var/dump/sonic_dump_sonic_20230615_125930/dump/sdkdump/".

@pavannaregundi
Copy link
Contributor Author

@qiluo-msft Let me know if you have further comments.

@qiluo-msft qiluo-msft merged commit b1aa942 into sonic-net:master Jun 29, 2023
dgsudharsan added a commit to dgsudharsan/sonic-buildimage that referenced this pull request Jul 11, 2023
@dgsudharsan
[submodule] Advance sonic-utilities pointer
03d3573 
Update sonic-utilities submodule pointer to include the following:
* ff380e04 [hash]: Implement GH frontend ([sonic-net#2580](sonic-net/sonic-utilities#2580))
* 61bad064 [db_migrator] Set correct CURRENT_VERSION, extend UT ([sonic-net#2895](sonic-net/sonic-utilities#2895))
* 6b8ee47c [CLI][Show][BGP] Show BGP Change for no neighbor scenario ([sonic-net#2885](sonic-net/sonic-utilities#2885))
* 73d8d633 [doc] Update Command-Reference.md, change show bgp peer command to show bfd peer ([sonic-net#2750](sonic-net/sonic-utilities#2750))
* 7bc08c28 [db_migrator] Remove hardcoded config and migrate config from minigraph ([sonic-net#2887](sonic-net/sonic-utilities#2887))
* b1aa9426 [generate_dump]: Enhance show techsupport for Marvell platform ([sonic-net#2676](sonic-net/sonic-utilities#2676))
* 316b14c0 Add support for secure upgrade ([sonic-net#2698](sonic-net/sonic-utilities#2698))
* dc2945bc [dns] Implement config and show commands for static DNS. ([sonic-net#2737](sonic-net/sonic-utilities#2737))
* 8414a709 [chassis][multi asic] change acl_loader to use tcp socket for db communication ([sonic-net#2525](sonic-net/sonic-utilities#2525))
* 0b629ba1 Revert [chassis][voq] Clear fabric counters queue/port (2789) ([sonic-net#2882](sonic-net/sonic-utilities#2882))
* 3ba8241a [db_migtrator] Add migration of FLEX_COUNTER_DELAY_STATUS during 1911->master upgrade + fast-reboot. Add UT. ([sonic-net#2839](sonic-net/sonic-utilities#2839))
* fceef2ed [chassis][voq] Clear fabric counters queue/port ([sonic-net#2789](sonic-net/sonic-utilities#2789))

Signed-off-by: dgsudharsan <sudharsand@nvidia.com>
@dgsudharsan dgsudharsan mentioned this pull request Jul 11, 2023
Merged
11 tasks
liat-grozovik pushed a commit to sonic-net/sonic-buildimage that referenced this pull request Jul 11, 2023
@dgsudharsan
[submodule] Advance sonic-utilities pointer (#15779)
5cbae46 
Update sonic-utilities submodule pointer to include the following:
* ff380e04 [hash]: Implement GH frontend ([#2580](sonic-net/sonic-utilities#2580))
* 61bad064 [db_migrator] Set correct CURRENT_VERSION, extend UT ([#2895](sonic-net/sonic-utilities#2895))
* 6b8ee47c [CLI][Show][BGP] Show BGP Change for no neighbor scenario ([#2885](sonic-net/sonic-utilities#2885))
* 73d8d633 [doc] Update Command-Reference.md, change show bgp peer command to show bfd peer ([#2750](sonic-net/sonic-utilities#2750))
* 7bc08c28 [db_migrator] Remove hardcoded config and migrate config from minigraph ([#2887](sonic-net/sonic-utilities#2887))
* b1aa9426 [generate_dump]: Enhance show techsupport for Marvell platform ([#2676](sonic-net/sonic-utilities#2676))
* 316b14c0 Add support for secure upgrade ([#2698](sonic-net/sonic-utilities#2698))
* dc2945bc [dns] Implement config and show commands for static DNS. ([#2737](sonic-net/sonic-utilities#2737))
* 8414a709 [chassis][multi asic] change acl_loader to use tcp socket for db communication ([#2525](sonic-net/sonic-utilities#2525))
* 0b629ba1 Revert [chassis][voq] Clear fabric counters queue/port (2789) ([#2882](sonic-net/sonic-utilities#2882))
* 3ba8241a [db_migtrator] Add migration of FLEX_COUNTER_DELAY_STATUS during 1911->master upgrade + fast-reboot. Add UT. ([#2839](sonic-net/sonic-utilities#2839))
* fceef2ed [chassis][voq] Clear fabric counters queue/port ([#2789](sonic-net/sonic-utilities#2789))

Signed-off-by: dgsudharsan <sudharsand@nvidia.com>
sonic-otn pushed a commit to sonic-otn/sonic-buildimage that referenced this pull request Sep 20, 2023
@dgsudharsan @sonic-otn
[submodule] Advance sonic-utilities pointer (sonic-net#15779)
b777108 
Update sonic-utilities submodule pointer to include the following:
* ff380e04 [hash]: Implement GH frontend ([sonic-net#2580](sonic-net/sonic-utilities#2580))
* 61bad064 [db_migrator] Set correct CURRENT_VERSION, extend UT ([sonic-net#2895](sonic-net/sonic-utilities#2895))
* 6b8ee47c [CLI][Show][BGP] Show BGP Change for no neighbor scenario ([sonic-net#2885](sonic-net/sonic-utilities#2885))
* 73d8d633 [doc] Update Command-Reference.md, change show bgp peer command to show bfd peer ([sonic-net#2750](sonic-net/sonic-utilities#2750))
* 7bc08c28 [db_migrator] Remove hardcoded config and migrate config from minigraph ([sonic-net#2887](sonic-net/sonic-utilities#2887))
* b1aa9426 [generate_dump]: Enhance show techsupport for Marvell platform ([sonic-net#2676](sonic-net/sonic-utilities#2676))
* 316b14c0 Add support for secure upgrade ([sonic-net#2698](sonic-net/sonic-utilities#2698))
* dc2945bc [dns] Implement config and show commands for static DNS. ([sonic-net#2737](sonic-net/sonic-utilities#2737))
* 8414a709 [chassis][multi asic] change acl_loader to use tcp socket for db communication ([sonic-net#2525](sonic-net/sonic-utilities#2525))
* 0b629ba1 Revert [chassis][voq] Clear fabric counters queue/port (2789) ([sonic-net#2882](sonic-net/sonic-utilities#2882))
* 3ba8241a [db_migtrator] Add migration of FLEX_COUNTER_DELAY_STATUS during 1911->master upgrade + fast-reboot. Add UT. ([sonic-net#2839](sonic-net/sonic-utilities#2839))
* fceef2ed [chassis][voq] Clear fabric counters queue/port ([sonic-net#2789](sonic-net/sonic-utilities#2789))

Signed-off-by: dgsudharsan <sudharsand@nvidia.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@qiluo-msft qiluo-msft qiluo-msft approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@pavannaregundi @radha-danda @lguohan @qiluo-msft