percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-02 02:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

PR-160 - added support for operf if present, and if CMD_OPCONTROL is not set

Browse Source 
- Added back support for CMD_OPCONTROL
This commit is contained in:
Sveta Smirnova
2024-01-26 16:39:26 +03:00
parent 5ca0e8a898
commit 3fa1d8dfed
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bin/pt-stalk
View File

@@ -932,12 +932,14 @@ collect_mysql_data_one() {
fi
if [ "$CMD_OPCONTROL" -a "$OPT_COLLECT_OPROFILE" ]; then
if [ $(echo $CMD_OPCONTROL | grep -c opcontrol) -gt 0 ]; then
# use legacy opcontrol
if [ $(echo $CMD_OPCONTROL | grep -cv operf) -gt 0 ]; then
# use legacy or custom opcontrol
if $CMD_OPCONTROL --init; then
$CMD_OPCONTROL --start --no-vmlinux
have_oprofile="yes"
fi
else
have_oprofile="yes"
local tmpfile="$PT_TMPDIR/oprofile"
mkdir "$d/pt_collect_$p"
$CMD_OPCONTROL -p "$mysqld_pid" -d "$d/pt_collect_$p" > "$tmpfile" &
@@ -945,7 +947,6 @@ collect_mysql_data_one() {
OPERF_PID=$(grep -Eo "kill -SIGINT [[:digit:]]+" "$tmpfile" | grep -Eo "[[:digit:]]+")
rm "$tmpfile"
fi
have_oprofile="yes"
elif [ "$CMD_STRACE" -a "$OPT_COLLECT_STRACE" -a "$mysqld_pid" ]; then
$CMD_STRACE -T -s 0 -f -p $mysqld_pid -o "$d/$p-strace" &
local strace_pid=$!
@@ -1068,7 +1069,8 @@ collect_mysql_data_two() {
if [ "$have_oprofile" ]; then
local session="--session-dir=$d/pt_collect_$p"
if [ $(echo $CMD_OPCONTROL | grep -c opcontrol) -gt 0 ]; then
if [ $(echo $CMD_OPCONTROL | grep -cv operf) -gt 0 ]; then
# use legacy or custom opcontrol
$CMD_OPCONTROL --stop
$CMD_OPCONTROL --dump