[CLI][techsupport] Add NOOP option for commands that did not have that option #1445

smaheshm · 2021-02-18T23:12:35Z

What I did

Add NOOP option for 'save_proc' and 'docker cp' commands.
(this option can be used in pytest to check against all commands that will be executed for techsupport collection)

How I did it

Added "NOOP" option to print the command without executing it.

How to verify it

admin@str-s6000-acs-8:~$ generate_dump -n
mkdir -p /var/dump/sonic_dump_str-s6000-acs-8_20210218_230943
ln -s /usr/local/bin/generate_dump /var/dump/sonic_dump_str-s6000-acs-8_20210218_230943
tar -chf /var/dump/sonic_dump_str-s6000-acs-8_20210218_230943.tar -C /var/dump sonic_dump_str-s6000-acs-8_20210218_230943
rm -f /var/dump/sonic_dump_str-s6000-acs-8_20210218_230943/sonic_dump
mkdir -p /var/dump/sonic_dump_str-s6000-acs-8_20210218_230943/proc
echo cp  -r /proc/buddyinfo /var/dump/sonic_dump_str-s6000-acs-8_20210218_230943/proc
echo cp  -r /proc/cmdline /var/dump/sonic_dump_str-s6000-acs-8_20210218_230943/proc
echo cp  -r /proc/consoles /var/dump/sonic_dump_str-s6000-acs-8_20210218_230943/proc
echo cp  -r /proc/cpuinfo /var/dump/sonic_dump_str-s6000-acs-8_20210218_230943/proc
.
.
.

admin@str-s6000-acs-8:~$ generate_dump -n
mkdir -p /var/dump/sonic_dump_str-s6000-acs-8_20210218_231041
ln -s /usr/local/bin/generate_dump /var/dump/sonic_dump_str-s6000-acs-8_20210218_231041
tar -chf /var/dump/sonic_dump_str-s6000-acs-8_20210218_231041.tar -C /var/dump sonic_dump_str-s6000-acs-8_20210218_231041
rm -f /var/dump/sonic_dump_str-s6000-acs-8_20210218_231041/sonic_dump
timeout --foreground 5m sudo docker exec -i syncd touch /var/log/diagrun.log
timeout --foreground 5m sudo docker cp syncd:/var/log/diagrun.log /var/log/diagrun.log
timeout --foreground 5m sudo docker exec -i syncd touch /var/log/bcm_diag_post
timeout --foreground 5m sudo docker cp syncd:/var/log/bcm_diag_post /var/log/bcm_diag_post

Platform INFO:

admin@svcstr-nmasic-acs-1:/var/dump$ sudo generate_dump -n | grep timeout 
timeout --foreground 5m show platform syseeprom &> '/var/dump/sonic_dump_svcstr-nmasic-acs-1_20210219_194632/dump/syseeprom'
timeout --foreground 5m show platform psustatus &> '/var/dump/sonic_dump_svcstr-nmasic-acs-1_20210219_194632/dump/psustatus'
timeout --foreground 5m show platform ssdhealth &> '/var/dump/sonic_dump_svcstr-nmasic-acs-1_20210219_194632/dump/ssdhealth'
timeout --foreground 5m show platform temperature &> '/var/dump/sonic_dump_svcstr-nmasic-acs-1_20210219_194632/dump/temperature'
timeout --foreground 5m show platform fan &> '/var/dump/sonic_dump_svcstr-nmasic-acs-1_20210219_194632/dump/fan'


admin@svcstr-nmasic-acs-1:~$ sudo generate_dump 
tar: sonic_dump_svcstr-nmasic-acs-1_20210219_194041/generate_dump: File removed before we read it
Command: show platform syseeprom timedout after 5 minutes.
admin@svcstr-nmasic-acs-1:~$ cd /var/dump/
admin@svcstr-nmasic-acs-1:/var/dump$ sudo tar -xvf sonic_dump_svcstr-nmasic-acs-1_20210219_194041.tar 
sonic_dump_svcstr-nmasic-acs-1_20210219_194041/
sonic_dump_svcstr-nmasic-acs-1_20210219_194041/dump/syseeprom
sonic_dump_svcstr-nmasic-acs-1_20210219_194041/dump/psustatus
sonic_dump_svcstr-nmasic-acs-1_20210219_194041/dump/ssdhealth
sonic_dump_svcstr-nmasic-acs-1_20210219_194041/dump/temperature
sonic_dump_svcstr-nmasic-acs-1_20210219_194041/dump/fan

PSU    Status
-----  --------
PSU 1  OK
PSU 2  OK
Device Model : Micron_M600_MTFDDAT064MBF
Health       : N/A
Temperature  : N/A
Fan Not detected

admin@svcstr-masic-acs-1:/var/dump$ cat sonic_dump_svcstr-nmasic-acs-1_20210219_194041/dump/fan
Fan Not detected

admin@svcstr-masic-acs-1:/var/dump$ cat sonic_dump_svcstr-nmasic-acs-1_20210219_194041/dump/temperature
Thermal Not detected

admin@svcstr-masic-acs-1:/var/dump$ cat sonic_dump_svcstr-nmasic-acs-1_20210219_194041/dump/ssdhealth
Device Model : Micron_M600_MTFDDAT064MBF
Health       : N/A
Temperature  : N/A

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)

