-
Notifications
You must be signed in to change notification settings - Fork 650
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.
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
[techsupport] Handle minor fixes of TS Lock and update auto-TS #2114
Changes from 5 commits
d73bceb
2f1d545
8ba42b1
27002ac
1901275
fdd57fb
230c8df
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -110,13 +110,22 @@ def parse_ts_dump_name(self, ts_stdout): | |
syslog.syslog(syslog.LOG_ERR, "stdout of the 'show techsupport' cmd doesn't have the dump name") | ||
return "" | ||
|
||
def invoke_ts_cmd(self, since_cfg): | ||
since_cfg = "'" + since_cfg + "'" | ||
def invoke_ts_cmd(self, since_cfg, num_retry=0): | ||
cmd_opts = ["show", "techsupport", "--silent", "--since", since_cfg] | ||
cmd = " ".join(cmd_opts) | ||
rc, stdout, stderr = subprocess_exec(cmd_opts, env=ENV_VAR) | ||
if rc: | ||
if rc == EXT_LOCKFAIL: | ||
syslog.syslog(syslog.LOG_NOTICE, "Another instance of techsupport running, aborting this. stderr: {}".format(stderr)) | ||
return "" | ||
elif rc == EXT_RETRY: | ||
if num_retry <= MAX_RETRY_LIMIT: | ||
print(num_retry) | ||
return self.invoke_ts_cmd(since_cfg, num_retry+1) | ||
else: | ||
syslog.syslog(syslog.LOG_ERR, "MAX_RETRY_LIMIT for show techsupport invocation exceeded, stderr: {}".format(stderr)) | ||
elif rc != EXT_SUCCESS: | ||
syslog.syslog(syslog.LOG_ERR, "show techsupport failed with exit code {}, stderr: {}".format(rc, stderr)) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. yeah, i'll add it |
||
# Parse the dump name | ||
new_dump = self.parse_ts_dump_name(stdout) | ||
if not new_dump: | ||
syslog.syslog(syslog.LOG_ERR, "{} was run, but no techsupport dump is found".format(cmd)) | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -63,6 +63,10 @@ handle_exit() | |
ECODE=$? | ||
echo "Removing lock. Exit: $ECODE" >&2 | ||
$RM $V -rf ${LOCKDIR} | ||
# Echo the filename as the last statement if the generation suceeds | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Isn't it already supported? I am seeing
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. After the addition of lock code, no. handle_exit is the last trap that runs before exiting, and it does print a few statements and thus the issue |
||
if [[ -f $TARFILE && ($ECODE == $EXT_SUCCESS || $ECODE == $RETURN_CODE) ]]; then | ||
echo $TARFILE | ||
fi | ||
} | ||
|
||
handle_signal() | ||
|
@@ -1360,8 +1364,6 @@ main() { | |
|
||
# Invoke the TechSupport Cleanup Hook | ||
setsid python3 /usr/local/bin/techsupport_cleanup.py ${TARFILE} &> /tmp/techsupport_cleanup.log & | ||
|
||
echo ${TARFILE} | ||
|
||
if ! $SAVE_STDERR | ||
then | ||
|
@@ -1494,7 +1496,6 @@ while getopts ":xnvhzas:t:r:d" opt; do | |
;; | ||
v) | ||
# echo commands about to be run to stderr | ||
set -v | ||
V="-v" | ||
;; | ||
n) | ||
|
@@ -1547,14 +1548,17 @@ fi | |
## Attempt Locking | ||
## | ||
|
||
if mkdir "${LOCKDIR}" &>/dev/null; then | ||
if $MKDIR "${LOCKDIR}" &>/dev/null; then | ||
trap 'handle_exit' EXIT | ||
echo "$$" > "${PIDFILE}" | ||
# This handler will exit the script upon receiving these interrupts | ||
# Trap configured on EXIT will be triggered by the exit from handle_signal function | ||
trap 'handle_signal' SIGINT SIGHUP SIGQUIT SIGTERM | ||
echo "Lock succesfully accquired and installed signal handlers" | ||
# Proceed with the actual code | ||
if [[ ! -z "${V}" ]]; then | ||
set -v | ||
fi | ||
main | ||
else | ||
# lock failed, check if the other PID is alive | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,8 +11,9 @@ | |
"CORE_DUMP_DIR", "CORE_DUMP_PTRN", "TS_DIR", "TS_PTRN", | ||
"CFG_DB", "AUTO_TS", "CFG_STATE", "CFG_MAX_TS", "COOLOFF", | ||
"CFG_CORE_USAGE", "CFG_SINCE", "FEATURE", "STATE_DB", | ||
"TS_MAP", "CORE_DUMP", "TIMESTAMP", "CONTAINER", | ||
"TIME_BUF", "SINCE_DEFAULT", "TS_PTRN_GLOB" | ||
"TS_MAP", "CORE_DUMP", "TIMESTAMP", "CONTAINER", "TIME_BUF", | ||
"SINCE_DEFAULT", "TS_PTRN_GLOB", "EXT_LOCKFAIL", "EXT_RETRY", | ||
"EXT_SUCCESS", "MAX_RETRY_LIMIT" | ||
] + [ # Methods | ||
"verify_recent_file_creation", | ||
"get_ts_dumps", | ||
|
@@ -60,6 +61,11 @@ | |
TIME_BUF = 20 | ||
SINCE_DEFAULT = "2 days ago" | ||
|
||
# Techsupport Exit Codes | ||
EXT_LOCKFAIL = 2 | ||
EXT_RETRY = 4 | ||
EXT_SUCCESS = 0 | ||
MAX_RETRY_LIMIT = 2 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is MAX_RETRY_LIMIT configurable? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. EXT_RETRY happening more than one time for a single process is even more unlikely and thus a MAX_RETRY_LIMIT need not be configurable. |
||
|
||
# Helper methods | ||
def subprocess_exec(cmd, env=None): | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should there be a gap of few seconds before next retry?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not required, EXT_RETRY happening is less likely and response should be quick in order to grab the lock. so i don't think a gap is required.
I'll remove the print statement though