File tree 1 file changed +3
-2
lines changed
1 file changed +3
-2
lines changed Original file line number Diff line number Diff line change @@ -43,6 +43,7 @@ declare -x SSH_OPTARGS="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/n
43
43
declare -x PROVISIONED_D=common/._state/provisioned
44
44
declare -x SAVELOGS_D=${IAM} .${TSTAMP} .d
45
45
declare -x TMPDIR
46
+ declare -x LOGROTATE_CONF=/etc/logrotate.conf
46
47
47
48
if [ -n " ${TMPDIR} " ] ; then
48
49
if [ -d ${TMPDIR} ] ; then
@@ -70,7 +71,7 @@ SaveLogs() {
70
71
export DB_HOST=${any_up: 0: 2} db
71
72
72
73
Rc ErrExit ${EX_CONFIG} " ping -c 1 -i 1 -n -q -w 1 ${_h} "
73
- Rc ErrExit ${EX_CONFIG } " ssh ${SSH_OPTARGS} ${_h} /bin/true "
74
+ Rc ErrExit ${EX_OSFILE } " ssh ${SSH_OPTARGS} ${_h} sudo -n sh -c \" /usr/sbin/logrotate --force ${LOGROTATE_CONF} ; exit 0 \" "
74
75
Rc ErrExit ${EX_CONFIG} " mkdir -p ${TMPDIR} /${_h} "
75
76
76
77
LOGDIRS=( ${LOGDIRS} )
@@ -100,7 +101,7 @@ SaveDB() {
100
101
Rc ErrExit ${EX_CONFIG} " ssh ${SSH_OPTARGS} ${_h} /bin/true"
101
102
Rc ErrExit ${EX_CONFIG} " mkdir -p ${TMPDIR} /${_h} "
102
103
# Assumes: invoking user has password-less sudo enabled in-cluster
103
- MYSQLPASS=$( echo $( ssh -q ${SSH_OPTARGS} ${_h} sudo grep StoragePass= ${SLURMDBDCONF} ) | sed ' s/StoragePass=//' )
104
+ MYSQLPASS=$( echo $( ssh -q ${SSH_OPTARGS} ${_h} sudo -n grep StoragePass= ${SLURMDBDCONF} ) | sed ' s/StoragePass=//' )
104
105
if [ -z " ${MYSQLPASS} " ] ; then
105
106
ErrExit ${EX_SOFTWARE} " Warning: slurmdb password empty, expect a broken, incomplete or empty db dump."
106
107
fi
You can’t perform that action at this time.
0 commit comments