Merge pull request #89 from percona/PMM-2440

PMM-2440: MySQL 8.0.

Author: arvenil

.travis.yml

@@ -20,15 +20,28 @@ env:
     - MYSQL_IMAGE=mysql:5.5
     - MYSQL_IMAGE=mysql:5.6
     - MYSQL_IMAGE=mysql:5.7
+    # github.com/go-sql-driver/mysql doesn't support new default auth plugin in MySQL 8.0.
+    # https://github.com/go-sql-driver/mysql/issues/785
+    # https://github.com/go-sql-driver/mysql/pull/552
+    - MYSQL_IMAGE=mysql:8.0 MYSQL_COMMAND=--default-authentication-plugin=mysql_native_password
     - MYSQL_IMAGE=percona/percona-server:5.6
     - MYSQL_IMAGE=percona/percona-server:5.7
+    # percona:5.5 doesn't pass one test, not really sure why as other 5.5 images work.
+    #- MYSQL_IMAGE=percona:5.5
+    - MYSQL_IMAGE=percona:5.6
+    - MYSQL_IMAGE=percona:5.7
     - MYSQL_IMAGE=mariadb:5.5
     - MYSQL_IMAGE=mariadb:10.0
     - MYSQL_IMAGE=mariadb:10.1
+    # pt-mysql-summary hangs on mariadb:10.2
+    # https://jira.percona.com/browse/PT-1549
+    #- MYSQL_IMAGE=mariadb:10.2
     - MONGODB_IMAGE=mongo:3.2
     - MONGODB_IMAGE=mongo:3.4
+    - MONGODB_IMAGE=mongo:3.6
     - MONGODB_IMAGE=percona/percona-server-mongodb:3.2
     - MONGODB_IMAGE=percona/percona-server-mongodb:3.4
+    - MONGODB_IMAGE=percona/percona-server-mongodb:3.6
 
 matrix:
   include:
@@ -57,12 +70,7 @@ before_script:
   # run docker containers
   - docker-compose up -d
   # wait for MySQL to become available
-  - |
-    until docker-compose exec mysql mysql -u"${MYSQL_USER}" -e 'SELECT 1' > /dev/null; do
-      >&2 echo "MySQL is unavailable - sleeping"
-      sleep 1
-    done
-    >&2 echo "MySQL is up"
+  - ./with_backoff.sh docker-compose exec mysql mysql -u"${MYSQL_USER}" -e 'SELECT 1'
   # log versions
   - docker --version
   - docker-compose --version

docker-compose.yml

@@ -6,9 +6,12 @@ services:
       - ${MYSQL_HOST:-127.0.0.1}:${MYSQL_PORT:-3306}:3306
     environment:
       - MYSQL_ALLOW_EMPTY_PASSWORD=yes
-    # MariaDB >= 10.0.12 doesn't enable Performance Schema by default so we need to do it manually
-    # https://mariadb.com/kb/en/mariadb/performance-schema-overview/#activating-the-performance-schema
-    command: --performance-schema --secure-file-priv=""
+    command:
+      # MariaDB >= 10.0.12 doesn't enable Performance Schema by default so we need to do it manually
+      # https://mariadb.com/kb/en/mariadb/performance-schema-overview/#activating-the-performance-schema
+      - --performance-schema
+      - --secure-file-priv=
+      - ${MYSQL_COMMAND:---verbose}
     volumes:
       - ./test/schema/:/docker-entrypoint-initdb.d/:rw
   mongo:

glide.lock

@@ -21,6 +21,7 @@ import:
   - src/go/mongolib/stats
 - package: github.com/percona/pmgo
 - package: github.com/percona/pmm
+  version: f190773155b8927dee5c0400a6385bbb83a10f44
   subpackages:
   - proto
   - proto/config

glide.yaml

@@ -0,0 +1,10 @@
+version: '3'
+services:
+  mysql:
+    image: mysql:8.0
+    ports:
+      - 127.0.0.1:3306:3306
+    environment:
+      - MYSQL_ALLOW_EMPTY_PASSWORD=yes
+    command:
+      - --default-authentication-plugin=mysql_native_password

m/docker-compose.yml

@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+# Retries a command a configurable number of times with backoff.
+#
+# The retry count is given by ATTEMPTS (default 120), the backoff
+# timeout is given by TIMEOUT in seconds (default 1.)
+#
+# Based on: https://stackoverflow.com/a/8351489/916440
+function with_backoff {
+  local max_attempts=${ATTEMPTS-120}
+  local timeout=${TIMEOUT-1}
+  local attempt=1
+  local exitCode=0
+
+  while (( $attempt < $max_attempts ))
+  do
+    if "$@"
+    then
+      return 0
+    else
+      exitCode=$?
+    fi
+
+    echo "Failure! Retrying in $timeout.." 1>&2
+    sleep $timeout
+    attempt=$(( attempt + 1 ))
+  done
+
+  if [[ $exitCode != 0 ]]
+  then
+    echo "Giving up! ($@)" 1>&2
+  fi
+
+  return $exitCode
+}
+
+with_backoff "$@"

m/with_backoff.sh

@@ -516,7 +516,7 @@ func testRealWorker(t *testing.T, logger *pct.Logger, dsn string) {
 	}
 	var class *event.Class
 	for _, c := range res.Class {
-		if c.Fingerprint == "SELECT ? FROM DUAL " {
+		if c.Fingerprint == "SELECT ? FROM DUAL" {
 			class = c
 			break
 		}

qan/analyzer/mysql/worker/perfschema/perfschema_test.go

@@ -194,6 +194,12 @@ SELECT
 			if err != nil {
 				return // This bubbles up too (see above).
 			}
+
+			// "The Performance Schema could produce DIGEST_TEXT values with a trailing space.
+			// This no longer occurs. (Bug #26908015)"
+			// https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-11.html
+			row.DigestText = strings.TrimSpace(row.DigestText)
+
 			c <- row
 		}
 		if err = rows.Err(); err != nil {

qan/analyzer/mysql/worker/perfschema/worker.go

@@ -700,6 +700,7 @@ func (s *WorkerTestSuite) TestStop(t *C) {
 
 	t.Check(res.Global.TotalQueries, Equals, uint(1))
 	t.Check(res.Class, HasLen, 1)
+	t.Check(err, IsNil)
 }
 
 func (s *WorkerTestSuite) TestResult014(t *C) {

qan/analyzer/mysql/worker/slowlog/slowlog_test.go

@@ -160,7 +160,7 @@ func testGetDefaultsBoolValues(
 							Set: fmt.Sprintf("SET GLOBAL %s=0", keys[i].db),
 						},
 					})
-					require.Nil(t, err)
+					require.NoError(t, err)
 					got := m.GetDefaults(protoInstance.UUID)
 					assert.Equal(t, false, got[keys[i].json])
 
@@ -171,7 +171,7 @@ func testGetDefaultsBoolValues(
 							Set: fmt.Sprintf("SET GLOBAL %s=1", keys[i].db),
 						},
 					})
-					require.Nil(t, err)
+					require.NoError(t, err)
 					got = m.GetDefaults(protoInstance.UUID)
 					assert.Equal(t, true, got[keys[i].json])
 				} else {