From ba7945367ec596326c7f6b08a009581d8a695e01 Mon Sep 17 00:00:00 2001 From: Mikhail Filimonov Date: Tue, 4 May 2021 10:05:12 +0200 Subject: [PATCH 1/2] Update to librdkafka 1.6.1 --- contrib/librdkafka | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/librdkafka b/contrib/librdkafka index cf11d0aa36d..43491d33ca2 160000 --- a/contrib/librdkafka +++ b/contrib/librdkafka @@ -1 +1 @@ -Subproject commit cf11d0aa36d4738f2c9bf4377807661660f1be76 +Subproject commit 43491d33ca2826531d1e3cae70d4bf1e5249e3c9 From 80065b08f8182936ac57408bd84492d95f2322c1 Mon Sep 17 00:00:00 2001 From: Mikhail Filimonov Date: Tue, 4 May 2021 10:06:33 +0200 Subject: [PATCH 2/2] Revert "avoid race in librdkafka" This reverts commit bd8c3eb117ad6638ea165391e68b9831dfd6b201. --- tests/integration/test_storage_kafka/test.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/integration/test_storage_kafka/test.py b/tests/integration/test_storage_kafka/test.py index 04a78c5f2c4..8bb36cfa8fd 100644 --- a/tests/integration/test_storage_kafka/test.py +++ b/tests/integration/test_storage_kafka/test.py @@ -2467,8 +2467,6 @@ def test_kafka_issue14202(kafka_cluster): kafka_format = 'JSONEachRow'; ''') - time.sleep(3) - instance.query( 'INSERT INTO test.kafka_q SELECT t, some_string FROM ( SELECT dt AS t, some_string FROM test.empty_table )') # check instance is alive