thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 07:31:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

better

Browse Source
This commit is contained in:
Nikita Taranov 2024-08-05 21:49:36 +01:00
parent 51918dc080
commit cb6baefa94
4 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Common/ShellCommand.cpp
View File

@ -239,7 +239,7 @@ std::unique_ptr<ShellCommand> ShellCommand::executeImpl(
LOG_TRACE(
getLogger(),
"Started shell command '{}' with pid {} and file descriptors: read {}, write {}",
"Started shell command '{}' with pid {} and file descriptors: out {}, err {}",
filename,
pid,
res->out.getFD(),

12
src/Processors/Sources/ShellCommandSource.cpp
View File

@ -76,13 +76,11 @@ static int pollWithTimeout(pollfd * pfds, size_t num, size_t timeout_millisecond
{
Stopwatch watch;
#if defined(DEBUG_OR_SANITIZER_BUILD)
auto describe_fd = [](const auto & pollfd) { return fmt::format("(fd={}, flags={})", pollfd.fd, fcntl(pollfd.fd, F_GETFL)); };
LOG_TRACE(
LOG_TEST(
getLogger("TimeoutReadBufferFromFileDescriptor"),
"Polling descriptors: {}",
fmt::join(std::span(pfds, pfds + num) | std::views::transform(describe_fd), ", "));
#endif
res = poll(pfds, static_cast<nfds_t>(num), static_cast<int>(timeout_milliseconds));
@ -94,13 +92,11 @@ static int pollWithTimeout(pollfd * pfds, size_t num, size_t timeout_millisecond
const auto elapsed = watch.elapsedMilliseconds();
if (timeout_milliseconds <= elapsed)
{
#if defined(DEBUG_OR_SANITIZER_BUILD)
LOG_TRACE(
LOG_TEST(
getLogger("TimeoutReadBufferFromFileDescriptor"),
"Timeout exceeded: elapsed={}, timeout={}",
elapsed,
timeout_milliseconds);
#endif
break;
}
timeout_milliseconds -= elapsed;
@ -111,14 +107,12 @@ static int pollWithTimeout(pollfd * pfds, size_t num, size_t timeout_millisecond
}
}
#if defined(DEBUG_OR_SANITIZER_BUILD)
auto describe_fd = [](const auto & pollfd) { return fmt::format("(fd={}, flags={})", pollfd.fd, fcntl(pollfd.fd, F_GETFL)); };
LOG_TRACE(
LOG_TEST(
getLogger("TimeoutReadBufferFromFileDescriptor"),
"Poll for descriptors: {} returned {}",
fmt::join(std::span(pfds, pfds + num) | std::views::transform(describe_fd), ", "),
res);
#endif
return res;
}

2
tests/integration/test_executable_dictionary/test.py
View File

@ -235,7 +235,6 @@ def test_executable_implicit_input_signalled_python(started_cluster):
)
@pytest.mark.repeat(50)
def test_executable_input_slow_python(started_cluster):
skip_test_msan(node)
assert node.query_and_get_error(
@ -246,7 +245,6 @@ def test_executable_input_slow_python(started_cluster):
)
@pytest.mark.repeat(50)
def test_executable_implicit_input_slow_python(started_cluster):
skip_test_msan(node)
assert node.query_and_get_error(

1
tests/integration/test_executable_table_function/test.py
View File

@ -139,7 +139,6 @@ def test_executable_function_input_signalled_python(started_cluster):
assert node.query(query.format(source="(SELECT id FROM test_data_table)")) == ""
@pytest.mark.repeat(50)
def test_executable_function_input_slow_python(started_cluster):
skip_test_msan(node)