From 95050ff3829972ec9ea8938c11ca0a558e8a6d0f Mon Sep 17 00:00:00 2001 From: agapple Date: Mon, 2 Sep 2019 13:46:35 +0800 Subject: [PATCH] fixed test example --- .../otter/canal/deployer/CanalLauncher.java | 2 +- .../{CanalStater.java => CanalStarter.java} | 6 +- .../deployer/admin/CanalAdminController.java | 8 +-- docker/run.sh | 57 ++++++++++--------- docker/run_admin.sh | 57 ++++++++++--------- .../example/AbstractCanalClientTest.java | 6 +- .../canal/example/ClusterCanalClientTest.java | 2 +- .../SimpleCanalClientPermanceTest.java | 4 +- 8 files changed, 75 insertions(+), 67 deletions(-) rename deployer/src/main/java/com/alibaba/otter/canal/deployer/{CanalStater.java => CanalStarter.java} (99%) diff --git a/deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalLauncher.java b/deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalLauncher.java index 96eec5c6..a2b6a3b1 100644 --- a/deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalLauncher.java +++ b/deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalLauncher.java @@ -46,7 +46,7 @@ public class CanalLauncher { properties.load(new FileInputStream(conf)); } - final CanalStater canalStater = new CanalStater(properties); + final CanalStarter canalStater = new CanalStarter(properties); String managerAddress = CanalController.getProperty(properties, CanalConstants.CANAL_ADMIN_MANAGER); if (StringUtils.isNotEmpty(managerAddress)) { String user = CanalController.getProperty(properties, CanalConstants.CANAL_ADMIN_USER); diff --git a/deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalStater.java b/deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalStarter.java similarity index 99% rename from deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalStater.java rename to deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalStarter.java index b50f0f44..a83b2cb1 100644 --- a/deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalStater.java +++ b/deployer/src/main/java/com/alibaba/otter/canal/deployer/CanalStarter.java @@ -20,9 +20,9 @@ import com.alibaba.otter.canal.spi.CanalMQProducer; * @author rewerma 2018-12-30 下午05:12:16 * @version 1.0.1 */ -public class CanalStater { +public class CanalStarter { - private static final Logger logger = LoggerFactory.getLogger(CanalStater.class); + private static final Logger logger = LoggerFactory.getLogger(CanalStarter.class); private CanalController controller = null; private CanalMQProducer canalMQProducer = null; @@ -33,7 +33,7 @@ public class CanalStater { private CanalAdminWithNetty canalAdmin; - public CanalStater(Properties properties){ + public CanalStarter(Properties properties){ this.properties = properties; } diff --git a/deployer/src/main/java/com/alibaba/otter/canal/deployer/admin/CanalAdminController.java b/deployer/src/main/java/com/alibaba/otter/canal/deployer/admin/CanalAdminController.java index 7af408fd..5144e7f7 100644 --- a/deployer/src/main/java/com/alibaba/otter/canal/deployer/admin/CanalAdminController.java +++ b/deployer/src/main/java/com/alibaba/otter/canal/deployer/admin/CanalAdminController.java @@ -15,7 +15,7 @@ import org.slf4j.LoggerFactory; import com.alibaba.otter.canal.admin.CanalAdmin; import com.alibaba.otter.canal.common.utils.FileUtils; -import com.alibaba.otter.canal.deployer.CanalStater; +import com.alibaba.otter.canal.deployer.CanalStarter; import com.alibaba.otter.canal.deployer.InstanceConfig; import com.alibaba.otter.canal.deployer.monitor.InstanceAction; import com.alibaba.otter.canal.deployer.monitor.InstanceConfigMonitor; @@ -37,9 +37,9 @@ public class CanalAdminController implements CanalAdmin { private static final Logger logger = LoggerFactory.getLogger(CanalAdminController.class); private String user; private String passwd; - private CanalStater canalStater; + private CanalStarter canalStater; - public CanalAdminController(CanalStater canalStater){ + public CanalAdminController(CanalStarter canalStater){ this.canalStater = canalStater; } @@ -249,7 +249,7 @@ public class CanalAdminController implements CanalAdmin { this.passwd = passwd; } - public void setCanalStater(CanalStater canalStater) { + public void setCanalStater(CanalStarter canalStater) { this.canalStater = canalStater; } diff --git a/docker/run.sh b/docker/run.sh index 7772d212..16751911 100644 --- a/docker/run.sh +++ b/docker/run.sh @@ -50,31 +50,6 @@ function getMyIp() { echo $myip } -NET_MODE="" -case "`uname`" in - Darwin) - bin_abs_path=`cd $(dirname $0); pwd` - ;; - Linux) - bin_abs_path=$(readlink -f $(dirname $0)) - NET_MODE="--net=host" - ;; - *) - NET_MODE="--net=host" - bin_abs_path=`cd $(dirname $0); pwd` - ;; -esac -BASE=${bin_abs_path} -if [ $# -eq 0 ]; then - usage -elif [ "$1" == "-h" ] ; then - usage -elif [ "$1" == "help" ] ; then - usage -fi - -DATA="$BASE/data" -mkdir -p $DATA CONFIG=${@:1} #VOLUMNS="-v $DATA:/home/admin/canal-server/logs" PORTLIST="11110 11111 11112 9100" @@ -90,8 +65,38 @@ for PORT in $PORTLIST ; do fi done +NET_MODE="" +case "`uname`" in + Darwin) + bin_abs_path=`cd $(dirname $0); pwd` + ;; + Linux) + bin_abs_path=$(readlink -f $(dirname $0)) + NET_MODE="--net=host" + PORTS="" + ;; + *) + bin_abs_path=`cd $(dirname $0); pwd` + NET_MODE="--net=host" + PORTS="" + ;; +esac +BASE=${bin_abs_path} +DATA="$BASE/data" +mkdir -p $DATA + +if [ $# -eq 0 ]; then + usage +elif [ "$1" == "-h" ] ; then + usage +elif [ "$1" == "help" ] ; then + usage +fi + + + MEMORY="-m 4096m" LOCALHOST=`getMyIp` cmd="docker run -d -it -h $LOCALHOST $CONFIG --name=canal-server $VOLUMNS $NET_MODE $PORTS $MEMORY canal/canal-server" echo $cmd -eval $cmd +eval $cmd \ No newline at end of file diff --git a/docker/run_admin.sh b/docker/run_admin.sh index 247c424a..75034eea 100644 --- a/docker/run_admin.sh +++ b/docker/run_admin.sh @@ -6,9 +6,7 @@ function usage() { echo "example :" echo " run_admin.sh -e server.port=8089 \\" echo " -e canal.adminUser=admin \\" - echo " -e canal.adminPasswd=admin \\" - echo " -e spring.datasource.username=canal \\" - echo " -e spring.datasource.password=canal" + echo " -e canal.adminPasswd=admin" exit } @@ -43,31 +41,6 @@ function getMyIp() { echo $myip } -NET_MODE="" -case "`uname`" in - Darwin) - bin_abs_path=`cd $(dirname $0); pwd` - ;; - Linux) - bin_abs_path=$(readlink -f $(dirname $0)) - NET_MODE="--net=host" - ;; - *) - NET_MODE="--net=host" - bin_abs_path=`cd $(dirname $0); pwd` - ;; -esac -BASE=${bin_abs_path} -if [ $# -eq 0 ]; then - usage -elif [ "$1" == "-h" ] ; then - usage -elif [ "$1" == "help" ] ; then - usage -fi - -DATA="$BASE/data" -mkdir -p $DATA CONFIG=${@:1} #VOLUMNS="-v $DATA:/home/admin/canal-admin/logs" PORTLIST="8089" @@ -83,6 +56,34 @@ for PORT in $PORTLIST ; do fi done +NET_MODE="" +case "`uname`" in + Darwin) + bin_abs_path=`cd $(dirname $0); pwd` + ;; + Linux) + bin_abs_path=$(readlink -f $(dirname $0)) + NET_MODE="--net=host" + PORTS="" + ;; + *) + NET_MODE="--net=host" + PORTS="" + bin_abs_path=`cd $(dirname $0); pwd` + ;; +esac +BASE=${bin_abs_path} +DATA="$BASE/data" +mkdir -p $DATA + +if [ $# -eq 0 ]; then + usage +elif [ "$1" == "-h" ] ; then + usage +elif [ "$1" == "help" ] ; then + usage +fi + MEMORY="-m 1024m" LOCALHOST=`getMyIp` cmd="docker run -d -it -h $LOCALHOST $CONFIG --name=canal-admin $VOLUMNS $NET_MODE $PORTS $MEMORY canal/canal-admin" diff --git a/example/src/main/java/com/alibaba/otter/canal/example/AbstractCanalClientTest.java b/example/src/main/java/com/alibaba/otter/canal/example/AbstractCanalClientTest.java index ce70cd2c..1f77d00f 100644 --- a/example/src/main/java/com/alibaba/otter/canal/example/AbstractCanalClientTest.java +++ b/example/src/main/java/com/alibaba/otter/canal/example/AbstractCanalClientTest.java @@ -74,8 +74,10 @@ public class AbstractCanalClientTest extends BaseCanalClientTest { printEntry(message.getEntries()); } - connector.ack(batchId); // 提交确认 - // connector.rollback(batchId); // 处理失败, 回滚数据 + if (batchId != -1) { + connector.ack(batchId); // 提交确认 + // connector.rollback(batchId); // 处理失败, 回滚数据 + } } } catch (Exception e) { logger.error("process error!", e); diff --git a/example/src/main/java/com/alibaba/otter/canal/example/ClusterCanalClientTest.java b/example/src/main/java/com/alibaba/otter/canal/example/ClusterCanalClientTest.java index d4a18af0..43d81825 100644 --- a/example/src/main/java/com/alibaba/otter/canal/example/ClusterCanalClientTest.java +++ b/example/src/main/java/com/alibaba/otter/canal/example/ClusterCanalClientTest.java @@ -26,7 +26,7 @@ public class ClusterCanalClientTest extends AbstractCanalClientTest { // "stability_test", "", ""); // 基于zookeeper动态获取canal server的地址，建立链接，其中一台server发生crash，可以支持failover - CanalConnector connector = CanalConnectors.newClusterConnector("127.0.0.1:2181", destination, "", ""); + CanalConnector connector = CanalConnectors.newClusterConnector("127.0.0.1:2181", destination, "canal", "canal"); final ClusterCanalClientTest clientTest = new ClusterCanalClientTest(destination); clientTest.setConnector(connector); diff --git a/example/src/main/java/com/alibaba/otter/canal/example/SimpleCanalClientPermanceTest.java b/example/src/main/java/com/alibaba/otter/canal/example/SimpleCanalClientPermanceTest.java index 6b1f1800..db61f98c 100644 --- a/example/src/main/java/com/alibaba/otter/canal/example/SimpleCanalClientPermanceTest.java +++ b/example/src/main/java/com/alibaba/otter/canal/example/SimpleCanalClientPermanceTest.java @@ -24,8 +24,8 @@ public class SimpleCanalClientPermanceTest { try { final CanalConnector connector = CanalConnectors.newSingleConnector(new InetSocketAddress(ip, 11111), destination, - "", - ""); + "canal", + "canal"); Thread ackThread = new Thread(new Runnable() {