merge code and fixed issue #2755 #2756 #2735 #2714 #2711 #2710 #2616 #2602 #2585 #2565 #2935 #2434 #2623 #2418 #2387

Author: agapple

.travis.yml

@@ -1,4 +1,5 @@
 language: java
+sudo: false # faster builds
 
 jdk:
   - oraclejdk12

admin/admin-ui/src/api/canalInstance.js

@@ -59,13 +59,6 @@ export function instanceLog(id, nodeId) {
   })
 }
 
-export function instanceMeta(id, nodeId) {
-  return request({
-    url: '/canal/instance/meta/' + id + '/' + nodeId,
-    method: 'get'
-  })
-}
-
 export function instanceStatus(id, option) {
   return request({
     url: '/canal/instance/status/' + id + '?option=' + option,

admin/admin-ui/src/router/index.js

@@ -128,13 +128,6 @@ export const constantRoutes = [
         component: () => import('@/views/canalServer/CanalInstanceLogDetail'),
         meta: { title: 'Instance 日志' },
         hidden: true
-      },
-      {
-        path: 'canalInstance/meta',
-        name: 'Instance meta',
-        component: () => import('@/views/canalServer/CanalInstanceMetaDetail'),
-        meta: { title: 'Instance Meta' },
-        hidden: true
       }
     ]
   },

admin/admin-ui/src/views/canalServer/CanalInstance.vue

@@ -64,7 +64,6 @@
               <el-dropdown-item @click.native="handleStart(scope.row)">启动</el-dropdown-item>
               <el-dropdown-item @click.native="handleStop(scope.row)">停止</el-dropdown-item>
               <el-dropdown-item @click.native="handleLog(scope.row)">日志</el-dropdown-item>
-              <el-dropdown-item @click.native="handleMeta(scope.row)">meta</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </template>
@@ -118,7 +117,6 @@ export default {
     }
   },
   created() {
-    this.listQuery.name = this.$route.query.name
     getClustersAndServers().then((res) => {
       this.options = res.data
     })
@@ -224,13 +222,6 @@ export default {
         return
       }
       this.$router.push('canalInstance/log?id=' + row.id + '&nodeId=' + row.nodeServer.id)
-    },
-    handleMeta(row) {
-      if (row.nodeId === null) {
-        this.$message({ message: '当前Instance不是启动状态，无法查看meta', type: 'warning' })
-        return
-      }
-      this.$router.push('canalInstance/meta?id=' + row.id + '&nodeId=' + row.nodeServer.id)
     }
   }
 }

admin/admin-ui/src/views/canalServer/CanalInstanceMetaDetail.vue

@@ -128,12 +128,4 @@ public interface AdminConnector {
      */
     String instanceLog(String destination, String fileName, int lines);
 
-    /**
-     * meta
-     * @param destination
-     * @param fileName
-     * @return
-     */
-    String instanceMeta(String destination, String fileName);
-
 }

admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/connector/AdminConnector.java

@@ -206,11 +206,6 @@ public String instanceLog(String destination, String fileName, int lines) {
         return doLogAdmin("instance", "file", destination, fileName, lines);
     }
 
-    @Override
-    public String instanceMeta(final String destination, final String fileName) {
-        return doLogAdmin("meta", "file", destination, fileName,100);
-    }
-
     // ==================== helper method ====================
 
     private String doServerAdmin(String action) {

admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/connector/SimpleAdminConnector.java

@@ -161,20 +161,6 @@ public BaseModel<Map<String, String>> instanceLog(@PathVariable Long id, @PathVa
         return BaseModel.getInstance(canalInstanceConfigService.remoteInstanceLog(id, nodeId));
     }
 
-    /**
-     * 获取实例meta信息
-     *
-     * @param id
-     * @param nodeId
-     * @param env
-     * @return
-     */
-    @GetMapping(value = "/instance/meta/{id}/{nodeId}")
-    public BaseModel<Map<String, String>> meta(@PathVariable Long id, @PathVariable Long nodeId,
-                                               @PathVariable String env) {
-        return BaseModel.getInstance(canalInstanceConfigService.remoteInstanceMeta(id, nodeId));
-    }
-
     /**
      * 通过Server id获取所有活动的Instance
      *

admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/controller/CanalInstanceController.java

@@ -26,8 +26,6 @@ public interface CanalInstanceService {
 
     Map<String, String> remoteInstanceLog(Long id, Long nodeId);
 
-    Map<String, String> remoteInstanceMeta(Long id, Long nodeId);
-
     boolean remoteOperation(Long id, Long nodeId, String option);
 
     boolean instanceOperation(Long id, String option);

admin/admin-web/src/main/java/com/alibaba/otter/canal/admin/service/CanalInstanceService.java

@@ -1,10 +1,8 @@
 package com.alibaba.otter.canal.admin.service.impl;
 
-import com.alibaba.otter.canal.common.zookeeper.ZkClientx;
 import io.ebean.Query;
 
 import java.security.NoSuchAlgorithmException;
-import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -258,33 +256,6 @@ public Map<String, String> remoteInstanceLog(Long id, Long nodeId) {
         return result;
     }
 
-    @Override
-    public Map<String, String> remoteInstanceMeta(final Long id, final Long nodeId) {
-        Map<String, String> result = new HashMap<>();
-
-        NodeServer nodeServer = NodeServer.find.byId(nodeId);
-        if (nodeServer == null) {
-            return result;
-        }
-        CanalInstanceConfig canalInstanceConfig = CanalInstanceConfig.find.byId(id);
-        if (canalInstanceConfig == null) {
-            return result;
-        }
-        String meta;
-        if (nodeServer.getCanalCluster() != null) {
-            ZkClientx zkClientx = ZkClientx.getZkClient(nodeServer.getCanalCluster().getZkHosts());
-            String zkPath = MessageFormat.format("/{0}/{1}/{2}/{3}/{4}/{5}", "otter", "canal", "destinations", canalInstanceConfig.getName(), "1001", "cursor");
-            meta = new String((byte[]) zkClientx.readData(zkPath));
-        } else {
-            meta = SimpleAdminConnectors.execute(nodeServer.getIp(),
-                    nodeServer.getAdminPort(),
-                    adminConnector -> adminConnector.instanceMeta(canalInstanceConfig.getName(), "meta.dat"));
-        }
-        result.put("instance", canalInstanceConfig.getName());
-        result.put("meta", meta);
-        return result;
-    }
-
     public boolean remoteOperation(Long id, Long nodeId, String option) {
         NodeServer nodeServer = null;
         if ("start".equals(option)) {