merge from master (#1108) (#1109)

pingcap · Jan 10, 2020 · 6a83b0c · 6a83b0c
1 parent 08bb0ce
commit 6a83b0c
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 9 deletions.
diff --git a/conf/tidb-lightning.yml b/conf/tidb-lightning.yml
@@ -45,8 +45,10 @@ checkpoint:
   # keep-after-success: false
 
 tikv_importer:
-  # the listening address of tikv-importer. Change it to the actual address in tikv-importer.toml.
-  # addr: "0.0.0.0:8287"
+  # delivery back end ("tidb" or "importer")
+  backend: "importer"
+  # action on duplicated entry ("error", "ignore" or "replace")
+  # on-duplicate: "replace"
 
 mydumper:
   # block size of file reading

diff --git a/group_vars/all.yml b/group_vars/all.yml
@@ -26,9 +26,6 @@ docker_bin_dir: "/usr/bin"
 # Random shifts for retrying failed ops like downloading
 retry_stagger: 5
 
-# the listening address of tikv-importer. tidb-lightning needs to connect to this address to write data. Set it to the actual IP address.
-tikv_importer_port: 8287
-
 # deployment methods, [binary, docker] docker deployment method is not recommended and deprecated.
 deployment_method: binary
 

diff --git a/group_vars/importer_server.yml b/group_vars/importer_server.yml
@@ -3,3 +3,6 @@ dummy:
 
 # this directory is used to store the data written by `tidb-lightning`
 import_dir: "{{ deploy_dir }}/data.import"
+
+# the listening address of tikv-importer. tidb-lightning needs to connect to this address to write data. Set it to the actual IP address.
+tikv_importer_port: 8287
diff --git a/roles/tidb_lightning/tasks/main.yml b/roles/tidb_lightning/tasks/main.yml
@@ -19,8 +19,6 @@
       lightning:
         pprof-port: "{{ tidb_lightning_pprof_port }}"
         file: "{{ lightning_log_dir }}/{{ lightning_log_file }}"
-      tikv_importer:
-        addr: "{{ hostvars[groups.importer_server[0]].ansible_host | default(hostvars[groups.importer_server[0]].inventory_hostname) }}:{{ tikv_importer_port }}"
       mydumper:
         data-source-dir: "{{ data_source_dir }}"
       tidb:

diff --git a/roles/tidb_lightning/templates/tidb-lightning.toml.j2 b/roles/tidb_lightning/templates/tidb-lightning.toml.j2
@@ -17,6 +17,10 @@
 {% endfor %}
 
 [tikv-importer]
+{% set tikv_importer_node = groups.importer_server[0] -%}
+{% set tikv_importer_ip = hostvars[tikv_importer_node].ansible_host | default(hostvars[tikv_importer_node].inventory_hostname) -%}
+{% set tikv_importer_port = hostvars[tikv_importer_node].tikv_importer_port %}
+addr = "{{ tikv_importer_ip }}:{{ tikv_importer_port }}"
 {% for item, value in tidb_lightning_conf.tikv_importer | dictsort -%}
 {{ item }} = {{ value | to_json }}
 {% endfor %}

diff --git a/roles/tidb_lightning/vars/tidb-lightning.yml b/roles/tidb_lightning/vars/tidb-lightning.yml
@@ -46,8 +46,10 @@ checkpoint:
   # keep-after-success: false
 
 tikv_importer:
-  # the listening address of tikv-importer. Change it to the actual address in tikv-importer.toml.
-  # addr: "0.0.0.0:8287"
+  # delivery back end ("tidb" or "importer")
+  backend: "importer"
+  # action on duplicated entry ("error", "ignore" or "replace")
+  # on-duplicate: "replace"
 
 mydumper:
   # block size of file reading