Skip to content

Commit 50bbfa0

Browse files
authored
Removed -t option and other missing fixes (sonic-net#1884)
- What I did This PR include some fixes which were missed for sonic-net#1723 i.e. removing -t option from the docker exec commands. to understand why the -it option was removed, refer sonic-net#1723. Also, the show techsupport exits with $RETURN_CODE only when --redirect-stderr option is used. Signed-off-by: Vivek Reddy Karri <[email protected]>
1 parent 63a5257 commit 50bbfa0

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

scripts/generate_dump

+12-8
Original file line numberDiff line numberDiff line change
@@ -685,11 +685,11 @@ save_redis() {
685685
save_saidump() {
686686
trap 'handle_error $? $LINENO' ERR
687687
if [[ ( "$NUM_ASICS" == 1 ) ]] ; then
688-
save_cmd "docker exec -t syncd saidump" "saidump"
688+
save_cmd "docker exec syncd saidump" "saidump"
689689
else
690690
for (( i=0; i<$NUM_ASICS; i++ ))
691691
do
692-
save_cmd "docker exec -t syncd$i saidump" "saidump$i"
692+
save_cmd "docker exec syncd$i saidump" "saidump$i"
693693
done
694694
fi
695695
}
@@ -830,8 +830,8 @@ collect_mellanox() {
830830
local sai_dump_folder="/tmp/saisdkdump"
831831
local sai_dump_filename="${sai_dump_folder}/sai_sdk_dump_$(date +"%m_%d_%Y_%I_%M_%p")"
832832

833-
${CMD_PREFIX}docker exec -t syncd mkdir -p $sai_dump_folder
834-
${CMD_PREFIX}docker exec -t syncd saisdkdump -f $sai_dump_filename
833+
${CMD_PREFIX}docker exec syncd mkdir -p $sai_dump_folder
834+
${CMD_PREFIX}docker exec syncd saisdkdump -f $sai_dump_filename
835835

836836
copy_from_docker syncd $sai_dump_folder $sai_dump_folder
837837
echo "$sai_dump_folder"
@@ -840,7 +840,7 @@ collect_mellanox() {
840840
done
841841

842842
${CMD_PREFIX}rm -rf $sai_dump_folder
843-
${CMD_PREFIX}docker exec -t syncd rm -rf $sai_dump_folder
843+
${CMD_PREFIX}docker exec syncd rm -rf $sai_dump_folder
844844

845845
# Save SDK error dumps
846846
local sdk_dump_path=`${CMD_PREFIX}docker exec syncd cat /tmp/sai.profile|grep "SAI_DUMP_STORE_PATH"|cut -d = -f2`
@@ -1217,12 +1217,12 @@ main() {
12171217
if [[ ( "$NUM_ASICS" > 1 ) ]]; then
12181218
for (( i=0; i<$NUM_ASICS; i++ ))
12191219
do
1220-
save_cmd "docker exec -t lldp$i lldpcli show statistics" "lldp$i.statistics"
1220+
save_cmd "docker exec lldp$i lldpcli show statistics" "lldp$i.statistics"
12211221
save_cmd "docker logs bgp$i" "docker.bgp$i.log"
12221222
save_cmd "docker logs swss$i" "docker.swss$i.log"
12231223
done
12241224
else
1225-
save_cmd "docker exec -t lldp lldpcli show statistics" "lldp.statistics"
1225+
save_cmd "docker exec lldp lldpcli show statistics" "lldp.statistics"
12261226
save_cmd "docker logs bgp" "docker.bgp.log"
12271227
save_cmd "docker logs swss" "docker.swss.log"
12281228
fi
@@ -1339,7 +1339,11 @@ main() {
13391339
fi
13401340

13411341
echo ${TARFILE}
1342-
exit $RETURN_CODE
1342+
1343+
if ! $SAVE_STDERR
1344+
then
1345+
exit $RETURN_CODE
1346+
fi
13431347
}
13441348

13451349
###############################################################################

0 commit comments

Comments
 (0)