Skip to content

Commit

Permalink
Run test cases on hns
Browse files Browse the repository at this point in the history
  • Loading branch information
yanghua committed Nov 4, 2024
1 parent 0dc60a2 commit 7ba7afe
Show file tree
Hide file tree
Showing 3 changed files with 74 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

name: CI
name: CI-FNS

on:
push:
Expand All @@ -36,7 +36,7 @@ jobs:
matrix:
python-version: ["3.9", "3.10", "3.11", "3.12"]
fsspec-version: ["2023.5.0", "2024.9.0", "2024.10.0"]
bucket-name: ["proton-ci", "proton-ci-hns"]
bucket-name: ["proton-ci"]
steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
Expand Down
66 changes: 66 additions & 0 deletions .github/workflows/ci_hns.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
# ByteDance Volcengine EMR, Copyright 2024.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

name: CI-HNS

on:
push:
paths-ignore:
- '*.md'
- 'README.md'
- 'pyproject.toml'
- 'poetry.lock'
- 'Makefile'
- 'LICENSE'
- '.github/ISSUE_TEMPLATE/**'
- '.gitignore'
- 'docs/**'
- 'examples/**'

jobs:
build:
runs-on: ubuntu-latest
timeout-minutes: 60
strategy:
matrix:
python-version: ["3.9", "3.10", "3.11", "3.12"]
fsspec-version: ["2023.5.0", "2024.9.0", "2024.10.0"]
bucket-name: ["proton-ci-hns"]
steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
set -x
python -m pip install --upgrade pip
pip install --user poetry
poetry lock
poetry install --with dev
poetry add fsspec==${{ matrix.fsspec-version }}
poetry show fsspec
- name: Prepare Env
run: |
echo "Preparing environment variables"
echo "TOS_ACCESS_KEY=${{ secrets.TOS_ACCESS_KEY }}" >> $GITHUB_ENV
echo "TOS_SECRET_KEY=${{ secrets.TOS_SECRET_KEY }}" >> $GITHUB_ENV
echo "TOS_REGION=${{ vars.TOS_REGION }}" >> $GITHUB_ENV
echo "TOS_ENDPOINT=${{ vars.TOS_ENDPOINT }}" >> $GITHUB_ENV
echo "TOSFS_LOGGING_LEVEL=${{ vars.TOSFS_LOGGING_LEVEL }}" >> $GITHUB_ENV
echo "TOS_SDK_LOGGING_LEVEL=${{ vars.TOS_SDK_LOGGING_LEVEL }}" >> $GITHUB_ENV
echo "TOS_BUCKET=${{ matrix.bucket-name }}" >> $GITHUB_ENV
- name: Run tests
run: make test
10 changes: 6 additions & 4 deletions tosfs/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -857,9 +857,9 @@ def isdir(self, path: str) -> bool:
raise e
except TosServerError as e:
if e.status_code == TOS_SERVER_STATUS_CODE_NOT_FOUND or (
self._get_bucket_type(bucket) == TOS_BUCKET_TYPE_HNS
and e.status_code == CONFLICT_CODE
and e.header._store["x-tos-ec"][1] == "0026-00000020"
self._get_bucket_type(bucket) == TOS_BUCKET_TYPE_HNS
and e.status_code == CONFLICT_CODE
and e.header._store["x-tos-ec"][1] == "0026-00000020"
):
out = retryable_func_executor(
lambda: self.tos_client.list_objects_type2(
Expand Down Expand Up @@ -1775,7 +1775,9 @@ def _open_remote_file(
except TosServerError as e:
if e.status_code == INVALID_RANGE_CODE:
obj_info = self._object_info(bucket=bucket, key=key)
if obj_info["size"] == 0 or range_start == obj_info["size"]:
if obj_info and (
obj_info["size"] == 0 or range_start == obj_info["size"]
):
return io.BytesIO(), 0
else:
raise e
Expand Down

0 comments on commit 7ba7afe

Please sign in to comment.