@@ -77,7 +77,7 @@ def started_cluster():
7777
7878def check_s3_gets (cluster , node , expected_result , cluster_first , cluster_second , enable_filesystem_cache , lock = False ):
7979 for host in list (cluster .instances .values ()):
80- host .query ("SYSTEM DROP FILESYSTEM CACHE 'raw_s3_cache'" , timeout = 30 , ignore_error = True )
80+ host .query ("SYSTEM DROP FILESYSTEM CACHE 'raw_s3_cache'" , ignore_error = True )
8181
8282 settings = {
8383 "enable_filesystem_cache" : enable_filesystem_cache ,
@@ -96,7 +96,6 @@ def check_s3_gets(cluster, node, expected_result, cluster_first, cluster_second,
9696 SETTINGS { "," .join (f"{ k } ={ v } " for k , v in settings .items ())}
9797 """ ,
9898 query_id = query_id_first ,
99- timeout = 30 ,
10099 )
101100 assert result_first == expected_result
102101 query_id_second = str (uuid .uuid4 ())
@@ -108,12 +107,11 @@ def check_s3_gets(cluster, node, expected_result, cluster_first, cluster_second,
108107 SETTINGS { "," .join (f"{ k } ={ v } " for k , v in settings .items ())}
109108 """ ,
110109 query_id = query_id_second ,
111- timeout = 30 ,
112110 )
113111 assert result_second == expected_result
114112
115113 for host in list (cluster .instances .values ()):
116- host .query ("SYSTEM FLUSH LOGS" , timeout = 30 )
114+ host .query ("SYSTEM FLUSH LOGS" )
117115
118116 s3_get_first = node .query (
119117 f"""
@@ -122,7 +120,6 @@ def check_s3_gets(cluster, node, expected_result, cluster_first, cluster_second,
122120 WHERE type='QueryFinish'
123121 AND initial_query_id='{ query_id_first } '
124122 """ ,
125- timeout = 30 ,
126123 )
127124 s3_get_second = node .query (
128125 f"""
@@ -131,7 +128,6 @@ def check_s3_gets(cluster, node, expected_result, cluster_first, cluster_second,
131128 WHERE type='QueryFinish'
132129 AND initial_query_id='{ query_id_second } '
133130 """ ,
134- timeout = 30 ,
135131 )
136132
137133 return int (s3_get_first ), int (s3_get_second )
0 commit comments