scripts/generate_dump

jleveque

Approving. However, it would be nice if we could add some kind of run_cmd() wrapper function which we can pass every command, and that function would check the NOOP variable and either echo the command or run it. However, this might require some refactoring because some commands are currently strung together.

smaheshm · 2021-02-19T04:54:08Z

retest this please

smaheshm · 2021-02-19T16:46:36Z

retest this please

smaheshm · 2021-02-22T17:02:26Z

retest this please

scripts/generate_dump

sujinmkang · 2021-02-23T22:10:32Z

scripts/generate_dump

+        mkdir -p $TARDIR
+        $CP $V -rf /host/warmboot $TARDIR
+
+        start_t=$(date +%s%3N)


This line needs to be out of the condition to be used for calculating the time.

Another question is if we need to log the time of the output generation for noop case. What do you think?

It's not needed, adding it to be consistent with other commands.

This line needs to be out of the condition to be used for calculating the time.

😬

…t option (sonic-net#1445)

keboliu · 2021-03-16T07:45:00Z

This PR needs to be cherry-picked to 202012 otherwise the latest community show_techsupport/tech_support_cmds.py will fail on 202012 image

…t option (#1445)

d03c6ccc90b92d9319c500a8adcf727a9fa5609b (HEAD -> 201911, origin/201911) [intfsorch] Init proxy_arp variable while adding router interface. (sonic-net#1473) 9e7c0bc8e3f2c7c5422f2f8a2c6498f659dcdf84 [drop counters] Clarify log messages for initial counter setup (sonic-net#1445) da8ac754fa1c36f9bb7ba1210017f915f339cfe0 Create vnet tunnel map only if it doesn't exist (sonic-net#1482) Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

Including the following changes: [bitmap_vnet] Remove BMTOR implementation (sonic-net#1496) [intfsorch] Init proxy_arp variable while adding router interface. (sonic-net#1473) [drop counters] Clarify log messages for initial counter setup (sonic-net#1445) Signed-off-by: Liat Grozovik <liatg@nvidia.com>

add NOOP option for save_proc and docker cp commands

98f27b1

smaheshm requested review from jleveque and sujinmkang February 18, 2021 23:12

jleveque suggested changes Feb 19, 2021

View reviewed changes

scripts/generate_dump Outdated Show resolved Hide resolved

formatting change as per comments

afdc363

sujinmkang previously approved these changes Feb 19, 2021

View reviewed changes

jleveque previously approved these changes Feb 19, 2021

View reviewed changes

add NOOP for platform info, and fix a bug

4a67fb7

smaheshm dismissed stale reviews from jleveque and sujinmkang via 4a67fb7 February 19, 2021 19:44

smaheshm requested a review from sujinmkang February 19, 2021 19:49

sujinmkang reviewed Feb 22, 2021

View reviewed changes

scripts/generate_dump Outdated Show resolved Hide resolved

update as per comments

d01a7d8

sujinmkang reviewed Feb 23, 2021

View reviewed changes

fix the start time

7261f43

smaheshm requested a review from sujinmkang February 24, 2021 01:56

sujinmkang approved these changes Feb 25, 2021

View reviewed changes

smaheshm merged commit 2f6e36e into sonic-net:master Feb 25, 2021

anand-kumar-subramanian pushed a commit to anand-kumar-subramanian/sonic-utilities that referenced this pull request Mar 2, 2021

[CLI][techsupport] Add NOOP option for commands that did not have tha…

5a9913d

…t option (sonic-net#1445)

keboliu added the Request for 202012 Branch label Mar 16, 2021

daall added the Included in 202012 Branch label Mar 19, 2021

daall pushed a commit that referenced this pull request Mar 19, 2021

[CLI][techsupport] Add NOOP option for commands that did not have tha…

166130d

…t option (#1445)

smaheshm deleted the stech branch April 14, 2021 15:52

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CLI][techsupport] Add NOOP option for commands that did not have that option #1445

[CLI][techsupport] Add NOOP option for commands that did not have that option #1445

smaheshm commented Feb 18, 2021 •

edited

Loading

jleveque left a comment

smaheshm commented Feb 19, 2021

smaheshm commented Feb 19, 2021

smaheshm commented Feb 22, 2021

sujinmkang Feb 23, 2021

sujinmkang Feb 23, 2021

smaheshm Feb 23, 2021

smaheshm Feb 23, 2021

keboliu commented Mar 16, 2021

[CLI][techsupport] Add NOOP option for commands that did not have that option #1445

[CLI][techsupport] Add NOOP option for commands that did not have that option #1445

Conversation

smaheshm commented Feb 18, 2021 • edited Loading

What I did

How I did it

How to verify it

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)

jleveque left a comment

Choose a reason for hiding this comment

smaheshm commented Feb 19, 2021

smaheshm commented Feb 19, 2021

smaheshm commented Feb 22, 2021

sujinmkang Feb 23, 2021

Choose a reason for hiding this comment

sujinmkang Feb 23, 2021

Choose a reason for hiding this comment

smaheshm Feb 23, 2021

Choose a reason for hiding this comment

smaheshm Feb 23, 2021

Choose a reason for hiding this comment

keboliu commented Mar 16, 2021

smaheshm commented Feb 18, 2021 •

edited

Loading