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

PT-80 WIP

Browse Source
This commit is contained in:
Carlos Salguero
2017-03-22 12:05:33 -03:00
parent b0faf8fcc5
commit 41775e5f50
2 changed files with 81 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
bin/pt-stalk
View File

@@ -832,7 +832,6 @@ collect() {
log "Could not find the MySQL error log" log "Could not find the MySQL error log"
fi fi
slave_status "$d/$p-slave-status" $mysql_version
if [ "${mysql_version}" '>' "5.1" ]; then if [ "${mysql_version}" '>' "5.1" ]; then
local mutex="SHOW ENGINE INNODB MUTEX" local mutex="SHOW ENGINE INNODB MUTEX"
@@ -948,6 +947,15 @@ collect() {
(echo $ts; transactions) >>"$d/$p-transactions" & (echo $ts; transactions) >>"$d/$p-transactions" &
fi fi
<<<<<<< Updated upstream
=======
if [ $ps_instrumentation_enabled == "yes" ]; then
ps_locks_transactions "$d/$p-ps-locks-transactions"
fi
slave_status "$d/$p-slave-status" $mysql_version
>>>>>>> Stashed changes
curr_time=$(date +'%s') curr_time=$(date +'%s')
done done
log "Loop end: $(date +'TS %s.%N %F %T')" log "Loop end: $(date +'TS %s.%N %F %T')"
@@ -1119,6 +1127,38 @@ slave_status() {
} }
slave_status() {
local outfile=$1
local mysql_version=$2
if [ "${mysql_version}" '<' "5.7" ]; then
echo "MySQL < 5.7 detected"
local status="SHOW SLAVE STATUS\G"
$CMD_MYSQL $EXT_ARGV -e "$status" >> $outfile
else
local status="
SELECT *
FROM performance_schema.replication_connection_configuration
JOIN performance_schema.replication_applier_configuration
USING (channel_name)\G"
echo -e "\n$status\n" >> $outfile
$CMD_MYSQL $EXT_ARGV -e "$status" >> $outfile
local status="SELECT *
FROM replication_connection_status\G"
echo -e "\n$status\n" >> $outfile
$CMD_MYSQL $EXT_ARGV -e "$status" >> $outfile
local status="SELECT *
FROM replication_applier_status
JOIN replication_applier_status_by_coordinator
USING (channel_name)\G"
echo -e "\n$status\n" >> $outfile
$CMD_MYSQL $EXT_ARGV -e "$status" >> $outfile
fi
}
# ########################################################################### # ###########################################################################
# End collect package # End collect package
# ########################################################################### # ###########################################################################

40
lib/bash/collect.sh
View File

@@ -242,6 +242,12 @@ collect() {
(echo $ts; transactions) >>"$d/$p-transactions" & (echo $ts; transactions) >>"$d/$p-transactions" &
fi fi
if [ $ps_instrumentation_enabled == "yes" ]; then
ps_locks_transactions "$d/$p-ps-locks-transactions"
fi
slave_status "$d/$p-slave-status" $mysql_version
curr_time=$(date +'%s') curr_time=$(date +'%s')
done done
log "Loop end: $(date +'TS %s.%N %F %T')" log "Loop end: $(date +'TS %s.%N %F %T')"
@@ -425,6 +431,40 @@ slave_status() {
} }
slave_status() {
local outfile=$1
local mysql_version=$2
if [ "${mysql_version}" '<' "5.7" ]; then
echo "MySQL < 5.7 detected"
local status="SHOW SLAVE STATUS\G"
$CMD_MYSQL $EXT_ARGV -e "$status" >> $outfile
else
local status="
SELECT *
FROM performance_schema.replication_connection_configuration
JOIN performance_schema.replication_applier_configuration
USING (channel_name)\G"
echo -e "\n$status\n" >> $outfile
$CMD_MYSQL $EXT_ARGV -e "$status" >> $outfile
local status="
SELECT *
FROM replication_connection_status\G"
echo -e "\n$status\n" >> $outfile
$CMD_MYSQL $EXT_ARGV -e "$status" >> $outfile
local status="
SELECT *
FROM replication_applier_status
JOIN replication_applier_status_by_coordinator
USING (channel_name)\G"
echo -e "\n$status\n" >> $outfile
$CMD_MYSQL $EXT_ARGV -e "$status" >> $outfile
fi
}
# ########################################################################### # ###########################################################################
# End collect package # End collect package
# ########################################################################### # ###########################################################################