Merge branch 'release-3.3.2' into PT-7116

Don't manage the error, just bubble it up.
The client must know there was an error, even when the error is no
'real' like in Mongos instances (there is no error because there is no
replicaset for mongos or standalone)

bin/pt-mysql-summary

@@ -2280,12 +2280,14 @@ report_jemalloc_enabled() {
   done
 
   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"
-     fi
+     for pid in $(pidof mysqld); do
+         JEMALLOC_LOCATION=$(strings /proc/${pid}/environ | grep jemalloc)
+         if [ -z "$JEMALLOC_LOCATION" ]; then
+           echo "Jemalloc library for process ${pid} not found"
+         else
+           echo "Process with PID ${pid} is using jemalloc from $JEMALLOC_LOCATION"
+         fi
+     done
   fi
 
 }

bin/pt-stalk

@@ -822,7 +822,7 @@ collect() {
 
    local mysql_version="$(awk '/^version[^_]/{print substr($2,1,3)}' "$d/$p-variables")"
 
-   local mysql_error_log="$(awk '/^log_error /{print $2}' "$d/$p-variables")"
+   local mysql_error_log="$(awk '/^log_error/{print $2}' "$d/$p-variables")"
    if [ -z "$mysql_error_log" -a "$mysqld_pid" ]; then
       mysql_error_log="$(ls -l /proc/$mysqld_pid/fd | awk '/ 2 ->/{print $NF}')"
    fi
@@ -833,10 +833,10 @@ collect() {
       tail -f "$mysql_error_log" >"$d/$p-log_error" &
       tail_error_log_pid=$!
 
-      $CMD_MYSQLADMIN $EXT_ARGV
+      $CMD_MYSQLADMIN $EXT_ARGV debug
    else
       log "Could not find the MySQL error log"
-   fi
+   fi 
    if [ "${mysql_version}" '>' "5.1" ]; then
       local mutex="SHOW ENGINE INNODB MUTEX"
    else
@@ -869,12 +869,7 @@ collect() {
       local strace_pid=$!
    fi
 
-   local cnt=$(($OPT_RUN_TIME / $OPT_SLEEP_COLLECT))
-
-   $CMD_MYSQLADMIN $EXT_ARGV ext -i$OPT_SLEEP_COLLECT -c$cnt >>"$d/$p-mysqladmin" &
-   local mysqladmin_pid=$!
-
-   if [ ! "$OPT_MYSQL_ONLY" ]; then
+   if [ ! "$OPT_MYSQL_ONLY" ]; then 
       ps -eaF  >> "$d/$p-ps"  &
       top -bn${OPT_RUN_TIME} >> "$d/$p-top" &
 
@@ -887,9 +882,10 @@ collect() {
       if [ "$CMD_DMESG" ]; then
          local UPTIME=`cat /proc/uptime | awk '{ print $1 }'`
          local START_TIME=$(echo "$UPTIME 60" | awk '{print ($1 - $2)}')
-         $CMD_DMESG  | perl -ne 'm/\[\s*(\d+)\./; if ($1 > '${START_TIME}') { print }' >> "$d/$p-dmesg" &
+         $CMD_DMESG  | perl -ne 'm/\[\s*(\d+)\./; if ($1 > '${START_TIME}') { print }' >> "$d/$p-dmesg" & 
       fi
 
+      local cnt=$(($OPT_RUN_TIME / $OPT_SLEEP_COLLECT))
       if [ "$CMD_VMSTAT" ]; then
          $CMD_VMSTAT $OPT_SLEEP_COLLECT $cnt >> "$d/$p-vmstat" &
          $CMD_VMSTAT $OPT_RUN_TIME 2 >> "$d/$p-vmstat-overall" &
@@ -902,7 +898,10 @@ collect() {
          $CMD_MPSTAT -P ALL $OPT_SLEEP_COLLECT $cnt >> "$d/$p-mpstat" &
          $CMD_MPSTAT -P ALL $OPT_RUN_TIME 1 >> "$d/$p-mpstat-overall" &
       fi
-   fi
+
+      $CMD_MYSQLADMIN $EXT_ARGV ext -i$OPT_SLEEP_COLLECT -c$cnt >>"$d/$p-mysqladmin" &
+      local mysqladmin_pid=$!
+   fi 
 
    local have_lock_waits_table=""
    $CMD_MYSQL $EXT_ARGV -e "SHOW TABLES FROM INFORMATION_SCHEMA" \
@@ -917,7 +916,7 @@ collect() {
    local ps_instrumentation_enabled=$($CMD_MYSQL $EXT_ARGV -e 'SELECT ENABLED FROM performance_schema.setup_instruments WHERE NAME = "transaction";' \
                                       | sed "2q;d" | sed 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/')
 
-   if [ !$ps_instrumentation_enabled = "yes" ]; then
+   if [ $ps_instrumentation_enabled != "yes" ]; then
       log "Performance Schema instrumentation is disabled"
    fi
 
@@ -956,12 +955,12 @@ collect() {
          (echo $ts; df -k) >> "$d/$p-df" &
          (echo $ts; netstat -antp) >> "$d/$p-netstat"   &
          (echo $ts; netstat -s)    >> "$d/$p-netstat_s" &
-     fi
-      ($CMD_MYSQL $EXT_ARGV -e "SHOW FULL PROCESSLIST\G") \
+      fi
+      (echo $ts; $CMD_MYSQL $EXT_ARGV -e "SHOW FULL PROCESSLIST\G") \
          >> "$d/$p-processlist" &
       if [ "$have_lock_waits_table" ]; then
-         (lock_waits)   >>"$d/$p-lock-waits" &
-         (transactions) >>"$d/$p-transactions" &
+         (echo $ts; lock_waits)   >>"$d/$p-lock-waits" &
+         (echo $ts; transactions) >>"$d/$p-transactions" &
       fi
 
       if [ "${mysql_version}" '>' "5.6" ] && [ $ps_instrumentation_enabled == "yes" ]; then
@@ -969,10 +968,10 @@ collect() {
       fi
 
       if [ "${mysql_version}" '>' "5.6" ]; then
-         (ps_prepared_statements) >> "$d/$p-prepared-statements" &
+         (echo $ts; ps_prepared_statements) >> "$d/$p-prepared-statements" &
       fi
 
-      slave_status "$d/$p-slave-status" "${mysql_version}"
+      slave_status "$d/$p-slave-status" "${mysql_version}" 
 
       curr_time=$(date +'%s')
    done
@@ -1077,7 +1076,7 @@ lock_waits() {
    LEFT JOIN INFORMATION_SCHEMA.PROCESSLIST AS p ON p.id = b.trx_mysql_thread_id
    ORDER BY wait_time DESC\G"
    $CMD_MYSQL $EXT_ARGV -e "$sql2"
-}
+} 
 
 transactions() {
    $CMD_MYSQL $EXT_ARGV -e "SELECT SQL_NO_CACHE * FROM INFORMATION_SCHEMA.INNODB_TRX ORDER BY trx_id\G"
@@ -1126,8 +1125,8 @@ rocksdb_status() {
 }
 
 ps_locks_transactions() {
-   local outfile=$1
-
+   local outfile=$1 
+   
    $CMD_MYSQL $EXT_ARGV -e 'select @@performance_schema' | grep "1" &>/dev/null
 
    if [ $? -eq 0 ]; then
@@ -1163,27 +1162,28 @@ slave_status() {
    local outfile=$1
    local mysql_version=$2
 
-   local sql="SHOW SLAVE STATUS\G"
-   echo -e "\n$sql\n" >> $outfile
-   $CMD_MYSQL $EXT_ARGV -e "$sql" >> $outfile
-   if [ "${mysql_version}" '>' "5.6" ]; then
+   if [ "${mysql_version}" '<' "5.7" ]; then
+      local sql="SHOW SLAVE STATUS\G"  
+      echo -e "\n$sql\n" >> $outfile
+      $CMD_MYSQL $EXT_ARGV -e "$sql" >> $outfile
+   else
       local sql="SELECT * FROM performance_schema.replication_connection_configuration JOIN performance_schema.replication_applier_configuration USING(channel_name)\G"
       echo -e "\n$sql\n" >> $outfile
       $CMD_MYSQL $EXT_ARGV -e "$sql" >> $outfile
 
-      sql="SELECT * FROM performance_schema.replication_connection_status\G"
+      sql="SELECT * FROM replication_connection_status\G"
       echo -e "\n$sql\n" >> $outfile
       $CMD_MYSQL $EXT_ARGV -e "$sql" >> $outfile
 
-      sql="SELECT * FROM performance_schema.replication_applier_status JOIN performance_schema.replication_applier_status_by_coordinator USING(channel_name)\G"
+      sql="SELECT * FROM replication_applier_status JOIN replication_applier_status_by_coordinator USING(channel_name)\G"
       echo -e "\n$sql\n" >> $outfile
       $CMD_MYSQL $EXT_ARGV -e "$sql" >> $outfile
    fi
+
 }
 
-
 collect_mysql_variables() {
-   local outfile=$1
+   local outfile=$1 
 
    local sql="SHOW GLOBAL VARIABLES"
    echo -e "\n$sql\n" >> $outfile
@@ -1192,11 +1192,11 @@ collect_mysql_variables() {
    sql="select * from performance_schema.variables_by_thread order by thread_id, variable_name;"
    echo -e "\n$sql\n" >> $outfile
    $CMD_MYSQL $EXT_ARGV -e "$sql" >> $outfile
-
+   
    sql="select * from performance_schema.user_variables_by_thread order by thread_id, variable_name;"
    echo -e "\n$sql\n" >> $outfile
    $CMD_MYSQL $EXT_ARGV -e "$sql" >> $outfile
-
+   
    sql="select * from performance_schema.status_by_thread order by thread_id, variable_name; "
    echo -e "\n$sql\n" >> $outfile
    $CMD_MYSQL $EXT_ARGV -e "$sql" >> $outfile

lib/bash/collect.sh

@@ -52,7 +52,8 @@ collect() {
    local mysqld_pid=""
    # Get pidof mysqld.
    if [ ! "$OPT_MYSQL_ONLY" ]; then
-      mysqld_pid=$(_pidof mysqld | awk '{print $1; exit;}')
+      port=$(mysql -ss -e 'SELECT @@port')
+      mysqld_pid=$(lsof -i ":${port}" | grep -i listen | cut -f 3 -d" ")
    fi
 
    # Get memory allocation info before anything else.

src/go/mongolib/util/util.go

@@ -480,9 +480,6 @@ func MyState(ctx context.Context, client *mongo.Client) (int, error) {
 	var ms proto.MyState
 
 	err := client.Database("admin").RunCommand(ctx, bson.M{"getDiagnosticData": 1}).Decode(&ms)
-	if _, ok := err.(topology.ServerSelectionError); ok {
-		return 0, nil
-	}
 	if err != nil {
 		return 0, err
 	}

t/pt-mysql-summary/samples/expected_output_temp_enc006.txt

@@ -201,19 +201,6 @@ wsrep_cluster_size                          100
       HandlerSocket NoSQL | Not Supported
            Fast Hash UDFs | Unknown
 # Percona XtraDB Cluster #####################################
-             Cluster Name | pt_sandbox_cluster
-          Cluster Address | gcomm://
-             Cluster Size | 3
-            Cluster Nodes | 192.168.0.100,192.168.0.100,192.168.0.100
-                Node Name | 12345
-              Node Status | Primary
-               SST Method | rsync
-            Slave Threads | 2
-       Ignore Split Brain | false
-            Ignore Quorum | false
-              gcache Size | 128M
-         gcache Directory | /tmp/12345/data/
-              gcache Name | /tmp/12345/data//galera.cache
 # Plugins ####################################################
        InnoDB compression | ACTIVE
 # Query cache ################################################

t/pt-mysql-summary/samples/expected_output_temp_enc007.txt

@@ -167,7 +167,6 @@ wsrep_local_index                   4000000000000    45000000
       HandlerSocket NoSQL | Not Supported
            Fast Hash UDFs | Unknown
 # Percona XtraDB Cluster #####################################
-                 wsrep_on | OFF
 # Plugins ####################################################
        InnoDB compression | ACTIVE
 # Query cache ################################################