openstack/swift
Code Issues Proposed changes

few fixes to temp cronjob

Browse Source
This commit is contained in:
Florian Hines 2011-07-27 22:29:23 -05:00
parent aa622eb799
commit 749892338b
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bin/swift-recon-cron
View File

@ -6,19 +6,20 @@
# of high async pendings when the find takes a while. # of high async pendings when the find takes a while.
#todo: everything. #todo: everything.
SYSLOG_FACILITY="local0.error" SYSLOG_FACILITY="local2"
ASYNC_PATH="/srv/node/sd[a-z]/async_pending/" ASYNC_PATH="/srv/node/sd[a-z]/async_pending/"
RECON_CACHE_PATH="/var/cache/swift/object.recon" RECON_CACHE_PATH="/var/cache/swift"
LOCKFILE="/var/lock/swift-recon-object.lock" LOCKFILE="/var/lock/swift-recon-object.lock"
if [ -e $LOCKFILE ]; then if [ -e $LOCKFILE ]; then
echo "NOTICE - $0 lock present - cron jobs overlapping ?" echo "NOTICE - $0 lock present - cron jobs overlapping ?"
echo "$0 lock file present" | /usr/bin/logger -p $SYSLOG_FACILITY echo "$0 lock file present" | /usr/bin/logger -p $SYSLOG_FACILITY.err
exit 1 exit 1
else else
touch $LOCKFILE touch $LOCKFILE
fi fi
if [ -z "$1" ]; then if [ -z "$1" ]; then
LOGFILE="/var/log/swift/storage.log" LOGFILE="/var/log/swift/storage.log"
else else
@ -26,11 +27,15 @@ else
fi fi
if [ ! -r "$LOGFILE" ]; then if [ ! -r "$LOGFILE" ]; then
echo "$0: error $LOGFILE not readable" | /usr/bin/logger -p $SYSLOG_FACILITY echo "$0: error $LOGFILE not readable" | /usr/bin/logger -p $SYSLOG_FACILITY.err
rm $LOCKFILE rm $LOCKFILE
exit 1 exit 1
fi fi
if [ ! -d "$RECON_CACHE_PATH" ]; then
mkdir $RECON_CACHE_PATH
fi
TMPF=`/bin/mktemp` TMPF=`/bin/mktemp`
asyncs=$(find $ASYNC_PATH -type f 2> /dev/null| wc -l) asyncs=$(find $ASYNC_PATH -type f 2> /dev/null| wc -l)
@ -41,6 +46,11 @@ objincoming=$(netstat -aln | egrep "tcp.*:6000.*:.*ESTABLISHED" -c)
echo "{\"async_pending\":$asyncs, \"object_replication_time\":$objrep, \"object_established_conns\":$objincoming}" > $TMPF echo "{\"async_pending\":$asyncs, \"object_replication_time\":$objrep, \"object_established_conns\":$objincoming}" > $TMPF
mv $TMPF $RECON_CACHE_PATH mv $TMPF $RECON_CACHE_PATH/object.recon
if [ $? -ne 0 ]; then
echo "$0: $TMPF rename failed" | /usr/bin/logger -p $SYSLOG_FACILITY.err
rm -f $TMPF $LOCKFILE
exit 1
fi
rm -f $TMPF $LOCKFILE rm -f $TMPF $LOCKFILE
exit 0 exit 0