Skip to content

Commit cb2aef9

Browse files
authored
Merge pull request #1392 from Altinity/stabilize_stateless_26.1
Antalya 26.1 - Stabilize stateless tests
2 parents 1d80140 + f534e7c commit cb2aef9

File tree

7 files changed

+50
-7
lines changed

7 files changed

+50
-7
lines changed

ci/defs/job_configs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
],
7474
),
7575
result_name_for_cidb="Tests",
76-
timeout=int(3600 * 2.5),
76+
timeout=int(3600 * 3),
7777
)
7878

7979
common_stress_job_config = Job.Config(

ci/jobs/functional_tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def run_tests(
9292
if "--no-zookeeper" not in extra_args:
9393
extra_args += " --zookeeper"
9494
# Remove --report-logs-stats, it hides sanitizer errors in def reportLogStats(args): clickhouse_execute(args, "SYSTEM FLUSH LOGS")
95-
command = f"clickhouse-test --testname --check-zookeeper-session --hung-check --memory-limit {5*2**30} --trace \
95+
command = f"clickhouse-test --testname --check-zookeeper-session --hung-check --memory-limit {10*2**30} --trace \
9696
--capture-client-stacktrace --queries ./tests/queries --test-runs {rerun_count} \
9797
{extra_args} \
9898
--queries ./tests/queries {('--order=random' if random_order else '')} -- {' '.join(tests) if tests else ''} | ts '%Y-%m-%d %H:%M:%S' \

ci/jobs/scripts/clickhouse_proc.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -624,8 +624,8 @@ def prepare_stateful_data(self, with_s3_storage, is_db_replicated):
624624
ENGINE = CollapsingMergeTree(Sign) PARTITION BY toYYYYMM(StartDate) ORDER BY (CounterID, StartDate, intHash32(UserID), VisitID)
625625
SAMPLE BY intHash32(UserID) SETTINGS index_granularity = 8192, storage_policy='s3_cache'"
626626
627-
clickhouse-client --max_execution_time 600 --max_memory_usage 25G --query "INSERT INTO test.hits SELECT * FROM datasets.hits_v1 SETTINGS enable_filesystem_cache_on_write_operations=0, max_insert_threads=16"
628-
clickhouse-client --max_execution_time 600 --max_memory_usage 25G --query "INSERT INTO test.visits SELECT * FROM datasets.visits_v1 SETTINGS enable_filesystem_cache_on_write_operations=0, max_insert_threads=16"
627+
clickhouse-client --max_execution_time 1800 --max_memory_usage 25G --query "INSERT INTO test.hits SELECT * FROM datasets.hits_v1 SETTINGS enable_filesystem_cache_on_write_operations=0, max_insert_threads=16"
628+
clickhouse-client --max_execution_time 1800 --max_memory_usage 25G --query "INSERT INTO test.visits SELECT * FROM datasets.visits_v1 SETTINGS enable_filesystem_cache_on_write_operations=0, max_insert_threads=16"
629629
clickhouse-client --query "DROP TABLE datasets.visits_v1 SYNC"
630630
clickhouse-client --query "DROP TABLE datasets.hits_v1 SYNC"
631631
else
@@ -634,7 +634,7 @@ def prepare_stateful_data(self, with_s3_storage, is_db_replicated):
634634
fi
635635
clickhouse-client --query "CREATE TABLE test.hits_s3 (WatchID UInt64, JavaEnable UInt8, Title String, GoodEvent Int16, EventTime DateTime, EventDate Date, CounterID UInt32, ClientIP UInt32, ClientIP6 FixedString(16), RegionID UInt32, UserID UInt64, CounterClass Int8, OS UInt8, UserAgent UInt8, URL String, Referer String, URLDomain String, RefererDomain String, Refresh UInt8, IsRobot UInt8, RefererCategories Array(UInt16), URLCategories Array(UInt16), URLRegions Array(UInt32), RefererRegions Array(UInt32), ResolutionWidth UInt16, ResolutionHeight UInt16, ResolutionDepth UInt8, FlashMajor UInt8, FlashMinor UInt8, FlashMinor2 String, NetMajor UInt8, NetMinor UInt8, UserAgentMajor UInt16, UserAgentMinor FixedString(2), CookieEnable UInt8, JavascriptEnable UInt8, IsMobile UInt8, MobilePhone UInt8, MobilePhoneModel String, Params String, IPNetworkID UInt32, TraficSourceID Int8, SearchEngineID UInt16, SearchPhrase String, AdvEngineID UInt8, IsArtifical UInt8, WindowClientWidth UInt16, WindowClientHeight UInt16, ClientTimeZone Int16, ClientEventTime DateTime, SilverlightVersion1 UInt8, SilverlightVersion2 UInt8, SilverlightVersion3 UInt32, SilverlightVersion4 UInt16, PageCharset String, CodeVersion UInt32, IsLink UInt8, IsDownload UInt8, IsNotBounce UInt8, FUniqID UInt64, HID UInt32, IsOldCounter UInt8, IsEvent UInt8, IsParameter UInt8, DontCountHits UInt8, WithHash UInt8, HitColor FixedString(1), UTCEventTime DateTime, Age UInt8, Sex UInt8, Income UInt8, Interests UInt16, Robotness UInt8, GeneralInterests Array(UInt16), RemoteIP UInt32, RemoteIP6 FixedString(16), WindowName Int32, OpenerName Int32, HistoryLength Int16, BrowserLanguage FixedString(2), BrowserCountry FixedString(2), SocialNetwork String, SocialAction String, HTTPError UInt16, SendTiming Int32, DNSTiming Int32, ConnectTiming Int32, ResponseStartTiming Int32, ResponseEndTiming Int32, FetchTiming Int32, RedirectTiming Int32, DOMInteractiveTiming Int32, DOMContentLoadedTiming Int32, DOMCompleteTiming Int32, LoadEventStartTiming Int32, LoadEventEndTiming Int32, NSToDOMContentLoadedTiming Int32, FirstPaintTiming Int32, RedirectCount Int8, SocialSourceNetworkID UInt8, SocialSourcePage String, ParamPrice Int64, ParamOrderID String, ParamCurrency FixedString(3), ParamCurrencyID UInt16, GoalsReached Array(UInt32), OpenstatServiceName String, OpenstatCampaignID String, OpenstatAdID String, OpenstatSourceID String, UTMSource String, UTMMedium String, UTMCampaign String, UTMContent String, UTMTerm String, FromTag String, HasGCLID UInt8, RefererHash UInt64, URLHash UInt64, CLID UInt32, YCLID UInt64, ShareService String, ShareURL String, ShareTitle String, ParsedParams Nested(Key1 String, Key2 String, Key3 String, Key4 String, Key5 String, ValueDouble Float64), IslandID FixedString(16), RequestNum UInt32, RequestTry UInt8) ENGINE = MergeTree() PARTITION BY toYYYYMM(EventDate) ORDER BY (CounterID, EventDate, intHash32(UserID)) SAMPLE BY intHash32(UserID) SETTINGS index_granularity = 8192, storage_policy='s3_cache'"
636636
# AWS S3 is very inefficient, so increase memory even further:
637-
clickhouse-client --max_execution_time 900 --max_memory_usage 30G --max_memory_usage_for_user 30G --query "INSERT INTO test.hits_s3 SELECT * FROM test.hits SETTINGS enable_filesystem_cache_on_write_operations=0, write_through_distributed_cache=0, max_insert_threads=16"
637+
clickhouse-client --max_execution_time 1200 --max_memory_usage 30G --max_memory_usage_for_user 30G --query "INSERT INTO test.hits_s3 SELECT * FROM test.hits SETTINGS enable_filesystem_cache_on_write_operations=0, write_through_distributed_cache=0, max_insert_threads=16"
638638
639639
clickhouse-client --query "SHOW TABLES FROM test"
640640
clickhouse-client --query "SELECT count() FROM test.hits"

tests/broken_tests.yaml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,47 @@
8484
- name: 03644_object_storage_correlated_subqueries
8585
reason: KNOWN - Unstable in upstream 25.8.
8686
message: Timeout! Processes left in process group
87+
- name: 03206_no_exceptions_clickhouse_local
88+
reason: 'KNOWN - Unstable upstream'
89+
message: 'return code: 134'
90+
- name: 02815_no_throw_in_simple_queries
91+
reason: 'KNOWN - Unstable upstream'
92+
message: 'spawn id exp5 not open'
93+
- name: 03367_l2_distance_transposed_1
94+
reason: INVESTIGATE - Float precision issue on Hetzner ARM https://github.com/ClickHouse/ClickHouse/issues/96764
95+
check_types:
96+
- arm
97+
- cpu-aarch64
98+
- name: 03369_l2_distance_transposed_variadic
99+
reason: INVESTIGATE - Float precision issue on Hetzner ARM https://github.com/ClickHouse/ClickHouse/issues/96764
100+
check_types:
101+
- arm
102+
- cpu-aarch64
103+
- name: 03367_l2_distance_transposed_2
104+
reason: INVESTIGATE - Float precision issue on Hetzner ARM https://github.com/ClickHouse/ClickHouse/issues/96764
105+
check_types:
106+
- arm
107+
- cpu-aarch64
108+
- name: 03377_qbit_parameters
109+
reason: INVESTIGATE - Float precision issue on Hetzner ARM https://github.com/ClickHouse/ClickHouse/issues/96764
110+
check_types:
111+
- arm
112+
- cpu-aarch64
113+
- name: 03370_l2_distance_transposed_negative
114+
reason: INVESTIGATE - Float precision issue on Hetzner ARM https://github.com/ClickHouse/ClickHouse/issues/96764
115+
check_types:
116+
- arm
117+
- cpu-aarch64
118+
- name: 03375_l2_distance_transposed_partial_reads_pass
119+
reason: INVESTIGATE - Float precision issue on Hetzner ARM https://github.com/ClickHouse/ClickHouse/issues/96764
120+
check_types:
121+
- arm
122+
- cpu-aarch64
123+
- name: 03378_cosine_distance_transposed
124+
reason: INVESTIGATE - Float precision issue on Hetzner ARM https://github.com/ClickHouse/ClickHouse/issues/96764
125+
check_types:
126+
- arm
127+
- cpu-aarch64
87128
- name: test_storage_s3_queue/test_5.py::test_migration[1-s3queue_]
88129
reason: KNOWN - Sometimes fails due to test order
89130
message: 'Failed: Timeout >900.0s'

tests/clickhouse-test

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,8 @@ def get_broken_tests_rules(broken_tests_file_path: str) -> dict:
146146
def test_is_known_fail(test_name, test_logs, build_flags, broken_tests_file_path):
147147
matching_rules = []
148148

149+
test_name = test_name.replace(".gen", "") # Remove suffix from templated tests
150+
149151
def matches_substring(substring, log, is_regex):
150152
if log is None:
151153
return False

tests/config/users.d/limits.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ profiles:
2323
max_execution_speed: 100G
2424
max_execution_speed_bytes: 10T
2525
timeout_before_checking_execution_speed: 300
26-
max_estimated_execution_time: 600
26+
max_estimated_execution_time: 1800
2727
max_columns_to_read: 20K
2828
max_temporary_columns: 20K
2929
max_temporary_non_const_columns: 20K

tests/docker_scripts/stress_runner.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ clickhouse-client --query "CREATE TABLE test.visits (CounterID UInt32, StartDat
213213
ENGINE = CollapsingMergeTree(Sign) PARTITION BY toYYYYMM(StartDate) ORDER BY (CounterID, StartDate, intHash32(UserID), VisitID)
214214
SAMPLE BY intHash32(UserID) SETTINGS index_granularity = 8192, storage_policy='$TEMP_POLICY'"
215215

216-
clickhouse-client --max_execution_time 600 --max_memory_usage 30G --max_memory_usage_for_user 30G --query "INSERT INTO test.hits_s3 SELECT * FROM datasets.hits_v1 SETTINGS enable_filesystem_cache_on_write_operations=0, max_insert_threads=16"
216+
clickhouse-client --max_execution_time 1000 --max_memory_usage 30G --max_memory_usage_for_user 30G --query "INSERT INTO test.hits_s3 SELECT * FROM datasets.hits_v1 SETTINGS enable_filesystem_cache_on_write_operations=0, max_insert_threads=16"
217217
clickhouse-client --max_execution_time 600 --max_memory_usage 30G --max_memory_usage_for_user 30G --query "INSERT INTO test.hits SELECT * FROM datasets.hits_v1 SETTINGS enable_filesystem_cache_on_write_operations=0, max_insert_threads=16"
218218
clickhouse-client --max_execution_time 600 --max_memory_usage 30G --max_memory_usage_for_user 30G --query "INSERT INTO test.visits SELECT * FROM datasets.visits_v1 SETTINGS enable_filesystem_cache_on_write_operations=0, max_insert_threads=16"
219219

0 commit comments

Comments
 (0)