YDB FQ: mitigate DNS server misbehaving error in Docker-based YDB Connector test (#9172)

vitalyisaev2 · web-flow · commit e3b7f656587e · 2024-09-12T22:47:52.000+03:00
diff --git a/ydb/library/yql/providers/generic/connector/tests/datasource/clickhouse/docker-compose.yml b/ydb/library/yql/providers/generic/connector/tests/datasource/clickhouse/docker-compose.yml
@@ -16,7 +16,7 @@ services:
       - /var
   fq-connector-go:
     container_name: fq-tests-ch-fq-connector-go
-    image: ghcr.io/ydb-platform/fq-connector-go:v0.5.8-rc.2@sha256:12d15f2e82608bc4e64fa91c549361c587754aeb0e6c6a2cee749caebb11baf8
+    image: ghcr.io/ydb-platform/fq-connector-go:v0.5.9-rc.2@sha256:ebaefb6a93d8d1504436e222f3eb106b38ca944f91ccdd12f118172e5986633b
     ports:
       - 2130
     volumes:
diff --git a/ydb/library/yql/providers/generic/connector/tests/datasource/ms_sql_server/docker-compose.yml b/ydb/library/yql/providers/generic/connector/tests/datasource/ms_sql_server/docker-compose.yml
@@ -1,11 +1,11 @@
 services:
   fq-connector-go:
     container_name: fq-tests-mssql-fq-connector-go
-    image: ghcr.io/ydb-platform/fq-connector-go:v0.5.8-rc.2@sha256:12d15f2e82608bc4e64fa91c549361c587754aeb0e6c6a2cee749caebb11baf8
+    image: ghcr.io/ydb-platform/fq-connector-go:v0.5.9-rc.2@sha256:ebaefb6a93d8d1504436e222f3eb106b38ca944f91ccdd12f118172e5986633b
     ports:
-      - 2130
+    - 2130
     volumes:
-      - ../../fq-connector-go/:/opt/ydb/cfg/
+    - ../../fq-connector-go/:/opt/ydb/cfg/
   ms_sql_server:
     build:
       context: ./init
@@ -17,5 +17,5 @@ services:
       LANG: ru_RU.UTF-8
       SA_PASSWORD: Qwerty12345!
     ports:
-      - 1433:1433
+    - 1433:1433
 version: "3.4"
diff --git a/ydb/library/yql/providers/generic/connector/tests/datasource/mysql/docker-compose.yml b/ydb/library/yql/providers/generic/connector/tests/datasource/mysql/docker-compose.yml
@@ -1,7 +1,7 @@
 services:
   fq-connector-go:
     container_name: fq-tests-mysql-fq-connector-go
-    image: ghcr.io/ydb-platform/fq-connector-go:v0.5.8-rc.2@sha256:12d15f2e82608bc4e64fa91c549361c587754aeb0e6c6a2cee749caebb11baf8
+    image: ghcr.io/ydb-platform/fq-connector-go:v0.5.9-rc.2@sha256:ebaefb6a93d8d1504436e222f3eb106b38ca944f91ccdd12f118172e5986633b
     ports:
       - 2130
     volumes:
@@ -14,11 +14,11 @@ services:
     image: mirror.gcr.io/library/mysql@sha256:1579fe3a97a436cc10824fc771a07fcedc92213e7ab7604eb5d2976ca419abc8
     ports:
       - 3306
-    volumes:
-      - ./init:/docker-entrypoint-initdb.d
-      - ./custom.cnf:/etc/mysql/conf.d/custom.cnf
     tmpfs:
       - /run
       - /tmp
       - /var
+    volumes:
+      - ./init:/docker-entrypoint-initdb.d
+      - ./custom.cnf:/etc/mysql/conf.d/custom.cnf
 version: "3.4"
diff --git a/ydb/library/yql/providers/generic/connector/tests/datasource/oracle/docker-compose.yml b/ydb/library/yql/providers/generic/connector/tests/datasource/oracle/docker-compose.yml
@@ -1,7 +1,7 @@
 services:
   fq-connector-go:
     container_name: fq-tests-oracle-fq-connector-go
-    image: ghcr.io/ydb-platform/fq-connector-go:v0.5.8-rc.2@sha256:12d15f2e82608bc4e64fa91c549361c587754aeb0e6c6a2cee749caebb11baf8
+    image: ghcr.io/ydb-platform/fq-connector-go:v0.5.9-rc.2@sha256:ebaefb6a93d8d1504436e222f3eb106b38ca944f91ccdd12f118172e5986633b
     ports:
       - 2130
     volumes:
diff --git a/ydb/library/yql/providers/generic/connector/tests/datasource/postgresql/docker-compose.yml b/ydb/library/yql/providers/generic/connector/tests/datasource/postgresql/docker-compose.yml
@@ -1,7 +1,7 @@
 services:
   fq-connector-go:
     container_name: fq-tests-pg-fq-connector-go
-    image: ghcr.io/ydb-platform/fq-connector-go:v0.5.8-rc.2@sha256:12d15f2e82608bc4e64fa91c549361c587754aeb0e6c6a2cee749caebb11baf8
+    image: ghcr.io/ydb-platform/fq-connector-go:v0.5.9-rc.2@sha256:ebaefb6a93d8d1504436e222f3eb106b38ca944f91ccdd12f118172e5986633b
     ports:
       - 2130
     volumes:
diff --git a/ydb/library/yql/providers/generic/connector/tests/datasource/ydb/docker-compose.yml b/ydb/library/yql/providers/generic/connector/tests/datasource/ydb/docker-compose.yml
@@ -2,21 +2,24 @@ services:
   fq-connector-go:
     command: |
       sh -c "
-        echo \"$$(dig fq-tests-ydb-ydb +short) fq-tests-ydb-ydb\" >> /etc/hosts; cat /etc/hosts;
+        apk add dnsmasq bind;
+        echo \"address=/fq-tests-ydb-ydb/$$(dig fq-tests-ydb-ydb +short)\" >> /etc/dnsmasq.conf;
+        echo \"nameserver 127.0.0.1\" > /etc/resolv.conf;
+        dnsmasq;
         /opt/ydb/bin/fq-connector-go server -c /opt/ydb/cfg/fq-connector-go.yaml"
     container_name: fq-tests-ydb-fq-connector-go
-    image: ghcr.io/ydb-platform/fq-connector-go:v0.5.8-rc.2@sha256:12d15f2e82608bc4e64fa91c549361c587754aeb0e6c6a2cee749caebb11baf8
+    image: ghcr.io/ydb-platform/fq-connector-go:v0.5.9-rc.2@sha256:ebaefb6a93d8d1504436e222f3eb106b38ca944f91ccdd12f118172e5986633b
     ports:
       - 2130
     volumes:
       - ../../fq-connector-go/:/opt/ydb/cfg/
   ydb:
     container_name: fq-tests-ydb-ydb
     environment:
+      DB_USE_IN_MEMORY_PDISKS: "true"
       POSTGRES_PASSWORD: password
       POSTGRES_USER: user
       YDB_DEFAULT_LOG_LEVEL: DEBUG
-      DB_USE_IN_MEMORY_PDISKS: "true"
     hostname: fq-tests-ydb-ydb
     image: ghcr.io/ydb-platform/local-ydb:latest@sha256:9045e00afec1923dc3277564c7b2f829087c2115f45f18e1d38b80bb89f98be6
     volumes:
diff --git a/ydb/library/yql/providers/generic/connector/tests/join/docker-compose.yml b/ydb/library/yql/providers/generic/connector/tests/join/docker-compose.yml
@@ -8,30 +8,30 @@ services:
       CLICKHOUSE_USER: user
     image: mirror.gcr.io/clickhouse/clickhouse-server:23-alpine@sha256:d75017307e76d1bca81a5ac7ada94620567782c0610541f525d1e443e23f76e3
     ports:
-    - 9000
-    - 8123
+      - 9000
+      - 8123
   fq-connector-go:
     container_name: fq-tests-join-fq-connector-go
-    image: ghcr.io/ydb-platform/fq-connector-go:v0.5.8-rc.2@sha256:12d15f2e82608bc4e64fa91c549361c587754aeb0e6c6a2cee749caebb11baf8
+    image: ghcr.io/ydb-platform/fq-connector-go:v0.5.9-rc.2@sha256:ebaefb6a93d8d1504436e222f3eb106b38ca944f91ccdd12f118172e5986633b
     ports:
-    - 2130
+      - 2130
     volumes:
-    - ../fq-connector-go/:/opt/ydb/cfg/
+      - ../fq-connector-go/:/opt/ydb/cfg/
   postgresql:
     command:
-    - postgres
-    - -c
-    - log_statement=all
-    - -c
-    - log_connections=on
-    - -c
-    - log_disconnections=on
+      - postgres
+      - -c
+      - log_statement=all
+      - -c
+      - log_connections=on
+      - -c
+      - log_disconnections=on
     container_name: fq-tests-join-postgresql
     environment:
       POSTGRES_DB: db
       POSTGRES_PASSWORD: password
       POSTGRES_USER: user
     image: mirror.gcr.io/library/postgres:15-bullseye@sha256:2e89ed90224245851ea2b01e0b20c4b893e69141eb36e7a1cece7fb9e19f21f0
     ports:
-    - 5432
+      - 5432
 version: "3.4"
diff --git a/ydb/tests/fq/generic/analytics/docker-compose.yml b/ydb/tests/fq/generic/analytics/docker-compose.yml
@@ -7,30 +7,30 @@ services:
       CLICKHOUSE_PASSWORD: password
       CLICKHOUSE_USER: user
     image: clickhouse/clickhouse-server:23-alpine@sha256:b078c1cd294632afa2aeba3530e7ba2e568513da23304354f455a25fab575c06
-    volumes:
-      - ./clickhouse:/docker-entrypoint-initdb.d
     tmpfs:
       - /run
       - /tmp
       - /var
+    volumes:
+      - ./clickhouse:/docker-entrypoint-initdb.d
   fq-connector-go:
     command: |
       sh -c "
         echo \"$$(dig tests-fq-generic-analytics-ydb +short) tests-fq-generic-analytics-ydb\" >> /etc/hosts; cat /etc/hosts;
         /opt/ydb/bin/fq-connector-go server -c /opt/ydb/cfg/fq-connector-go.yaml"
     container_name: tests-fq-generic-analytics-fq-connector-go
-    image: ghcr.io/ydb-platform/fq-connector-go:v0.5.8-rc.2@sha256:12d15f2e82608bc4e64fa91c549361c587754aeb0e6c6a2cee749caebb11baf8
+    image: ghcr.io/ydb-platform/fq-connector-go:v0.5.9-rc.2@sha256:ebaefb6a93d8d1504436e222f3eb106b38ca944f91ccdd12f118172e5986633b
     ports:
       - "2130"
   greenplum:
     container_name: tests-fq-generic-analytics-greenplum
     image: ghcr.io/ydb-platform/fq-connector-go_greenplum:6.25.3-6432@sha256:9e862b05719b289b447562fbce6c003916a764a549f924a4175eecd7e7891a0b
-    volumes:
-      - ./greenplum/init_db.sh:/init_db.sh
     tmpfs:
       - /run
       - /tmp
       - /var
+    volumes:
+      - ./greenplum/init_db.sh:/init_db.sh
   postgresql:
     command: -p 6432
     container_name: tests-fq-generic-analytics-postgresql
@@ -39,19 +39,19 @@ services:
       POSTGRES_PASSWORD: password
       POSTGRES_USER: user
     image: postgres:15-bullseye@sha256:3411b9f2e5239cd7867f34fcf22fe964230f7d447a71d63c283e3593d3f84085
-    volumes:
-      - ./postgresql:/docker-entrypoint-initdb.d
     tmpfs:
       - /run
       - /tmp
       - /var
+    volumes:
+      - ./postgresql:/docker-entrypoint-initdb.d
   ydb:
     container_name: tests-fq-generic-analytics-ydb
     environment:
+      DB_USE_IN_MEMORY_PDISKS: "true"
       POSTGRES_PASSWORD: password
       POSTGRES_USER: user
       YDB_DEFAULT_LOG_LEVEL: DEBUG
-      DB_USE_IN_MEMORY_PDISKS: "true"
     hostname: tests-fq-generic-analytics-ydb
     image: ghcr.io/ydb-platform/local-ydb:latest@sha256:9045e00afec1923dc3277564c7b2f829087c2115f45f18e1d38b80bb89f98be6
     volumes:
diff --git a/ydb/tests/fq/generic/streaming/docker-compose.yml b/ydb/tests/fq/generic/streaming/docker-compose.yml
@@ -5,19 +5,19 @@ services:
         echo \"$$(dig tests-fq-generic-streaming-ydb +short) tests-fq-generic-streaming-ydb\" >> /etc/hosts; cat /etc/hosts;
         /opt/ydb/bin/fq-connector-go server -c /opt/ydb/cfg/fq-connector-go.yaml"
     container_name: tests-fq-generic-streaming-fq-connector-go
-    image: ghcr.io/ydb-platform/fq-connector-go:v0.5.8-rc.2@sha256:12d15f2e82608bc4e64fa91c549361c587754aeb0e6c6a2cee749caebb11baf8
+    image: ghcr.io/ydb-platform/fq-connector-go:v0.5.9-rc.2@sha256:ebaefb6a93d8d1504436e222f3eb106b38ca944f91ccdd12f118172e5986633b
     ports:
-    - "2130"
+      - "2130"
   ydb:
     container_name: tests-fq-generic-streaming-ydb
     environment:
+      DB_USE_IN_MEMORY_PDISKS: "true"
       POSTGRES_PASSWORD: password
       POSTGRES_USER: user
       YDB_DEFAULT_LOG_LEVEL: DEBUG
-      DB_USE_IN_MEMORY_PDISKS: "true"
     hostname: tests-fq-generic-streaming-ydb
     image: ghcr.io/ydb-platform/local-ydb:latest@sha256:9045e00afec1923dc3277564c7b2f829087c2115f45f18e1d38b80bb89f98be6
     volumes:
-    - ./ydb/init_ydb:/init_ydb
-    - ./ydb/01_basic.sh:/01_basic.sh
+      - ./ydb/init_ydb:/init_ydb
+      - ./ydb/01_basic.sh:/01_basic.sh
 version: "3.4"
