add sys user to opt sync command

matrixorigin · Jan 2, 2024 · 9ea8ab8 · 9ea8ab8
1 parent 2a95912
commit 9ea8ab8
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 4 deletions.
diff --git a/lib/mo-tester-1.0-SNAPSHOT.jar b/lib/mo-tester-1.0-SNAPSHOT.jar
diff --git a/mo.yml b/mo.yml
@@ -21,6 +21,8 @@ jdbc:
 user:
   name: "dump"
   password: "111"
+  sysuser: "dump"
+  syspass: "111"
 
 #debug info
 debug:

diff --git a/src/main/java/io/mo/db/ConnectionManager.java b/src/main/java/io/mo/db/ConnectionManager.java
@@ -14,8 +14,13 @@ public class ConnectionManager {
     private static String userName = MoConfUtil.getUserName();
     private static String pwd = MoConfUtil.getUserpwd();
     private static String driver = MoConfUtil.getDriver();
+
+    private static String sysuser = MoConfUtil.getSysUserName();
+    private static String syspass = MoConfUtil.getSyspwd();
 
     private static Connection[] connections = new Connection[COMMON.DEFAULT_CONNECTION_NUM];
+    private static Connection sysconn = null;
+
     private static final Logger LOG = Logger.getLogger(ConnectionManager.class.getName());
     private static boolean server_up = true;
 
@@ -84,6 +89,35 @@ public static Connection getConnection(int index, String userName, String pwd){
         server_up = false;
         return null;
     }
+
+    public static Connection getConnectionForSys(){
+        //if mo server crash,return null;
+        if(!server_up) return null;
+
+        //get db connection,if failed,retry 3 times 10 s interval 
+        for(int i = 0; i < 3; i++) {
+            try {
+                Class.forName(driver);
+                if (sysconn == null || sysconn.isClosed()) {
+                    sysconn = DriverManager.getConnection(jdbcURL, sysuser, syspass);
+                }
+                return sysconn;
+            } catch (SQLException e) {
+                LOG.error("The mo-tester can not get valid conneciton from mo with[user="+userName+", pwd="+pwd+"] for sys user, and will wait 10 seconds and retry...");
+                try {
+                    Thread.sleep(10000);
+                } catch (InterruptedException ex) {
+                    throw new RuntimeException(ex);
+                }
+            } catch (ClassNotFoundException e) {
+                e.printStackTrace();
+            }
+        }
+
+        LOG.error("The mo-tester still can not get valid conneciton from mo for sys user, the following cases wil not be executed!");
+        server_up = false;
+        return null;
+    }
 
     public static void reset(){
         for(int i = 1; i < connections.length;i++){

diff --git a/src/main/java/io/mo/db/Executor.java b/src/main/java/io/mo/db/Executor.java
@@ -112,7 +112,7 @@ public static void run(TestScript script){
                 LOG.debug(String.format("[%s][row:%d][%s]Connection id had been turned from %d to %d",
                         command.getScriptFile(),command.getPosition(),command.getCommand(),
                         last_commit_id,command.getConn_id()));
-                syncCommit(connection);
+                syncCommit();
             }
 
             last_commit_id = command.getConn_id();
@@ -220,8 +220,10 @@ public static void run(TestScript script){
                             LOG.warn(String.format("Failed to close connection[id=%d], but effect nothing.",command.getConn_id()));
                         }
                         connection = getConnection(command);
-                        if(connection != null && !connection.isClosed())
+                        if(connection != null && !connection.isClosed()) {
                             connection.setCatalog(command.getUseDB());
+                            syncCommit();
+                        }
                         continue;
                     }
 
@@ -655,11 +657,16 @@ public static  void dropTestDB(Connection connection,TestScript script){
         dropTestDB(connection,script.getUseDB());
     }
 
-    public static void syncCommit(Connection connection){
+    public static void syncCommit(){
+        Connection connection = ConnectionManager.getConnectionForSys();
+        if(connection == null){
+            LOG.error("select mo_ctl('cn','synccommit','') failed. cause: Can not get invalid connection for sys user.");
+        }
+
         try {
             Statement statement = connection.createStatement();
             statement.execute("select mo_ctl('cn','synccommit','')");
-            LOG.debug("select mo_ctl('cn','synccommit','') successfully.");
+            LOG.info("select mo_ctl('cn','synccommit','') with sys user[" + MoConfUtil.getSysUserName() + "] successfully.");
         } catch (SQLException e) {
             LOG.error("select mo_ctl('cn','synccommit','') failed. cause: " + e.getMessage());
         }

diff --git a/src/main/java/io/mo/util/MoConfUtil.java b/src/main/java/io/mo/util/MoConfUtil.java
@@ -67,6 +67,20 @@ public static String getUserpwd(){
         return user.get("password").toString();
     }
 
+    public static String getSysUserName(){
+        if(conf == null) init();
+
+        Map user = (Map)conf.get("user");
+        return user.get("sysuser").toString();
+    }
+
+    public static String getSyspwd(){
+        if(conf == null) init();
+
+        Map user = (Map)conf.get("user");
+        return user.get("syspass").toString();
+    }
+
     public static String getDefaultDatabase(){
         if(conf == null) init();