From 13798f8b07f2550ec73323ce8596a276155aa367 Mon Sep 17 00:00:00 2001 From: Alexander Tokmakov Date: Fri, 9 Jun 2023 19:52:49 +0300 Subject: [PATCH 1/4] Update MergeTreeData.cpp --- src/Storages/MergeTree/MergeTreeData.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Storages/MergeTree/MergeTreeData.cpp b/src/Storages/MergeTree/MergeTreeData.cpp index 9cca471fddb9..23351423d496 100644 --- a/src/Storages/MergeTree/MergeTreeData.cpp +++ b/src/Storages/MergeTree/MergeTreeData.cpp @@ -1252,6 +1252,10 @@ MergeTreeData::LoadPartResult MergeTreeData::loadDataPart( mark_broken(); return res; } + catch (const Poco::TimeoutException &) + { + throw; + } catch (...) { mark_broken(); From 3797a4202cb3da6bf20684149d24931e72fbd239 Mon Sep 17 00:00:00 2001 From: Alexander Tokmakov Date: Sun, 11 Jun 2023 23:38:31 +0300 Subject: [PATCH 2/4] Update MergeTreeData.cpp --- src/Storages/MergeTree/MergeTreeData.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Storages/MergeTree/MergeTreeData.cpp b/src/Storages/MergeTree/MergeTreeData.cpp index 23351423d496..8a69c8ff75ca 100644 --- a/src/Storages/MergeTree/MergeTreeData.cpp +++ b/src/Storages/MergeTree/MergeTreeData.cpp @@ -1252,6 +1252,10 @@ MergeTreeData::LoadPartResult MergeTreeData::loadDataPart( mark_broken(); return res; } + catch (const Poco::NetException &) + { + throw; + } catch (const Poco::TimeoutException &) { throw; From 676ba2fbde78ec9ada09a45c0453e0cd96a3ab01 Mon Sep 17 00:00:00 2001 From: Alexander Tokmakov Date: Mon, 12 Jun 2023 12:30:38 +0300 Subject: [PATCH 3/4] Update MergeTreeData.cpp --- src/Storages/MergeTree/MergeTreeData.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Storages/MergeTree/MergeTreeData.cpp b/src/Storages/MergeTree/MergeTreeData.cpp index 8a69c8ff75ca..ee06056985a3 100644 --- a/src/Storages/MergeTree/MergeTreeData.cpp +++ b/src/Storages/MergeTree/MergeTreeData.cpp @@ -99,6 +99,7 @@ #include #include +#include template <> struct fmt::formatter : fmt::formatter From 5db3b393d825e5597f204b9ff2ca67abf89e4045 Mon Sep 17 00:00:00 2001 From: Alexander Tokmakov Date: Mon, 12 Jun 2023 16:22:33 +0300 Subject: [PATCH 4/4] Update MergeTreeData.cpp --- src/Storages/MergeTree/MergeTreeData.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Storages/MergeTree/MergeTreeData.cpp b/src/Storages/MergeTree/MergeTreeData.cpp index ee06056985a3..5833955726fb 100644 --- a/src/Storages/MergeTree/MergeTreeData.cpp +++ b/src/Storages/MergeTree/MergeTreeData.cpp @@ -1253,7 +1253,7 @@ MergeTreeData::LoadPartResult MergeTreeData::loadDataPart( mark_broken(); return res; } - catch (const Poco::NetException &) + catch (const Poco::Net::NetException &) { throw; }