From 3030db9043b298ea491de4652e5115460a7b8039 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Mon, 19 Apr 2021 01:28:03 +0300
Subject: [PATCH 1/2] Fix integration tests for Hedged requests

---
 tests/integration/test_hedged_requests/configs/users.xml        | 2 ++
 tests/integration/test_hedged_requests/configs/users1.xml       | 2 ++
 .../integration/test_hedged_requests_parallel/configs/users.xml | 2 ++
 .../test_hedged_requests_parallel/configs/users1.xml            | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/tests/integration/test_hedged_requests/configs/users.xml b/tests/integration/test_hedged_requests/configs/users.xml
index a3ab176b811..ac42155a18a 100644
--- a/tests/integration/test_hedged_requests/configs/users.xml
+++ b/tests/integration/test_hedged_requests/configs/users.xml
@@ -5,6 +5,8 @@
             <load_balancing>in_order</load_balancing>
             <hedged_connection_timeout_ms>100</hedged_connection_timeout_ms>
             <receive_data_timeout_ms>2000</receive_data_timeout_ms>
+            <async_socket_for_remote>1</async_socket_for_remote>
+            <use_hedged_requests>1</use_hedged_requests>
         </default>
     </profiles>
 </yandex>
diff --git a/tests/integration/test_hedged_requests/configs/users1.xml b/tests/integration/test_hedged_requests/configs/users1.xml
index 2a54396feca..bc68c2c579d 100644
--- a/tests/integration/test_hedged_requests/configs/users1.xml
+++ b/tests/integration/test_hedged_requests/configs/users1.xml
@@ -2,6 +2,8 @@
 <yandex>
     <profiles>
         <default>
+            <async_socket_for_remote>1</async_socket_for_remote>
+            <use_hedged_requests>1</use_hedged_requests>
         </default>
     </profiles>
 </yandex>
diff --git a/tests/integration/test_hedged_requests_parallel/configs/users.xml b/tests/integration/test_hedged_requests_parallel/configs/users.xml
index 3f3578903b4..9600c0c7124 100644
--- a/tests/integration/test_hedged_requests_parallel/configs/users.xml
+++ b/tests/integration/test_hedged_requests_parallel/configs/users.xml
@@ -6,6 +6,8 @@
             <max_parallel_replicas>2</max_parallel_replicas>
             <hedged_connection_timeout_ms>100</hedged_connection_timeout_ms>
             <receive_data_timeout_ms>2000</receive_data_timeout_ms>
+            <async_socket_for_remote>1</async_socket_for_remote>
+            <use_hedged_requests>1</use_hedged_requests>
         </default>
     </profiles>
 </yandex>
diff --git a/tests/integration/test_hedged_requests_parallel/configs/users1.xml b/tests/integration/test_hedged_requests_parallel/configs/users1.xml
index 2a54396feca..bc68c2c579d 100644
--- a/tests/integration/test_hedged_requests_parallel/configs/users1.xml
+++ b/tests/integration/test_hedged_requests_parallel/configs/users1.xml
@@ -2,6 +2,8 @@
 <yandex>
     <profiles>
         <default>
+            <async_socket_for_remote>1</async_socket_for_remote>
+            <use_hedged_requests>1</use_hedged_requests>
         </default>
     </profiles>
 </yandex>

From 8f1b5073867175abfab5c4ee66a5cc9e2ebce393 Mon Sep 17 00:00:00 2001
From: Pavel Kruglov <avogar@sandbox-633380738>
Date: Mon, 19 Apr 2021 11:46:42 +0300
Subject: [PATCH 2/2] Fix test_secure_socket and remove redundant settings in
 hedged tests

---
 tests/integration/test_hedged_requests/configs/users1.xml     | 2 --
 .../test_hedged_requests_parallel/configs/users1.xml          | 2 --
 tests/integration/test_secure_socket/test.py                  | 4 ++--
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/tests/integration/test_hedged_requests/configs/users1.xml b/tests/integration/test_hedged_requests/configs/users1.xml
index bc68c2c579d..2a54396feca 100644
--- a/tests/integration/test_hedged_requests/configs/users1.xml
+++ b/tests/integration/test_hedged_requests/configs/users1.xml
@@ -2,8 +2,6 @@
 <yandex>
     <profiles>
         <default>
-            <async_socket_for_remote>1</async_socket_for_remote>
-            <use_hedged_requests>1</use_hedged_requests>
         </default>
     </profiles>
 </yandex>
diff --git a/tests/integration/test_hedged_requests_parallel/configs/users1.xml b/tests/integration/test_hedged_requests_parallel/configs/users1.xml
index bc68c2c579d..2a54396feca 100644
--- a/tests/integration/test_hedged_requests_parallel/configs/users1.xml
+++ b/tests/integration/test_hedged_requests_parallel/configs/users1.xml
@@ -2,8 +2,6 @@
 <yandex>
     <profiles>
         <default>
-            <async_socket_for_remote>1</async_socket_for_remote>
-            <use_hedged_requests>1</use_hedged_requests>
         </default>
     </profiles>
 </yandex>
diff --git a/tests/integration/test_secure_socket/test.py b/tests/integration/test_secure_socket/test.py
index 0ca6e6a6e6b..65c789f9d02 100644
--- a/tests/integration/test_secure_socket/test.py
+++ b/tests/integration/test_secure_socket/test.py
@@ -64,7 +64,7 @@ def test(started_cluster):
     assert end - start < 10
 
     start = time.time()
-    error = NODES['node1'].query_and_get_error('SELECT * FROM distributed_table settings receive_timeout=5, send_timeout=5, use_hedged_requests=0;')
+    error = NODES['node1'].query_and_get_error('SELECT * FROM distributed_table settings receive_timeout=5, send_timeout=5, use_hedged_requests=0, async_socket_for_remote=1;')
     end = time.time()
 
     assert end - start < 10
@@ -73,7 +73,7 @@ def test(started_cluster):
     assert error.find('DB::ReadBufferFromPocoSocket::nextImpl()') == -1
 
     start = time.time()
-    error = NODES['node1'].query_and_get_error('SELECT * FROM distributed_table settings receive_timeout=5, send_timeout=5;')
+    error = NODES['node1'].query_and_get_error('SELECT * FROM distributed_table settings receive_timeout=5, send_timeout=5, use_hedged_requests=1, async_socket_for_remote=1;')
     end = time.time()
 
     assert end - start < 10