Skip to content
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.

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

BUG: Try to fix tests hanging #301

Draft
wants to merge 7 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
38 changes: 19 additions & 19 deletions .github/workflows/python.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,26 +71,26 @@ jobs:
strategy:
fail-fast: false
matrix:
os: ["ubuntu-latest", "macos-latest", "windows-latest"]
python-version: ["3.8", "3.9", "3.10", "3.11"]
module: ["xorbits", "kubernetes"]
exclude:
- { os: macos-latest, python-version: 3.10}
- { os: macos-latest, python-version: 3.9}
- { os: windows-latest, python-version: 3.10}
- { os: windows-latest, python-version: 3.9}
- { os: windows-latest, module: kubernetes}
- { os: macos-latest, module: kubernetes}
# os: ["ubuntu-latest", "macos-latest", "windows-latest"]
# python-version: ["3.8", "3.9", "3.10", "3.11"]
# module: ["xorbits", "kubernetes"]
# exclude:
# - { os: macos-latest, python-version: 3.10}
# - { os: macos-latest, python-version: 3.9}
# - { os: windows-latest, python-version: 3.10}
# - { os: windows-latest, python-version: 3.9}
# - { os: windows-latest, module: kubernetes}
# - { os: macos-latest, module: kubernetes}
include:
- { os: ubuntu-latest, module: _mars/dataframe, python-version: 3.9 }
- { os: ubuntu-latest, module: _mars/tensor, python-version: 3.9 }
- { os: ubuntu-latest, module: _mars/learn, python-version: 3.9 }
- { os: ubuntu-latest, module: mars-core, python-version: 3.9 }
- { os: ubuntu-20.04, module: hadoop, python-version: 3.9 }
- { os: ubuntu-latest, module: vineyard, python-version: 3.9 }
- { os: ubuntu-latest, module: external-storage, python-version: 3.9 }
- { os: ubuntu-latest, module: pandas-1.0, python-version: 3.9 }
- { os: self-hosted, module: gpu, python-version: 3.9}
- { os: macos-latest, python-version: 3.8}
# - { os: ubuntu-latest, module: _mars/tensor, python-version: 3.9 }
# - { os: ubuntu-latest, module: _mars/learn, python-version: 3.9 }
# - { os: ubuntu-latest, module: mars-core, python-version: 3.9 }
# - { os: ubuntu-20.04, module: hadoop, python-version: 3.9 }
# - { os: ubuntu-latest, module: vineyard, python-version: 3.9 }
# - { os: ubuntu-latest, module: external-storage, python-version: 3.9 }
# - { os: ubuntu-latest, module: pandas-1.0, python-version: 3.9 }
# - { os: self-hosted, module: gpu, python-version: 3.9}
steps:
- name: Check out code
uses: actions/checkout@v3
Expand Down
13 changes: 5 additions & 8 deletions python/xorbits/_mars/services/storage/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -641,14 +641,11 @@ async def upload_storage_info(self):
await self._cluster_api.set_band_storage_info.batch(*upload_tasks)
except asyncio.CancelledError: # pragma: no cover
break
except RuntimeError as ex: # pragma: no cover
if (
"cannot schedule new futures after interpreter shutdown"
not in str(ex)
):
# when atexit is triggered, the default pool might be shutdown
# and to_thread will fail
break
except (
Exception
) as ex: # pragma: no cover # noqa: E722 # nosec # pylint: disable=bare-except
logger.error(f"Failed to upload storage info: {ex}")
break
await asyncio.sleep(0.5)

async def upload_disk_info(self):
Expand Down
4 changes: 3 additions & 1 deletion python/xorbits/core/tests/test_execution.py
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,9 @@ def test_array_conversion(setup):
def ip():
from IPython.testing.globalipapp import start_ipython

yield start_ipython()
ip = start_ipython()
yield ip
ip.run_cell("exit")


def test_interactive_execution(setup, ip):
Expand Down