[fix][dingo-common] Adjust the DDL timeout to 180 seconds

Author: guojn1

dingo-common/src/main/java/io/dingodb/common/mysql/scope/ScopeVariables.java

@@ -159,10 +159,10 @@ public static int getDingoTrxMaxDigestLength() {
 
     public static long getDdlWaitTimeout() {
         try {
-            String timeoutStr = executorProp.getOrDefault("ddl_timeout", "300000").toString();
+            String timeoutStr = executorProp.getOrDefault("ddl_timeout", "180000").toString();
             return Long.parseLong(timeoutStr);
         } catch (Exception e) {
-            return 300000;
+            return 180000;
         }
     }
 

dingo-executor/src/main/java/io/dingodb/server/executor/ddl/DdlWorker.java

@@ -176,18 +176,13 @@ public Pair<Long, String> handleDDLJobTable(DdlContext dc, DdlJob job) {
             LogUtils.warn(log, "[ddl] job txn rollback done, jobId:{}", job.getId());
             schemaVer = 0;
         }
-        long start = System.currentTimeMillis();
         String error = registerMDLInfo(job, schemaVer);
-        long end = System.currentTimeMillis();
-        DingoMetrics.timer("registerMDLInfo").update((end - start), TimeUnit.MILLISECONDS);
         if (error != null) {
             session.rollback();
             LogUtils.warn(log, "[ddl] registerMdlInfo failed, reason:{}, jobId:{}", error, job.getId());
             return Pair.of(0L, error);
         }
         error = updateDDLJob(job, res.getValue() != null);
-        long sub = System.currentTimeMillis() - start;
-        DingoMetrics.timer("updateDDLJob").update(sub, TimeUnit.MILLISECONDS);
         if (error != null) {
             // session rollback
             session.rollback();
@@ -217,13 +212,20 @@ public static void registerSync(DdlContext dc, DdlJob ddlJob) {
 
     public String registerMDLInfo(DdlJob job, long ver) {
         if (ver == 0) {
+            LogUtils.error(log, "registerMdlInfo error,ver is zero, jobId:{}", job.getId());
             return null;
         }
         String ids = job.job2TableIDs();
-        DingoMetrics.counter("registerMDLInfoNone").inc();
         String sql = "insert into mysql.dingo_mdl_info (job_id, version, table_ids) values (%d, %d, %s)";
         sql = convertSql(String.format(sql, job.getId(), ver, Utils.quoteForSql(ids)));
-        return session.executeUpdate(sql);
+        try {
+            long count = session.executeUpdate1(sql);
+            LogUtils.info(log, "registerMdlInfo done, insert count:{},jobId:{}, ver:{}, ids:{}",
+                count, job.getId(), ver, ids);
+            return null;
+        } catch (Exception e) {
+            return e.getMessage();
+        }
     }
 
     public String updateDDLJob(DdlJob job, boolean error) {

dingo-store-proxy/src/main/java/io/dingodb/store/service/SchemaSyncerService.java

@@ -19,7 +19,6 @@
 import com.google.auto.service.AutoService;
 import io.dingodb.cluster.ClusterService;
 import io.dingodb.common.Location;
-import io.dingodb.common.ddl.ActionType;
 import io.dingodb.common.ddl.DdlUtil;
 import io.dingodb.common.log.LogUtils;
 import io.dingodb.common.store.KeyValue;
@@ -119,7 +118,7 @@ public String ownerCheckAllVersions(long jobId, long latestVer, boolean reorg) {
 
             long end = System.currentTimeMillis();
             long cost = end - start;
-            if (cost > 80000 && !reorg) {
+            if (cost > 50000 && !reorg) {
                 LogUtils.error(log, "[ddl] ownerCheckAllVersions take long time, "
                     + "jobId:{}, latestVer:{}", jobId, latestVer);
                 return "Lock wait timeout exceeded";