diff --git a/scripts/generate_dump b/scripts/generate_dump index c24b1c2c49..4b796c1348 100755 --- a/scripts/generate_dump +++ b/scripts/generate_dump @@ -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 } @@ -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 @@ -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 @@ -1266,7 +1266,11 @@ main() { fi echo ${TARFILE} - exit $RETURN_CODE + + if ! $SAVE_STDERR + then + exit $RETURN_CODE + fi } ###############################################################################