Skip to content

[202012] [techsupport] Techsupport Error Reporting pending fixes #1854

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

Merged
qiluo-msft merged 8 commits into from
Nov 8, 2021
Merged

[202012] [techsupport] Techsupport Error Reporting pending fixes #1854

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
86919fa
bash error changes ported to 202012
vivekrnv Sep 29, 2021
c8b913e
Missing fixes added
vivekrnv Sep 29, 2021
d6ea78d
Removed the -it option
vivekrnv Sep 30, 2021
628bb2c
removed -d option from show ip interfaces
vivekrnv Oct 3, 2021
ee8e4a2
Revert "bash error changes ported to 202012"
vivekrnv Oct 3, 2021
c85a36b
Revert "Missing fixes added"
vivekrnv Oct 3, 2021
6c12414
Merge branch '202012' of https://github.com/Azure/sonic-utilities int…
vivekrnv Oct 3, 2021
8251d7f
exit with trap Return code only when -r option is set
vivekrnv Oct 16, 2021
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
14 changes: 9 additions & 5 deletions scripts/generate_dump
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,11 +664,11 @@ save_redis() {
save_saidump() {
trap 'handle_error $? $LINENO' ERR
if [[ ( "$NUM_ASICS" == 1 ) ]] ; then
save_cmd "docker exec -it syncd saidump" "saidump"
save_cmd "docker exec syncd saidump" "saidump"
else
for (( i=0; i<$NUM_ASICS; i++ ))
do
save_cmd "docker exec -it syncd$i saidump" "saidump$i"
save_cmd "docker exec syncd$i saidump" "saidump$i"
done
fi
}
Expand Down Expand Up @@ -807,7 +807,7 @@ enable_logrotate() {
collect_mellanox() {
trap 'handle_error $? $LINENO' ERR
local sai_dump_filename="/tmp/sai_sdk_dump_$(date +"%m_%d_%Y_%I_%M_%p")"
${CMD_PREFIX}docker exec -it syncd saisdkdump -f $sai_dump_filename
${CMD_PREFIX}docker exec syncd saisdkdump -f $sai_dump_filename
${CMD_PREFIX}docker exec syncd tar Ccf $(dirname $sai_dump_filename) - $(basename $sai_dump_filename) | tar Cxf /tmp/ -
save_file $sai_dump_filename sai_sdk_dump true

Expand Down Expand Up @@ -1161,7 +1161,7 @@ main() {
save_cmd "show interface status -d all" "interface.status"
save_cmd "show interface transceiver presence" "interface.xcvrs.presence"
save_cmd "show interface transceiver eeprom --dom" "interface.xcvrs.eeprom"
save_cmd "show ip interface -d all" "ip.interface"
save_cmd "show ip interface" "ip.interface"

save_cmd "lldpctl" "lldpctl"
if [[ ( "$NUM_ASICS" > 1 ) ]]; then
Expand Down Expand Up @@ -1266,7 +1266,11 @@ main() {
fi

echo ${TARFILE}
exit $RETURN_CODE

if ! $SAVE_STDERR
then
exit $RETURN_CODE
fi
}

###############################################################################
Expand Down