From 57b1d7c2ba03ac198b82f3ed6acd1535ca386945 Mon Sep 17 00:00:00 2001 From: Chunzhu Li Date: Sat, 13 Aug 2022 16:44:49 +0800 Subject: [PATCH 1/2] This is an automated cherry-pick of #8615 Signed-off-by: ti-chi-bot --- config-templates/complex-tidb-binlog.yaml | 26 +++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/config-templates/complex-tidb-binlog.yaml b/config-templates/complex-tidb-binlog.yaml index e49706e65e11..654ac3c88de3 100644 --- a/config-templates/complex-tidb-binlog.yaml +++ b/config-templates/complex-tidb-binlog.yaml @@ -128,6 +128,32 @@ drainer_servers: syncer.to.user: "root" syncer.to.password: "" syncer.to.port: 4000 +<<<<<<< HEAD +======= + syncer.to.checkpoint: + schema: "tidb_binlog" + type: "tidb" + host: "10.0.1.14" + user: "root" + password: "123" + port: 4000 + - host: 10.0.1.13 + port: 8249 + deploy_dir: "/tidb-deploy/drainer-8249" + data_dir: "/tidb-data/drainer-8249" + # If Drainer does not have a checkpoint, use the initial commitTS as the initial checkpoint. + # If commit_ts is set to -1 (the default value), you will get a latest timestamp from PD. + commit_ts: -1 + # The following configurations are used to overwrite the `server_configs.drainer` values. + config: + syncer.db-type: "kafka" + syncer.replicate-do-db: + - db1 + - db2 + syncer.to.kafka-addrs: "10.0.1.20:9092,10.0.1.21:9092,10.0.1.22:9092" + syncer.to.kafka-version: "2.4.0" + syncer.to.topic-name: "asyouwish" +>>>>>>> a59515cf5 (drainer: update config template (#8615)) monitoring_servers: - host: 10.0.1.10 From 807f3ca293c90778017f91de085c2dc3b484453b Mon Sep 17 00:00:00 2001 From: shichun-0415 Date: Mon, 15 Aug 2022 17:23:16 +0800 Subject: [PATCH 2/2] resolve conflict --- config-templates/complex-tidb-binlog.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/config-templates/complex-tidb-binlog.yaml b/config-templates/complex-tidb-binlog.yaml index 654ac3c88de3..9bcc69a43bc7 100644 --- a/config-templates/complex-tidb-binlog.yaml +++ b/config-templates/complex-tidb-binlog.yaml @@ -128,8 +128,6 @@ drainer_servers: syncer.to.user: "root" syncer.to.password: "" syncer.to.port: 4000 -<<<<<<< HEAD -======= syncer.to.checkpoint: schema: "tidb_binlog" type: "tidb" @@ -153,7 +151,6 @@ drainer_servers: syncer.to.kafka-addrs: "10.0.1.20:9092,10.0.1.21:9092,10.0.1.22:9092" syncer.to.kafka-version: "2.4.0" syncer.to.topic-name: "asyouwish" ->>>>>>> a59515cf5 (drainer: update config template (#8615)) monitoring_servers: - host: 10.0.1.10