Skip to content

Fix(jupyter):use non-blocking stdin check to prevent hanging #380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fix(jupyter):use non-blocking stdin check to prevent hanging #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
11ab8cf
implement non-blocking stdin check to prevent hanging
kafka1991 Sep 12, 2025
4b9bf3e
Add Jupyter notebook tests and run it in CI
kafka1991 Sep 17, 2025
7974d23
add more juper notebook tests
kafka1991 Oct 2, 2025
92dc0c4
Merge remote-tracking branch 'upstream/main' into non_blocking_stdin
kafka1991 Oct 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion .github/workflows/build_linux_arm64_wheels-gh.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ jobs:
echo "Installing dependencies for Python $version"
pyenv shell $version
python -m pip install --upgrade pip
python -m pip install setuptools tox pandas pyarrow twine psutil deltalake wheel
python -m pip install setuptools tox pandas pyarrow twine psutil deltalake wheel jupyter nbconvert
pyenv shell --unset
done
- name: Install clang++ for Ubuntu
Expand Down Expand Up @@ -250,6 +250,15 @@ jobs:
pyenv shell --unset
done
continue-on-error: false
- name: Run notebook tests
run: |
export PATH="$HOME/.pyenv/bin:$PATH"
eval "$(pyenv init -)"
pyenv shell 3.8
python -m pip install dist/*.whl --force-reinstall
jupyter nbconvert --to notebook --execute tests/test_data_insertion.ipynb --output test_data_insertion_output.ipynb
pyenv shell --unset
continue-on-error: false
- name: Check and upload core files if present
if: always()
run: |
Expand Down
11 changes: 10 additions & 1 deletion .github/workflows/build_linux_x86_wheels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ jobs:
echo "Installing dependencies for Python $version"
pyenv shell $version
python -m pip install --upgrade pip
python -m pip install setuptools tox pandas pyarrow twine psutil deltalake wheel
python -m pip install setuptools tox pandas pyarrow twine psutil deltalake wheel jupyter nbconvert
pyenv shell --unset
done
- name: Install clang++ for Ubuntu
Expand Down Expand Up @@ -249,6 +249,15 @@ jobs:
pyenv shell --unset
done
continue-on-error: false
- name: Run notebook tests
run: |
export PATH="$HOME/.pyenv/bin:$PATH"
eval "$(pyenv init -)"
pyenv shell 3.8
python -m pip install dist/*.whl --force-reinstall
jupyter nbconvert --to notebook --execute tests/test_data_insertion.ipynb --output test_data_insertion_output.ipynb
pyenv shell --unset
continue-on-error: false
- name: Check and upload core files if present
if: always()
run: |
Expand Down
11 changes: 10 additions & 1 deletion .github/workflows/build_macos_arm64_wheels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
echo "Installing dependencies for Python $version"
pyenv shell $version
python -m pip install --upgrade pip
python -m pip install setuptools wheel tox pandas pyarrow twine psutil deltalake wheel>=0.40.0
python -m pip install setuptools wheel tox pandas pyarrow twine psutil deltalake wheel>=0.40.0 jupyter nbconvert
pyenv shell --unset
done
- name: Remove /usr/local/bin/python3
Expand Down Expand Up @@ -249,6 +249,15 @@ jobs:
pyenv shell --unset
done
continue-on-error: false
- name: Run notebook tests
run: |
export PATH="$HOME/.pyenv/bin:$PATH"
eval "$(pyenv init -)"
pyenv shell 3.8
python -m pip install dist/*.whl --force-reinstall
jupyter nbconvert --to notebook --execute tests/test_data_insertion.ipynb --output test_data_insertion_output.ipynb
pyenv shell --unset
continue-on-error: false
- name: Check and upload core files if present
if: always()
run: |
Expand Down
11 changes: 10 additions & 1 deletion .github/workflows/build_macos_x86_wheels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
echo "Installing dependencies for Python $version"
pyenv shell $version
python -m pip install --upgrade pip
python -m pip install setuptools tox pandas pyarrow twine psutil deltalake wheel>=0.40.0
python -m pip install setuptools tox pandas pyarrow twine psutil deltalake wheel>=0.40.0 jupyter nbconvert
pyenv shell --unset
done
- name: Remove /usr/local/bin/python3
Expand Down Expand Up @@ -248,6 +248,15 @@ jobs:
pyenv shell --unset
done
continue-on-error: false
- name: Run notebook tests
run: |
export PATH="$HOME/.pyenv/bin:$PATH"
eval "$(pyenv init -)"
pyenv shell 3.8
python -m pip install dist/*.whl --force-reinstall
jupyter nbconvert --to notebook --execute tests/test_data_insertion.ipynb --output test_data_insertion_output.ipynb
pyenv shell --unset
continue-on-error: false
- name: Check and upload core files if present
if: always()
run: |
Expand Down
15 changes: 15 additions & 0 deletions src/Client/ClientBase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1746,6 +1746,21 @@ bool isStdinNotEmptyAndValid(ReadBuffer & std_in)
{
try
{
// Use non-blocking check for stdin to avoid hanging
if (auto * fd_buffer = typeid_cast<ReadBufferFromFileDescriptor *>(&std_in))
{
int fd = fd_buffer->getFD();
if (fd == STDIN_FILENO)
{
int flags = fcntl(fd, F_GETFL);
if (flags != -1)
{
fcntl(fd, F_SETFL, flags | O_NONBLOCK);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This changed the behavior of stdin empty check. The orginal one will block wait for data if not eol found.
I still think this mod is risky while processing large chunk of input data with slow IO.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Upon confirmation:

  • The std_in check here is only used for INSERT statements on the clickhouse-local client side; engines like CSV read do not use it for reading.

  • The interaction code between Python and C++ does not use the std_in fd

SCOPE_EXIT({ fcntl(fd, F_SETFL, flags); });
return !std_in.eof();
}
}
}
return !std_in.eof();
}
catch (const Exception & e)
Expand Down
Loading
Loading