openstack/devstack
Code Issues Proposed changes

don't check for service enabled

Browse Source 
service enabled is something that's not required for sysstat and
friends, because instead we actually can do this with screen_it.

Change-Id: I4aa5787101cb0def46690f38a7f82effbb85f502
This commit is contained in:
Sean Dague 2014-02-11 17:28:56 -05:00 committed by Gerrit Code Review
parent 4df996bcc6
commit f1eb0475d9
1 changed files with 23 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
stack.sh
View File

@ -863,42 +863,36 @@ fi
init_service_check
# Sysstat
# Sysstat and friends
# -------
# If enabled, systat has to start early to track OpenStack service startup.
if is_service_enabled sysstat; then
# what we want to measure
# -u : cpu statitics
# -q : load
# -b : io load rates
# -w : process creation and context switch rates
SYSSTAT_OPTS="-u -q -b -w"
if [[ -n ${SCREEN_LOGDIR} ]]; then
screen_it sysstat "cd $TOP_DIR; ./tools/sar_filter.py $SYSSTAT_OPTS -o $SCREEN_LOGDIR/$SYSSTAT_FILE $SYSSTAT_INTERVAL"
else
screen_it sysstat "./tools/sar_filter.py $SYSSTAT_OPTS $SYSSTAT_INTERVAL"
fi
# what we want to measure
# -u : cpu statitics
# -q : load
# -b : io load rates
# -w : process creation and context switch rates
SYSSTAT_OPTS="-u -q -b -w"
if [[ -n ${SCREEN_LOGDIR} ]]; then
screen_it sysstat "cd $TOP_DIR; ./tools/sar_filter.py $SYSSTAT_OPTS -o $SCREEN_LOGDIR/$SYSSTAT_FILE $SYSSTAT_INTERVAL"
else
screen_it sysstat "./tools/sar_filter.py $SYSSTAT_OPTS $SYSSTAT_INTERVAL"
fi
if is_service_enabled dstat; then
# Per-process stats
DSTAT_OPTS="-tcndylp --top-cpu-adv"
if [[ -n ${SCREEN_LOGDIR} ]]; then
screen_it dstat "cd $TOP_DIR; dstat $DSTAT_OPTS | tee $SCREEN_LOGDIR/$DSTAT_FILE"
else
screen_it dstat "dstat $DSTAT_OPTS"
fi
# A better kind of sysstat, with the top process per time slice
DSTAT_OPTS="-tcndylp --top-cpu-adv"
if [[ -n ${SCREEN_LOGDIR} ]]; then
screen_it dstat "cd $TOP_DIR; dstat $DSTAT_OPTS | tee $SCREEN_LOGDIR/$DSTAT_FILE"
else
screen_it dstat "dstat $DSTAT_OPTS"
fi
if is_service_enabled pidstat; then
# Per-process stats
PIDSTAT_OPTS="-l -p ALL -T ALL"
if [[ -n ${SCREEN_LOGDIR} ]]; then
screen_it pidstat "cd $TOP_DIR; pidstat $PIDSTAT_OPTS $PIDSTAT_INTERVAL > $SCREEN_LOGDIR/$PIDSTAT_FILE"
else
screen_it pidstat "pidstat $PIDSTAT_OPTS $PIDSTAT_INTERVAL"
fi
# Per-process stats
PIDSTAT_OPTS="-l -p ALL -T ALL"
if [[ -n ${SCREEN_LOGDIR} ]]; then
screen_it pidstat "cd $TOP_DIR; pidstat $PIDSTAT_OPTS $PIDSTAT_INTERVAL > $SCREEN_LOGDIR/$PIDSTAT_FILE"
else
screen_it pidstat "pidstat $PIDSTAT_OPTS $PIDSTAT_INTERVAL"
fi