starlingx/utilities
Code Issues Proposed changes

Warn about invalid date when collecting logs

Browse Source 
If the user entered an invalid start-date, invalid end-date and/or
the start-date is greater than the end-date during the collect logs
process, the system will warn the user about the error, instead of
just reverting to collect all.

Test plan:
PASS - Install and bootstrap SX and test if the warnings are
presented if an invalid start-date, end-date and/or date range
are passed by the user, as well as collecting logs if correct
parameters are provided.
PASS - Install and bootstrap Standard and test if the warnings are
presented if an invalid start-date, end-date and/or date range
are passed by the user, as well as collecting logs if correct
parameters are provided.

Closes-bug: 2003791

Signed-off-by: Victor Romano <victor.gluzromano@windriver.com>
Change-Id: Iab35b1d92f4471e2713fabe5d7a6ef8b611ea240
This commit is contained in:
Victor Romano 2023-01-24 12:11:59 -03:00
parent 93318327fc
commit 59450af179
4 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/collector/debian-scripts/collect
View File

@ -759,6 +759,23 @@ while [[ ${#} -gt 0 ]] ; do
done
date -d $STARTDATE > /dev/null 2>/dev/null
rc_start_date=${?}
date -d $ENDDATE > /dev/null 2>/dev/null
rc_end_date=${?}
if [ $rc_start_date != 0 ] ; then
report_error "the start date is invalid" ${FAIL_INVALID_START_DATE}
collect_exit ${FAIL_INVALID_START_DATE}
elif [ $rc_end_date != 0 ] ; then
report_error "the end date is invalid" ${FAIL_INVALID_END_DATE}
collect_exit ${FAIL_INVALID_END_DATE}
elif (( $STARTDATE > $ENDDATE )) ; then
report_error "the start date is greater than the end date" ${FAIL_INVALID_DATE_RANGE}
collect_exit ${FAIL_INVALID_DATE_RANGE}
fi
# startup state debug logs
dlog "${TOOL_NAME} ver ${TOOL_REV}.${TOOL_REV} (pid:$$)"
dlog "USERNAME = ${USER}"

4
tools/collector/debian-scripts/collect_utils
View File

@ -54,6 +54,10 @@ FAIL_CONTINUE=51
FAIL_SUBCLOUDNAME=52
FAIL_NO_SUBCLOUDS=53
FAIL_NOT_SYSTEMCONTROLLER=54
FAIL_NAME_TOO_LONG=55
FAIL_INVALID_START_DATE=56
FAIL_INVALID_END_DATE=57
FAIL_INVALID_DATE_RANGE=58
# Warnings are above 200

16
tools/collector/scripts/collect
View File

@ -767,6 +767,22 @@ while [[ ${#} -gt 0 ]] ; do
shift # past argument or value
done
date -d $STARTDATE > /dev/null 2>/dev/null
rc_start_date=${?}
date -d $ENDDATE > /dev/null 2>/dev/null
rc_end_date=${?}
if [ $rc_start_date != 0 ] ; then
report_error "the start date is invalid" ${FAIL_INVALID_START_DATE}
collect_exit ${FAIL_INVALID_START_DATE}
elif [ $rc_end_date != 0 ] ; then
report_error "the end date is invalid" ${FAIL_INVALID_END_DATE}
collect_exit ${FAIL_INVALID_END_DATE}
elif (( $STARTDATE > $ENDDATE )) ; then
report_error "the start date is greater than the end date" ${FAIL_INVALID_DATE_RANGE}
collect_exit ${FAIL_INVALID_DATE_RANGE}
fi
# startup state debug logs
dlog "${TOOL_NAME} ver ${TOOL_REV}.${TOOL_REV} (pid:$$)"

3
tools/collector/scripts/collect_utils
View File

@ -55,6 +55,9 @@ FAIL_SUBCLOUDNAME=52
FAIL_NO_SUBCLOUDS=53
FAIL_NOT_SYSTEMCONTROLLER=54
FAIL_NAME_TOO_LONG=55
FAIL_INVALID_START_DATE=56
FAIL_INVALID_END_DATE=57
FAIL_INVALID_DATE_RANGE=58
# Warnings are above 200