add extraConfigs

oceanbase · Jun 20, 2022 · 6297d38 · 6297d38
1 parent 59a157a
commit 6297d38
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 15 deletions.
diff --git a/deployer/src/main/resources/example/ob-instance.properties b/deployer/src/main/resources/example/ob-instance.properties
@@ -5,7 +5,10 @@ canal.instance.oceanbase.password=password
 canal.instance.oceanbase.startTimestamp=0
 canal.instance.oceanbase.clusterUrl=
 canal.instance.oceanbase.timezone=+8:00
-canal.instance.oceanbase.obcdc.working_mode=storage
+canal.instance.oceanbase.workingMode=storage
+
+# set extraConfigs for libobcdc, format {'key1': 'value1', 'key2': 'value2'}
+canal.instance.oceanbase.obcdc.extraConfigs={'store_service_path': './storage'}
 
 # ob log proxy info
 canal.instance.oceanbase.logproxy.address=127.0.0.1:2983

diff --git a/deployer/src/main/resources/spring/ob-default-instance.xml b/deployer/src/main/resources/spring/ob-default-instance.xml
@@ -62,10 +62,11 @@
                 <property name="tableWhiteList" value="${canal.instance.filter.regex}"/>
                 <property name="clusterUrl" value="${canal.instance.oceanbase.clusterUrl}"/>
                 <property name="timezone" value="${canal.instance.oceanbase.timezone}"/>
+                <property name="workingMode" value="${canal.instance.oceanbase.workingMode}"/>
+                <property name="extraConfigs" value="#{${canal.instance.oceanbase.obcdc.extraConfigs}}"/>
             </bean>
         </property>
 
-        <property name="workingMode" value="${canal.instance.oceanbase.obcdc.working_mode}"/>
         <property name="clientId" value="${canal.instance.oceanbase.logproxy.clientId}"/>
 
         <property name="logProxyInfo">

diff --git a/deployer/src/main/resources/spring/ob-file-instance.xml b/deployer/src/main/resources/spring/ob-file-instance.xml
@@ -48,10 +48,11 @@
                 <property name="tableWhiteList" value="${canal.instance.filter.regex}"/>
                 <property name="clusterUrl" value="${canal.instance.oceanbase.clusterUrl}"/>
                 <property name="timezone" value="${canal.instance.oceanbase.timezone}"/>
+                <property name="workingMode" value="${canal.instance.oceanbase.workingMode}"/>
+                <property name="extraConfigs" value="#{${canal.instance.oceanbase.obcdc.extraConfigs}}"/>
             </bean>
         </property>
 
-        <property name="workingMode" value="${canal.instance.oceanbase.obcdc.working_mode}"/>
         <property name="clientId" value="${canal.instance.oceanbase.logproxy.clientId}"/>
 
         <property name="logProxyInfo">

diff --git a/deployer/src/main/resources/spring/ob-memory-instance.xml b/deployer/src/main/resources/spring/ob-memory-instance.xml
@@ -36,10 +36,11 @@
                 <property name="tableWhiteList" value="${canal.instance.filter.regex}"/>
                 <property name="clusterUrl" value="${canal.instance.oceanbase.clusterUrl}"/>
                 <property name="timezone" value="${canal.instance.oceanbase.timezone}"/>
+                <property name="workingMode" value="${canal.instance.oceanbase.workingMode}"/>
+                <property name="extraConfigs" value="#{${canal.instance.oceanbase.obcdc.extraConfigs}}"/>
             </bean>
         </property>
 
-        <property name="workingMode" value="${canal.instance.oceanbase.obcdc.working_mode}"/>
         <property name="clientId" value="${canal.instance.oceanbase.logproxy.clientId}"/>
 
         <property name="logProxyInfo">

diff --git a/...in/java/com/alibaba/otter/canal/parse/inbound/oceanbase/logproxy/LogProxyEventParser.java b/...in/java/com/alibaba/otter/canal/parse/inbound/oceanbase/logproxy/LogProxyEventParser.java
@@ -1,8 +1,5 @@
 package com.alibaba.otter.canal.parse.inbound.oceanbase.logproxy;
 
-import java.util.Collections;
-import java.util.List;
-
 import com.alibaba.otter.canal.common.utils.JsonUtils;
 import com.alibaba.otter.canal.parse.CanalEventParser;
 import com.alibaba.otter.canal.parse.inbound.AbstractBinlogParser;
@@ -18,6 +15,8 @@
 import com.oceanbase.oms.logmessage.LogMessage;
 import org.apache.commons.lang.StringUtils;
 
+import java.util.List;
+
 /**
  * 基于LogProxy的CanalEventParser实现
  *
@@ -31,7 +30,6 @@ public class LogProxyEventParser extends AbstractOceanBaseEventParser<LogMessage
      * config to build SslContext
      */
     private LogProxyConnection.SslConfig sslConfig;
-    private String workingMode;
     private String clientId;
 
     @Override
@@ -49,9 +47,6 @@ protected OceanBaseConnection buildOceanBaseConnection() {
         if (startPosition != null) {
             logProxyConfig.setStartTimestamp(startPosition.getTimestamp()/1000);
         }
-        if (StringUtils.isNotBlank(workingMode)) {
-            logProxyConfig.setExtraConfigs(Collections.singletonMap("working_mode", workingMode));
-        }
         logger.info("Connection config {}", logProxyConfig.toString());
 
         ClientConf.Builder builder = ClientConf.builder();
@@ -120,10 +115,6 @@ public void setSslConfig(LogProxyConnection.SslConfig sslConfig) {
         this.sslConfig = sslConfig;
     }
 
-    public void setWorkingMode(String workingMode) {
-        this.workingMode = workingMode;
-    }
-
     public void setClientId(String clientId) {
         this.clientId = clientId;
     }