Proxysql setup (#1377)

* Revert "Setup ProxySQL before each test (#1375)"

This reverts commit 3432c20.

* Make ProxySQLRule wait on startup before connectivity is checked

Also, log ProxySQL output

Signed-off-by: Thomas Segismont <[email protected]>

* Add MySQL Logs

Signed-off-by: Thomas Segismont <[email protected]>

* Prefix MySQL network alias

Signed-off-by: Thomas Segismont <[email protected]>

---------

Signed-off-by: Thomas Segismont <[email protected]>

Author: tsegismont

vertx-mysql-client/src/test/java/io/vertx/mysqlclient/ProxySQLBatchInsertExceptionTest.java

@@ -13,14 +13,14 @@
 
 import io.vertx.ext.unit.junit.VertxUnitRunner;
 import io.vertx.mysqlclient.junit.ProxySQLRule;
-import org.junit.Rule;
+import org.junit.ClassRule;
 import org.junit.runner.RunWith;
 
 @RunWith(VertxUnitRunner.class)
 public class ProxySQLBatchInsertExceptionTest extends MySQLBatchInsertExceptionTestBase {
 
-  @Rule
-  public ProxySQLRule proxySql = new ProxySQLRule(rule);
+  @ClassRule
+  public static ProxySQLRule proxySql = new ProxySQLRule(rule);
 
   @Override
   protected MySQLConnectOptions createOptions() {

vertx-mysql-client/src/test/java/io/vertx/mysqlclient/junit/MySQLRule.java

@@ -77,6 +77,7 @@ private void initServer() throws IOException {
       .withEnv("MYSQL_PASSWORD", "password")
       .withEnv("MYSQL_ROOT_PASSWORD", "password")
       .withEnv("MYSQL_DATABASE", "testschema")
+      .withLogConsumer(of -> System.out.print("[" + databaseServerInfo.databaseType + "] " + of.getUtf8String()))
       .withCreateContainerCmdModifier(createContainerCmd -> {
         createContainerCmd.getHostConfig().withUlimits(new Ulimit[]{new Ulimit("nofile", 262144L, 262144L)});
       })
@@ -107,12 +108,12 @@ private void initServer() throws IOException {
     }
   }
 
-  public String network() {
+  String network() {
     return network != null ? network.getId() : "mysql_default";
   }
 
-  public String networkAlias() {
-    return network != null ? Integer.toHexString(System.identityHashCode(this)) : "test-mysql";
+  String networkAlias() {
+    return network != null ? "test-mysql-" + Integer.toHexString(System.identityHashCode(this)) : "test-mysql";
   }
 
   private static DatabaseType parseDatabaseTypeString(String databaseInfo) throws IllegalArgumentException {

vertx-mysql-client/src/test/java/io/vertx/mysqlclient/junit/ProxySQLRule.java

@@ -2,13 +2,12 @@
 
 import io.vertx.mysqlclient.MySQLConnectOptions;
 import org.junit.rules.ExternalResource;
-import org.testcontainers.containers.Container;
+import org.testcontainers.containers.Container.ExecResult;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 
-import java.util.concurrent.TimeUnit;
-
-import static java.lang.String.*;
+import static java.lang.String.format;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 public class ProxySQLRule extends ExternalResource {
 
@@ -25,6 +24,7 @@ public ProxySQLRule(MySQLRule mySQLRule) {
   @Override
   protected void before() throws Throwable {
     proxySql = new GenericContainer<>("proxysql/proxysql")
+      .withLogConsumer(of -> System.out.print("[ProxySQL] " + of.getUtf8String()))
       .withCreateContainerCmdModifier(createContainerCmd -> {
         createContainerCmd.getHostConfig().withNetworkMode(mySQLRule.network());
       })
@@ -38,6 +38,7 @@ protected void before() throws Throwable {
 
     execStatement(format("UPDATE global_variables SET variable_value='%s' WHERE variable_name='mysql-monitor_username'", MONITORING_USER));
     execStatement(format("UPDATE global_variables SET variable_value='%s' WHERE variable_name='mysql-monitor_password'", MONITORING_USER_PASSWORD));
+    execStatement("UPDATE global_variables SET variable_value='2000' WHERE variable_name IN ('mysql-monitor_connect_interval','mysql-monitor_ping_interval','mysql-monitor_read_only_interval')");
 
     execStatement("LOAD MYSQL VARIABLES TO RUNTIME");
 
@@ -46,24 +47,35 @@ protected void before() throws Throwable {
 
     execStatement(format("INSERT INTO mysql_users (username,password) VALUES ('%s','%s')", mySQLRule.options().getUser(), mySQLRule.options().getPassword()));
     execStatement("LOAD MYSQL USERS TO RUNTIME");
+
+    for (long start = System.currentTimeMillis(); ; ) {
+      ExecResult res = execStatement("SELECT connect_error FROM monitor.mysql_server_connect_log ORDER BY time_start_us LIMIT 1");
+      if (res.getStdout().startsWith("NULL")) {
+        break;
+      }
+      if (System.currentTimeMillis() - start > 30000) {
+        throw new IllegalStateException(String.format("ProxySQL could not connect to backend: %s%n%s", res.getStdout(), res.getStderr()));
+      }
+      MILLISECONDS.sleep(500);
+    }
   }
 
-  private void execStatement(String statement) throws Exception {
-    execStatement(statement, 0);
+  private ExecResult execStatement(String statement) throws Exception {
+    return execStatement(statement, 0);
   }
 
-  private void execStatement(String statement, int retry) throws Exception {
+  private ExecResult execStatement(String statement, int retry) throws Exception {
     RuntimeException failure;
     for (int i = 0; ; i++) {
-      Container.ExecResult result = proxySql.execInContainer("mysql", "-u", "admin", "-p" + "admin", "-h", "127.0.0.1", "-P", "6032", "-e", statement);
+      ExecResult result = proxySql.execInContainer("mysql", "-u", "admin", "-padmin", "-h", "127.0.0.1", "-P", "6032", "-sN", "-e", statement);
       if (result.getExitCode() == 0) {
-        return;
+        return result;
       }
       if (i >= retry && !result.getStderr().contains("ERROR 2002")) {
         failure = new RuntimeException("Failed to execute statement: " + statement + "\n" + result.getStderr());
         break;
       }
-      TimeUnit.MILLISECONDS.sleep(200);
+      MILLISECONDS.sleep(200);
     }
     throw failure;
   }

vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/ProxySQLPreparedBatchTest.java

@@ -14,14 +14,14 @@
 import io.vertx.ext.unit.junit.VertxUnitRunner;
 import io.vertx.mysqlclient.MySQLConnectOptions;
 import io.vertx.mysqlclient.junit.ProxySQLRule;
-import org.junit.Rule;
+import org.junit.ClassRule;
 import org.junit.runner.RunWith;
 
 @RunWith(VertxUnitRunner.class)
 public class ProxySQLPreparedBatchTest extends MySQLPreparedBatchTest {
 
-  @Rule
-  public ProxySQLRule proxySql = new ProxySQLRule(rule);
+  @ClassRule
+  public static ProxySQLRule proxySql = new ProxySQLRule(rule);
 
   @Override
   protected void initConnector() {

vertx-mysql-client/src/test/java/io/vertx/mysqlclient/tck/ProxySQLPreparedQueryTest.java

@@ -14,16 +14,16 @@
 import io.vertx.ext.unit.TestContext;
 import io.vertx.ext.unit.junit.VertxUnitRunner;
 import io.vertx.mysqlclient.junit.ProxySQLRule;
+import org.junit.ClassRule;
 import org.junit.Ignore;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(VertxUnitRunner.class)
 public class ProxySQLPreparedQueryTest extends MySQLPreparedQueryTest {
 
-  @Rule
-  public ProxySQLRule proxySql = new ProxySQLRule(rule);
+  @ClassRule
+  public static ProxySQLRule proxySql = new ProxySQLRule(rule);
 
   @Override
   protected void initConnector() {

vertx-mysql-client/src/test/resources/init.sql

@@ -260,6 +260,6 @@ CREATE TABLE duplicate_test
 INSERT INTO duplicate_test
 VALUES (1);
 
-# testing ProxySQL connectivity
+#Testing ProxySQL connectivity
 CREATE USER 'proxysql'@'%' IDENTIFIED BY 'proxysql1234#';
-GRANT ALL ON *.* TO 'proxysql'@'%';
+GRANT USAGE, REPLICATION CLIENT ON *.* TO 'proxysql'@'%';