openstack/devstack
Code Issues Proposed changes

Handle pcp-dstat transition

Browse Source 
dstat is Python 2, never going to be updated and effectively
abandonded.  The replacement is pcp-dstat [1] which is mostly
compatible, with a few differences.  As distro start transitioning
(Fedora has), just drop the unsupported args for now.

[1] https://pcp.io/man/man1/pcp-dstat.1.html

Change-Id: Ibec8a37cb18a14656d97e2096c66bc8b21406068
This commit is contained in:
Ian Wienand 2019-02-11 13:35:43 +11:00 committed by Clark Boylan
parent 8213d7c039
commit 1124a05571
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/dstat.sh
View File

@ -12,8 +12,17 @@
# Retrieve log directory as argument from calling script. # Retrieve log directory as argument from calling script.
LOGDIR=$1 LOGDIR=$1
DSTAT_TOP_OPTS="--top-cpu-adv --top-io-adv --top-mem"
if dstat --version | grep -q 'pcp-dstat' ; then
# dstat is unmaintained, and moving to a plugin of performance
# co-pilot. Fedora 29 for example has rolled this out. It's
# mostly compatible, except for a few options which are not
# implemented (yet?)
DSTAT_TOP_OPTS=""
fi
# Command line arguments for primary DStat process. # Command line arguments for primary DStat process.
DSTAT_OPTS="-tcmndrylpg --top-cpu-adv --top-io-adv --top-mem --swap --tcp" DSTAT_OPTS="-tcmndrylpg ${DSTAT_TOP_OPTS} --swap --tcp"
# Command-line arguments for secondary background DStat process. # Command-line arguments for secondary background DStat process.
DSTAT_CSV_OPTS="-tcmndrylpg --tcp --output $LOGDIR/dstat-csv.log" DSTAT_CSV_OPTS="-tcmndrylpg --tcp --output $LOGDIR/dstat-csv.log"