From c98521530504033d3cdc354e5b4d0ba31fbe2b89 Mon Sep 17 00:00:00 2001 From: Enwei Date: Thu, 26 Aug 2021 09:20:07 +0200 Subject: [PATCH 1/3] This is an automated cherry-pick of #6216 Signed-off-by: ti-chi-bot --- config-templates/complex-tidb-binlog.yaml | 27 +++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/config-templates/complex-tidb-binlog.yaml b/config-templates/complex-tidb-binlog.yaml index d186ece3a3eab..c08853504cbf5 100644 --- a/config-templates/complex-tidb-binlog.yaml +++ b/config-templates/complex-tidb-binlog.yaml @@ -128,7 +128,34 @@ 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: "0.10.0.0" + syncer.to.topic-name: "asyouwish" + +>>>>>>> 389c31777 (complex tidb binlog.yaml: add checkpoint info (#6216)) monitoring_servers: - host: 10.0.1.10 # ssh_port: 22 From 75af516ab6bfd12ec0dae21b54a1e333cefbeca7 Mon Sep 17 00:00:00 2001 From: Enwei Date: Mon, 30 Aug 2021 10:04:19 +0200 Subject: [PATCH 2/3] fix cherry pick error --- config-templates/complex-tidb-binlog.yaml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/config-templates/complex-tidb-binlog.yaml b/config-templates/complex-tidb-binlog.yaml index c08853504cbf5..a9a93dea58a27 100644 --- a/config-templates/complex-tidb-binlog.yaml +++ b/config-templates/complex-tidb-binlog.yaml @@ -128,9 +128,6 @@ drainer_servers: syncer.to.user: "root" syncer.to.password: "" syncer.to.port: 4000 -<<<<<<< HEAD - -======= syncer.to.checkpoint: schema: "tidb-binlog" type: "tidb" @@ -154,8 +151,7 @@ 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: "0.10.0.0" syncer.to.topic-name: "asyouwish" - ->>>>>>> 389c31777 (complex tidb binlog.yaml: add checkpoint info (#6216)) + monitoring_servers: - host: 10.0.1.10 # ssh_port: 22 @@ -176,4 +172,4 @@ alertmanager_servers: # cluster_port: 9094 # deploy_dir: "/tidb-deploy/alertmanager-9093" # data_dir: "/tidb-data/alertmanager-9093" - # log_dir: "/tidb-deploy/alertmanager-9093/log" \ No newline at end of file + # log_dir: "/tidb-deploy/alertmanager-9093/log" From e8bc3082b91dd527060392f2b0fa25510ea05865 Mon Sep 17 00:00:00 2001 From: Enwei Date: Mon, 30 Aug 2021 10:14:01 +0200 Subject: [PATCH 3/3] Update complex-tidb-binlog.yaml --- config-templates/complex-tidb-binlog.yaml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/config-templates/complex-tidb-binlog.yaml b/config-templates/complex-tidb-binlog.yaml index a9a93dea58a27..52efeac3d8294 100644 --- a/config-templates/complex-tidb-binlog.yaml +++ b/config-templates/complex-tidb-binlog.yaml @@ -135,22 +135,6 @@ drainer_servers: 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: "0.10.0.0" - syncer.to.topic-name: "asyouwish" monitoring_servers: - host: 10.0.1.10