Skip to content

Update github.com/ydb-platform/fq-connector-go to 0.5.8-rc.2 #8932

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 9, 2024
Merged

Update github.com/ydb-platform/fq-connector-go to 0.5.8-rc.2 #8932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
13bb53a
Update github.com/ydb-platform/fq-connector-go to 0.5.8-rc.1
vitalyisaev2 Sep 6, 2024
d1e1eda
Update github.com/ydb-platform/fq-connector-go to 0.5.8-rc.2
vitalyisaev2 Sep 9, 2024
8e1daa3
Merge branch 'main' into retries_20240909
vitalyisaev2 Sep 9, 2024
b1581f2
Increase dqrun/kqprun timeout
vitalyisaev2 Sep 9, 2024
5c06adc
Merge branch 'retries_20240909' of github.com:vitalyisaev2/ydb into r…
vitalyisaev2 Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ydb/library/yql/providers/generic/connector/tests/datasource/clickhouse/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ services:
- 8123
fq-connector-go:
container_name: fq-tests-ch-fq-connector-go
image: ghcr.io/ydb-platform/fq-connector-go:v0.5.8-rc.1@sha256:856bdb6e4183f3e051777558c28edbfe43ec0510bf39664b4613badda9c4128b
image: ghcr.io/ydb-platform/fq-connector-go:v0.5.8-rc.2@sha256:12d15f2e82608bc4e64fa91c549361c587754aeb0e6c6a2cee749caebb11baf8
ports:
- 2130
volumes:
Expand Down
2 changes: 1 addition & 1 deletion ...library/yql/providers/generic/connector/tests/datasource/ms_sql_server/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
services:
fq-connector-go:
container_name: fq-tests-mssql-fq-connector-go
image: ghcr.io/ydb-platform/fq-connector-go:v0.5.8-rc.1@sha256:856bdb6e4183f3e051777558c28edbfe43ec0510bf39664b4613badda9c4128b
image: ghcr.io/ydb-platform/fq-connector-go:v0.5.8-rc.2@sha256:12d15f2e82608bc4e64fa91c549361c587754aeb0e6c6a2cee749caebb11baf8
ports:
- 2130
volumes:
Expand Down
2 changes: 1 addition & 1 deletion ydb/library/yql/providers/generic/connector/tests/datasource/mysql/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.1@sha256:856bdb6e4183f3e051777558c28edbfe43ec0510bf39664b4613badda9c4128b
image: ghcr.io/ydb-platform/fq-connector-go:v0.5.8-rc.2@sha256:12d15f2e82608bc4e64fa91c549361c587754aeb0e6c6a2cee749caebb11baf8
ports:
- 2130
volumes:
Expand Down
2 changes: 1 addition & 1 deletion ydb/library/yql/providers/generic/connector/tests/datasource/oracle/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.1@sha256:856bdb6e4183f3e051777558c28edbfe43ec0510bf39664b4613badda9c4128b
image: ghcr.io/ydb-platform/fq-connector-go:v0.5.8-rc.2@sha256:12d15f2e82608bc4e64fa91c549361c587754aeb0e6c6a2cee749caebb11baf8
ports:
- 2130
volumes:
Expand Down
2 changes: 1 addition & 1 deletion ydb/library/yql/providers/generic/connector/tests/datasource/postgresql/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.1@sha256:856bdb6e4183f3e051777558c28edbfe43ec0510bf39664b4613badda9c4128b
image: ghcr.io/ydb-platform/fq-connector-go:v0.5.8-rc.2@sha256:12d15f2e82608bc4e64fa91c549361c587754aeb0e6c6a2cee749caebb11baf8
ports:
- 2130
volumes:
Expand Down
2 changes: 1 addition & 1 deletion ydb/library/yql/providers/generic/connector/tests/datasource/ydb/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
echo \"$$(dig fq-tests-ydb-ydb +short) fq-tests-ydb-ydb\" >> /etc/hosts; cat /etc/hosts;
/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.1@sha256:856bdb6e4183f3e051777558c28edbfe43ec0510bf39664b4613badda9c4128b
image: ghcr.io/ydb-platform/fq-connector-go:v0.5.8-rc.2@sha256:12d15f2e82608bc4e64fa91c549361c587754aeb0e6c6a2cee749caebb11baf8
ports:
- 2130
volumes:
Expand Down
8 changes: 4 additions & 4 deletions ydb/library/yql/providers/generic/connector/tests/fq-connector-go/fq-connector-go.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ conversion:
use_unsafe_converters: true

