From 9fbeddd2a17a5e8b1722a234b5b24df2ec60bbe1 Mon Sep 17 00:00:00 2001 From: Andrei-Adnan Ismail Date: Fri, 30 Oct 2015 14:50:31 +0200 Subject: [PATCH] #395 Simplify test by removing dependency on dnsdock --- .../5backends-replication/docker-compose.yml | 25 ++----------------- test/replication_topology_awareness_test.py | 11 ++++---- 2 files changed, 8 insertions(+), 28 deletions(-) diff --git a/docker/scenarios/5backends-replication/docker-compose.yml b/docker/scenarios/5backends-replication/docker-compose.yml index 0c641a0a9..d9cac0903 100644 --- a/docker/scenarios/5backends-replication/docker-compose.yml +++ b/docker/scenarios/5backends-replication/docker-compose.yml @@ -1,10 +1,3 @@ -dnsdock: - image: tonistiigi/dnsdock - volumes: - - /var/run/docker.sock:/run/docker.sock - ports: - - 172.17.42.1:53:53/udp - proxysql: image: proxysql:{{proxysql_image}} links: @@ -39,8 +32,6 @@ backend1hostgroup0: image: proxysql:mysql-simple-dump environment: MYSQL_ROOT_PASSWORD: root - DNSDOCK_NAME: master - DNSDOCK_IMAGE: mysql expose: - "3306" ports: @@ -53,14 +44,12 @@ backend1hostgroup0: "com.proxysql.hostgroup": "0" volumes: - ./master-conf.d:/etc/mysql/conf.d - dns: 172.17.42.1 backend1hostgroup1: image: proxysql:mysql-empty environment: MYSQL_ROOT_PASSWORD: root - DNSDOCK_NAME: slave1 - DNSDOCK_IMAGE: mysql + NEW_MASTER: True links: - backend1hostgroup0 expose: @@ -75,14 +64,11 @@ backend1hostgroup1: "com.proxysql.hostgroup": "1" volumes: - ./slave1-conf.d:/etc/mysql/conf.d - dns: 172.17.42.1 backend2hostgroup1: image: proxysql:mysql-empty environment: MYSQL_ROOT_PASSWORD: root - DNSDOCK_NAME: slave2 - DNSDOCK_IMAGE: mysql links: - backend1hostgroup0 expose: @@ -97,14 +83,11 @@ backend2hostgroup1: "com.proxysql.hostgroup": "1" volumes: - ./slave2-conf.d:/etc/mysql/conf.d - dns: 172.17.42.1 backend3hostgroup1: image: proxysql:mysql-empty environment: MYSQL_ROOT_PASSWORD: root - DNSDOCK_NAME: slave3 - DNSDOCK_IMAGE: mysql links: - backend1hostgroup0 expose: @@ -119,14 +102,11 @@ backend3hostgroup1: "com.proxysql.hostgroup": "1" volumes: - ./slave3-conf.d:/etc/mysql/conf.d - dns: 172.17.42.1 backend4hostgroup1: image: proxysql:mysql-empty environment: MYSQL_ROOT_PASSWORD: root - DNSDOCK_NAME: slave4 - DNSDOCK_IMAGE: mysql links: - backend1hostgroup0 expose: @@ -140,5 +120,4 @@ backend4hostgroup1: "vendor": "proxysql" "com.proxysql.hostgroup": "1" volumes: - - ./slave4-conf.d:/etc/mysql/conf.d - dns: 172.17.42.1 \ No newline at end of file + - ./slave4-conf.d:/etc/mysql/conf.d \ No newline at end of file diff --git a/test/replication_topology_awareness_test.py b/test/replication_topology_awareness_test.py index 310489c65..97134b47a 100644 --- a/test/replication_topology_awareness_test.py +++ b/test/replication_topology_awareness_test.py @@ -97,8 +97,9 @@ class ReplicationTopologyAwareness(ProxySQLBaseTest): first_slave = None for slave_container_id in slave_containers: meta = self.docker_inspect(slave_container_id) - if 'DNSDOCK_NAME=slave1' in meta['Config']['Env']: + if 'NEW_MASTER=True' in meta['Config']['Env']: first_slave = slave_container_id + first_slave_ip = meta['NetworkSettings']['IPAddress'] # Promote slave1 to a master self.run_query_mysql_container('SET GLOBAL read_only=OFF', @@ -119,7 +120,7 @@ class ReplicationTopologyAwareness(ProxySQLBaseTest): self.run_query_mysql_container('STOP SLAVE', 'information_schema', slave_container_id) - self.run_query_mysql_container("CHANGE MASTER TO MASTER_HOST = 'slave1.mysql.docker'", + self.run_query_mysql_container("CHANGE MASTER TO MASTER_HOST = '%s'" % first_slave_ip, 'information_schema', slave_container_id) self.run_query_mysql_container('START SLAVE', @@ -133,8 +134,8 @@ class ReplicationTopologyAwareness(ProxySQLBaseTest): self.run_query_mysql_container('SET GLOBAL read_only=ON', 'information_schema', master_container) - q = "CHANGE MASTER TO MASTER_HOST = 'slave1.mysql.docker', MASTER_PORT = 3306, MASTER_USER = '%s', MASTER_PASSWORD = '%s', MASTER_AUTO_POSITION = 1" - self.run_query_mysql_container(q % (username, password), + q = "CHANGE MASTER TO MASTER_HOST = '%s', MASTER_PORT = 3306, MASTER_USER = '%s', MASTER_PASSWORD = '%s', MASTER_AUTO_POSITION = 1" + self.run_query_mysql_container(q % (first_slave_ip, username, password), 'information_schema', master_container) self.run_query_mysql_container('RESET SLAVE', @@ -161,7 +162,7 @@ class ReplicationTopologyAwareness(ProxySQLBaseTest): for slave_container_id in old_slave_containers: meta = self.docker_inspect(slave_container_id) slave_ip = meta['NetworkSettings']['IPAddress'] - if 'DNSDOCK_NAME=slave1' in meta['Config']['Env']: + if 'NEW_MASTER=True' in meta['Config']['Env']: master_ip = slave_ip else: slave_ips.add(slave_ip)