percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-10 13:11:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.0' of percona.github.com:percona/percona-toolkit into 3.0

Browse Source
This commit is contained in:
Carlos Salguero
2018-05-17 22:24:35 -03:00
parent d3d2b086c0 91546de432
commit ba5391752e
14 changed files with 33 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
bin/pt-mysql-summary
View File

@@ -2254,24 +2254,19 @@ report_jemalloc_enabled() {
local JEMALLOC_LOCATION=''
for PID in $(pidof mysqld); do
grep -qc jemalloc /proc/${PID}/environ || ldd $(which mysqld) 2>/dev/null | grep -qc jemalloc
JEMALLOC_STATUS=$?
if [ $JEMALLOC_STATUS = 1 ]; then
echo "jemalloc is not enabled in MySQL config for process with ID ${PID}"
grep -qc jemalloc /proc/${pid}/environ || ldd $(which mysqld) 2>/dev/null | grep -qc jemalloc
jemalloc_status=$?
if [ $jemalloc_status = 1 ]; then
echo "jemalloc is not enabled in mysql config for process with id ${pid}"
else
echo "jemalloc enabled in MySQL config for process with ID ${PID}"
echo "jemalloc enabled in mysql config for process with id ${pid}"
GENERAL_JEMALLOC_STATUS=1
fi
done
if [ $GENERAL_JEMALLOC_STATUS = 1 ]; then
for libjemall in "/usr/lib64" "/usr/lib/x86_64-linux-gnu" "/usr/lib"; do
if [ -r "$libjemall/libjemalloc.so.1" ]; then
JEMALLOC_LOCATION="$libjemall/libjemalloc.so.1"
break
fi
done
if [ -z $JEMALLOC_LOCATION ]; then
if [ $GENERAL_JEMALLOC_STATUS -eq 1 ]; then
JEMALLOC_LOCATION=$(find /usr/lib64/ /usr/lib/x86_64-linux-gnu /usr/lib -name "libjemalloc.*" 2>/dev/null | head -n 1)
if [ -z "$JEMALLOC_LOCATION" ]; then
echo "Jemalloc library not found"
else
echo "Using jemalloc from $JEMALLOC_LOCATION"

1
lib/Sandbox.pm
View File

@@ -211,6 +211,7 @@ sub wipe_clean {
$self->wait_for_slaves();
$self->clear_genlogs();
return;
}

23
lib/bash/report_mysql_info.sh
View File

@@ -1256,26 +1256,19 @@ report_jemalloc_enabled() {
local JEMALLOC_LOCATION=''
for PID in $(pidof mysqld); do
grep -qc jemalloc /proc/${PID}/environ || ldd $(which mysqld) 2>/dev/null | grep -qc jemalloc
JEMALLOC_STATUS=$?
if [ $JEMALLOC_STATUS = 1 ]; then
echo "jemalloc is not enabled in MySQL config for process with ID ${PID}"
grep -qc jemalloc /proc/${pid}/environ || ldd $(which mysqld) 2>/dev/null | grep -qc jemalloc
jemalloc_status=$?
if [ $jemalloc_status = 1 ]; then
echo "jemalloc is not enabled in mysql config for process with id ${pid}"
else
echo "jemalloc enabled in MySQL config for process with ID ${PID}"
echo "jemalloc enabled in mysql config for process with id ${pid}"
GENERAL_JEMALLOC_STATUS=1
fi
done
if [ $GENERAL_JEMALLOC_STATUS = 1 ]; then
# Check location for libjemalloc.so.1
#for libjemall in "${SCRIPT_PWD}/lib/mysql" "/usr/lib64" "/usr/lib/x86_64-linux-gnu" "/usr/lib"; do
for libjemall in "/usr/lib64" "/usr/lib/x86_64-linux-gnu" "/usr/lib"; do
if [ -r "$libjemall/libjemalloc.so.1" ]; then
JEMALLOC_LOCATION="$libjemall/libjemalloc.so.1"
break
fi
done
if [ -z $JEMALLOC_LOCATION ]; then
if [ $GENERAL_JEMALLOC_STATUS -eq 1 ]; then
JEMALLOC_LOCATION=$(find /usr/lib64/ /usr/lib/x86_64-linux-gnu /usr/lib -name "libjemalloc.*" 2>/dev/null | head -n 1)
if [ -z "$JEMALLOC_LOCATION" ]; then
echo "Jemalloc library not found"
else
echo "Using jemalloc from $JEMALLOC_LOCATION"

4
sandbox/servers/5.5/my.sandbox.cnf
View File

@@ -24,5 +24,5 @@ report-host = 127.0.0.1
report-port = PORT
log-error = /tmp/PORT/data/mysqld.log
innodb_lock_wait_timeout = 3
#general_log
#general_log_file = genlog
general_log
general_log_file = genlog

4
sandbox/servers/5.6/my.sandbox.cnf
View File

@@ -24,6 +24,6 @@ report-host = 127.0.0.1
report-port = PORT
log-error = /tmp/PORT/data/mysqld.log
innodb_lock_wait_timeout = 3
#general_log
#general_log_file = genlog
general_log
general_log_file = genlog
secure-file-priv =

4
sandbox/servers/5.7/my.sandbox.cnf
View File

@@ -24,8 +24,8 @@ report-host = 127.0.0.1
report-port = PORT
log-error = /tmp/PORT/data/mysqld.log
innodb_lock_wait_timeout = 3
#general_log
#general_log_file = genlog
general_log
general_log_file = genlog
#lower_case_table_names = 0
#slow-query-log = 0
#slow-query-log-file = /tmp/PORT/data/slow.log

6
t/lib/MockSyncStream.t
View File

@@ -173,9 +173,9 @@ SKIP: {
d => $DBD::mysql::VERSION ge '4.001' ? undef : '(7)',
dt => undef,
ts => undef,
c => '(1)',
c2 => '(15)',
v => '(32)',
c => '(3)',
c2 => '(45)',
v => '(96)',
t => undef,
},
},

7
t/lib/Quoter.t
View File

@@ -16,6 +16,7 @@ use Quoter;
use PerconaTest;
use DSNParser;
use Sandbox;
my $dp = new DSNParser(opts=>$dsn_opts);
my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
my $dbh = $sb->get_dbh_for('master');
@@ -173,6 +174,12 @@ SKIP: {
$dbh->do('CREATE DATABASE IF NOT EXISTS serialize_test');
$dbh->do('DROP TABLE IF EXISTS serialize_test.serialize');
$dbh->do('CREATE TABLE serialize_test.serialize (id INT, textval TEXT, blobval BLOB)');
# Ensure we are using lantin1 as the default for the connection
# From the documentation:
# This statement sets the three session system variables character_set_client,
# character_set_connection, and character_set_results to the given character set.
$dbh->do("SET NAMES 'latin1'");
warn Data::Dumper::Dumper($dbh);
my $sth = $dbh->prepare(
"INSERT INTO serialize_test.serialize VALUES (?, ?, ?)"

2
t/pt-mysql-summary/samples/expected_output_temp002.txt
View File

@@ -277,5 +277,3 @@ report-port = 12345
log-error = mysqld.log
innodb_lock_wait_timeout = 3
# Memory management library ##################################
Jemalloc library not found
# The End ####################################################

2
t/pt-mysql-summary/samples/expected_output_temp003.txt
View File

@@ -220,5 +220,3 @@ report-port = 12345
log-error = mysqld.log
innodb_lock_wait_timeout = 3
# Memory management library ##################################
Jemalloc library not found
# The End ####################################################

2
t/pt-mysql-summary/samples/expected_output_temp004.txt
View File

@@ -219,5 +219,3 @@ report-port = 12345
log-error = mysqld.log
innodb_lock_wait_timeout = 3
# Memory management library ##################################
Jemalloc library not found
# The End ####################################################

2
t/pt-mysql-summary/samples/expected_output_temp005.txt
View File

@@ -292,5 +292,3 @@ report-port = 12345
log-error = mysqld.log
innodb_lock_wait_timeout = 3
# Memory management library ##################################
Jemalloc library not found
# The End ####################################################

2
t/pt-mysql-summary/samples/expected_output_temp006.txt
View File

@@ -341,5 +341,3 @@ log_queries_not_using_indexes | OFF
# Configuration File #########################################
Config File | Cannot autodetect or find, giving up
# Memory management library ##################################
Jemalloc library not found
# The End ####################################################

2
t/pt-mysql-summary/samples/expected_output_temp007.txt
View File

@@ -295,5 +295,3 @@ log_queries_not_using_indexes | OFF
# Configuration File #########################################
Config File | Cannot autodetect or find, giving up
# Memory management library ##################################
Jemalloc library not found
# The End ####################################################