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

[CELEBORN] Support celeborn 0.5.0 #6264

Merged
merged 1 commit into from
Jul 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions .github/workflows/velox_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ jobs:
fail-fast: false
matrix:
spark: [ "spark-3.2" ]
celeborn: [ "celeborn-0.4.1", "celeborn-0.3.2-incubating" ]
celeborn: [ "celeborn-0.5.0", "celeborn-0.4.1", "celeborn-0.3.2-incubating" ]
Copy link
Contributor

@PHILO-HE PHILO-HE Jul 3, 2024

Choose a reason for hiding this comment

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

Nit:
Suggest to change it to [ "celeborn-0.5", "celeborn-0.4", "celeborn-0.3" ], consistent with profile name. Maybe, need to add celeborn-0.3 profile in pom.

Then, EXTRA_PROFILE="-P${{ matrix.celeborn }}" and let pom determine which specific version will be used.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The workflow requires a download link based on the specific version to deploy the celeborn service, then we should have to use the version instead of profile id.

Copy link
Contributor

Choose a reason for hiding this comment

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

@yikf, I see. Thanks!

runs-on: ubuntu-20.04
container: ubuntu:22.04
steps:
Expand Down Expand Up @@ -563,8 +563,10 @@ jobs:
- name: TPC-H SF1.0 && TPC-DS SF1.0 Parquet local spark3.2 with ${{ matrix.celeborn }}
run: |
EXTRA_PROFILE=""
if [ "${{ matrix.celeborn }}" = "celeborn-0.4.0" ]; then
if [ "${{ matrix.celeborn }}" = "celeborn-0.4.1" ]; then
EXTRA_PROFILE="-Pceleborn-0.4"
elif [ "${{ matrix.celeborn }}" = "celeborn-0.5.0" ]; then
EXTRA_PROFILE="-Pceleborn-0.5"
fi
echo "EXTRA_PROFILE: ${EXTRA_PROFILE}"
cd /opt && mkdir -p celeborn && \
Expand Down
2 changes: 1 addition & 1 deletion docs/get-started/ClickHouse.md
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,7 @@ public read-only account:gluten/hN2xX3uQ4m

### Celeborn support

Gluten with clickhouse backend supports [Celeborn](https://github.com/apache/celeborn) as remote shuffle service. Currently, the supported Celeborn versions are `0.3.x` and `0.4.0`.
Gluten with clickhouse backend supports [Celeborn](https://github.com/apache/celeborn) as remote shuffle service. Currently, the supported Celeborn versions are `0.3.x`, `0.4.x` and `0.5.0`.

Below introduction is used to enable this feature.

Expand Down
2 changes: 1 addition & 1 deletion docs/get-started/Velox.md
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ Currently there are several ways to asscess S3 in Spark. Please refer [Velox S3]

## Celeborn support

Gluten with velox backend supports [Celeborn](https://github.com/apache/celeborn) as remote shuffle service. Currently, the supported Celeborn versions are `0.3.x` and `0.4.0`.
Gluten with velox backend supports [Celeborn](https://github.com/apache/celeborn) as remote shuffle service. Currently, the supported Celeborn versions are `0.3.x`, `0.4.x` and `0.5.0`.

Below introduction is used to enable this feature.

Expand Down
6 changes: 6 additions & 0 deletions tools/gluten-it/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -170,5 +170,11 @@
<celeborn.version>0.4.1</celeborn.version>
</properties>
</profile>
<profile>
<id>celeborn-0.5</id>
<properties>
<celeborn.version>0.5.0</celeborn.version>
</properties>
</profile>
</profiles>
</project>
Loading