data_source_default: &data_source_default_var
open_connection_timeout: 5s
ping_connection_timeout: 5s
open_connection_timeout: 20s
ping_connection_timeout: 20s
exponential_backoff:
initial_interval: 500ms
initial_interval: 100ms
randomization_factor: 0.5
multiplier: 1.5
max_interval: 20s
max_elapsed_time: 2m
max_elapsed_time: 3m

datasources:
clickhouse:
Expand Down
2 changes: 1 addition & 1 deletion ydb/library/yql/providers/generic/connector/tests/join/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ services:
- 8123
fq-connector-go:
container_name: fq-tests-join-fq-connector-go
image: ghcr.io/ydb-platform/fq-connector-go:v0.5.8-rc.1@sha256:856bdb6e4183f3e051777558c28edbfe43ec0510bf39664b4613badda9c4128b
image: ghcr.io/ydb-platform/fq-connector-go:v0.5.8-rc.2@sha256:12d15f2e82608bc4e64fa91c549361c587754aeb0e6c6a2cee749caebb11baf8
ports:
- 2130
volumes:
Expand Down
4 changes: 2 additions & 2 deletions ydb/library/yql/providers/generic/connector/tests/utils/run/dqrun.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from ydb.library.yql.providers.generic.connector.tests.utils.schema import Schema
from ydb.library.yql.providers.generic.connector.tests.utils.settings import Settings, GenericSettings

from ydb.library.yql.providers.generic.connector.tests.utils.run.parent import Runner
from ydb.library.yql.providers.generic.connector.tests.utils.run.parent import Runner, DefaultTimeout
from ydb.library.yql.providers.generic.connector.tests.utils.run.result import Result

LOGGER = make_logger(__name__)
Expand Down Expand Up @@ -295,7 +295,7 @@ def run(self, test_name: str, script: str, generic_settings: GenericSettings) ->
returncode = 0

try:
output = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, timeout=60)
output = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, timeout=DefaultTimeout)
except subprocess.CalledProcessError as e:
LOGGER.error(
'Execution failed:\n\nSTDOUT: %s\n\nSTDERR: %s\n\n',
Expand Down
4 changes: 2 additions & 2 deletions ydb/library/yql/providers/generic/connector/tests/utils/run/kqprun.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from ydb.library.yql.providers.generic.connector.tests.utils.schema import Schema
from ydb.library.yql.providers.generic.connector.tests.utils.settings import Settings, GenericSettings

from ydb.library.yql.providers.generic.connector.tests.utils.run.parent import Runner
from ydb.library.yql.providers.generic.connector.tests.utils.run.parent import Runner, DefaultTimeout
from ydb.library.yql.providers.generic.connector.tests.utils.run.result import Result

LOGGER = make_logger(__name__)
Expand Down Expand Up @@ -259,7 +259,7 @@ def run(self, test_name: str, script: str, generic_settings: GenericSettings) ->
returncode = 0

try:
output = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, timeout=60)
output = subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, timeout=DefaultTimeout)
except subprocess.CalledProcessError as e:
LOGGER.error(
'Execution failed:\n\nSTDOUT: %s\n\nSTDERR: %s\n\n',
Expand Down
5 changes: 5 additions & 0 deletions ydb/library/yql/providers/generic/connector/tests/utils/run/parent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
from abc import ABC, abstractmethod
from pathlib import Path
from typing import Final

from ydb.library.yql.providers.generic.connector.tests.utils.settings import Settings, GenericSettings
from ydb.library.yql.providers.generic.connector.tests.utils.run.result import Result


# 3 mins
DefaultTimeout: Final = 180


class Runner(ABC):
@abstractmethod
def __init__(self, runner_path: Path, settings: Settings):
Expand Down
2 changes: 1 addition & 1 deletion ydb/tests/fq/generic/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ services:
echo \"$$(dig tests-fq-generic-ydb +short) tests-fq-generic-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-fq-connector-go
image: ghcr.io/ydb-platform/fq-connector-go:v0.5.8-rc.1@sha256:856bdb6e4183f3e051777558c28edbfe43ec0510bf39664b4613badda9c4128b
image: ghcr.io/ydb-platform/fq-connector-go:v0.5.8-rc.2@sha256:12d15f2e82608bc4e64fa91c549361c587754aeb0e6c6a2cee749caebb11baf8
ports:
- "2130"
greenplum:
Expand Down