Merge branch 'release-v3.6.0' of github.com:percona/percona-toolkit into release-v3.6.0

config/scripts/pt_builder.sh

@@ -155,11 +155,11 @@ get_system(){
 }
 
 install_go() {
-    wget --no-check-certificate http://jenkins.percona.com/downloads/golang/go1.9.4.linux-amd64.tar.gz -O /tmp/golang1.9.4.tar.gz
-    tar --transform=s,go,go1.9, -zxf /tmp/golang1.9.4.tar.gz
-    rm -rf /usr/local/go /usr/local/go1.8 /usr/local/go1.9
-    mv go1.9 /usr/local/
-    ln -s /usr/local/go1.9 /usr/local/go
+    #wget --no-check-certificate http://jenkins.percona.com/downloads/golang/go1.9.4.linux-amd64.tar.gz -O /tmp/golang1.9.4.tar.gz
+    #tar --transform=s,go,go1.9, -zxf /tmp/golang1.9.4.tar.gz
+    #rm -rf /usr/local/go /usr/local/go1.8 /usr/local/go1.9
+    #mv go1.9 /usr/local/
+    #ln -s /usr/local/go1.9 /usr/local/go
     GO_VERSION=1.21.5
     wget --progress=dot:giga https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz -O /tmp/golang.tar.gz
     tar -C /usr/local -xzf /tmp/golang.tar.gz

lib/bash/alt_cmds.sh

@@ -39,7 +39,7 @@ _pidof() {
 _lsof() {
    local pid="$1"
    if ! lsof -p $pid 2>/dev/null; then
-      /bin/ls -l /proc/$pid/fd 2>/dev/null
+      /bin/ls -l /proc/$pid/fd 2>/tmp/lsof_test #/dev/null
    fi
 }
 

lib/bash/collect.sh

@@ -122,7 +122,10 @@ collect_mysql_data_one() {
    # Get pidof mysqld.
    if [ ! "$OPT_MYSQL_ONLY" ]; then
       port=$($CMD_MYSQL $EXT_ARGV -ss -e 'SELECT @@port')
-      mysqld_pid=$(lsof -i ":${port}" | grep -i listen | cut -f 3 -d" ")
+      mysqld_pid=$(lsof -i ":${port}" | grep -i listen | tr -s ' ' | cut -f 2 -d" ")
+      echo "MySQL PID: $mysqld_pid" > /tmp/mysql_pid_lsof
+      lsof_pid=$(lsof -i ":${port}")
+      echo "lsof for MySQl PID: $lsof_pid" >> /tmp/mysql_pid_lsof
    fi
 
    # Get memory allocation info before anything else.

t/lib/bash/collect.sh

@@ -77,7 +77,8 @@ cmd_ok \
 
 if [ "$(which lsof 2>/dev/null)" ]; then
    wait_for_files "$p-lsof"
-      echo $(lsof -i ":${port}")
+   cat /tmp/lsof_test
+   cat /tmp/mysql_pid_lsof
    cmd_ok \
       "grep -q 'COMMAND[ ]\+PID[ ]\+USER' $p-lsof" \
       "lsof"