From 9493ff733d0bbfc10c4e5a9f34407e4616cd18a0 Mon Sep 17 00:00:00 2001 From: lwd-coding <654547217@qq.com> Date: Wed, 26 Jun 2024 15:49:48 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=90=8C=E4=B8=AAinstance=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=A4=9A=E4=B8=AAgroup=E9=81=BF=E5=85=8D=E5=85=B1?= =?UTF-8?q?=E4=BA=ABCanalMsgConsumer=20(#5175)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../launcher/loader/AdapterProcessor.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/client-adapter/launcher/src/main/java/com/alibaba/otter/canal/adapter/launcher/loader/AdapterProcessor.java b/client-adapter/launcher/src/main/java/com/alibaba/otter/canal/adapter/launcher/loader/AdapterProcessor.java index 05d2e035..75b87f1d 100644 --- a/client-adapter/launcher/src/main/java/com/alibaba/otter/canal/adapter/launcher/loader/AdapterProcessor.java +++ b/client-adapter/launcher/src/main/java/com/alibaba/otter/canal/adapter/launcher/loader/AdapterProcessor.java @@ -1,16 +1,5 @@ package com.alibaba.otter.canal.adapter.launcher.loader; -import java.util.ArrayList; -import java.util.List; -import java.util.Properties; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.alibaba.otter.canal.adapter.launcher.common.SyncSwitch; import com.alibaba.otter.canal.adapter.launcher.config.SpringContext; import com.alibaba.otter.canal.client.adapter.OuterAdapter; @@ -23,6 +12,16 @@ import com.alibaba.otter.canal.connector.core.consumer.CommonMessage; import com.alibaba.otter.canal.connector.core.spi.CanalMsgConsumer; import com.alibaba.otter.canal.connector.core.spi.ExtensionLoader; import com.alibaba.otter.canal.connector.core.spi.ProxyCanalMsgConsumer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; /** * 适配处理器 @@ -63,8 +62,9 @@ public class AdapterProcessor { // load connector consumer ExtensionLoader loader = new ExtensionLoader<>(CanalMsgConsumer.class); + String key = destination + "_" + groupId; canalMsgConsumer = new ProxyCanalMsgConsumer(loader - .getExtension(canalClientConfig.getMode().toLowerCase(), destination, CONNECTOR_SPI_DIR, + .getExtension(canalClientConfig.getMode().toLowerCase(), key, CONNECTOR_SPI_DIR, CONNECTOR_STANDBY_SPI_DIR)); Properties properties = canalClientConfig.getConsumerProperties();