@@ -555,7 +555,8 @@ jobs:
555555 fail-fast : false
556556 matrix :
557557 spark : [ "spark-3.2" ]
558- celeborn : [ "celeborn-0.6.1", "celeborn-0.5.4", "celeborn-0.4.3"]
558+ celeborn : [ "celeborn-0.6.1", "celeborn-0.5.4"]
559+ writer : [ "sort", "hash"]
559560 runs-on : ubuntu-22.04
560561 container : apache/gluten:centos-8-jdk8
561562 steps :
@@ -577,9 +578,7 @@ jobs:
577578 - name : TPC-H SF1.0 && TPC-DS SF1.0 Parquet local spark3.2 with ${{ matrix.celeborn }}
578579 run : |
579580 EXTRA_PROFILE=""
580- if [ "${{ matrix.celeborn }}" = "celeborn-0.4.3" ]; then
581- EXTRA_PROFILE="-Pceleborn-0.4"
582- elif [ "${{ matrix.celeborn }}" = "celeborn-0.5.4" ]; then
581+ if [ "${{ matrix.celeborn }}" = "celeborn-0.5.4" ]; then
583582 EXTRA_PROFILE="-Pceleborn-0.5"
584583 elif [ "${{ matrix.celeborn }}" = "celeborn-0.6.1" ]; then
585584 EXTRA_PROFILE="-Pceleborn-0.6"
@@ -592,23 +591,31 @@ jobs:
592591 cd /opt && mkdir -p celeborn && \
593592 tar xzf apache-${{ matrix.celeborn }}-bin.tgz -C /opt/celeborn --strip-components=1 && cd celeborn && \
594593 mv ./conf/celeborn-env.sh.template ./conf/celeborn-env.sh && \
595- bash -c "echo -e 'CELEBORN_MASTER_MEMORY=4g \nCELEBORN_WORKER_MEMORY=4g \nCELEBORN_WORKER_OFFHEAP_MEMORY=8g ' > ./conf/celeborn-env.sh" && \
596- bash -c "echo -e 'celeborn.worker.commitFiles.threads 128 \nceleborn.worker.sortPartition.threads 64 ' > ./conf/celeborn-defaults.conf" && \
594+ bash -c "echo -e 'CELEBORN_MASTER_MEMORY=8g \nCELEBORN_WORKER_MEMORY=8g \nCELEBORN_WORKER_OFFHEAP_MEMORY=16g ' > ./conf/celeborn-env.sh" && \
595+ bash -c "echo -e 'celeborn.worker.commitFiles.threads 32 \nceleborn.worker.sortPartition.threads 16 ' > ./conf/celeborn-defaults.conf" && \
597596 bash ./sbin/start-master.sh && bash ./sbin/start-worker.sh && \
598597 cd $GITHUB_WORKSPACE/tools/gluten-it && $MVN_CMD clean install -Pspark-3.2 -Pceleborn ${EXTRA_PROFILE} && \
599- GLUTEN_IT_JVM_ARGS=-Xmx10G sbin/gluten-it.sh queries-compare \
600- --local --preset=velox-with-celeborn --benchmark-type=h --error-on-memleak --off-heap-size=10g -s=1.0 --threads=8 --iterations=1 && \
601- GLUTEN_IT_JVM_ARGS=-Xmx10G sbin/gluten-it.sh queries-compare \
602- --local --preset=velox-with-celeborn --benchmark-type=ds --error-on-memleak --off-heap-size=10g -s=1.0 --threads=8 --iterations=1 && \
603- GLUTEN_IT_JVM_ARGS=-Xmx10G sbin/gluten-it.sh queries-compare \
604- --local --preset=velox-with-celeborn --extra-conf=spark.celeborn.client.spark.shuffle.writer=sort \
605- --extra-conf=spark.celeborn.push.sortMemory.threshold=8m --benchmark-type=ds --error-on-memleak \
606- --off-heap-size=10g -s=1.0 --threads=8 --iterations=1
607- GLUTEN_IT_JVM_ARGS=-Xmx10G sbin/gluten-it.sh queries-compare \
608- --local --preset=velox-with-celeborn --extra-conf=spark.celeborn.client.spark.shuffle.writer=sort \
609- --extra-conf=spark.gluten.sql.columnar.shuffle.celeborn.useRssSort=false \
610- --extra-conf=spark.celeborn.push.sortMemory.threshold=8m --benchmark-type=ds --error-on-memleak \
611- --off-heap-size=10g -s=1.0 --threads=8 --iterations=1
598+ GLUTEN_IT_JVM_ARGS=-Xmx16G sbin/gluten-it.sh queries-compare \
599+ --extra-conf=spark.celeborn.client.spark.shuffle.writer=${{ matrix.writer }} \
600+ --extra-conf=spark.sql.shuffle.partitions=16 \
601+ --extra-conf=spark.celeborn.client.eagerlyCreateInputStream.threads=4 \
602+ --local --preset=velox-with-celeborn --benchmark-type=h --error-on-memleak --off-heap-size=16g -s=1.0 --threads=16 --iterations=1 && \
603+ GLUTEN_IT_JVM_ARGS=-Xmx16G sbin/gluten-it.sh queries-compare \
604+ --local --preset=velox-with-celeborn --extra-conf=spark.celeborn.client.spark.shuffle.writer=${{ matrix.writer }} \
605+ --extra-conf=spark.gluten.sql.columnar.shuffle.celeborn.useRssSort=true \
606+ --extra-conf=spark.sql.shuffle.partitions=16 \
607+ --extra-conf=spark.celeborn.client.eagerlyCreateInputStream.threads=4 \
608+ --benchmark-type=ds --error-on-memleak \
609+ --off-heap-size=16g -s=1.0 --threads=16 --iterations=1
610+ if [ "${{ matrix.writer }}" = "sort" ]; then
611+ GLUTEN_IT_JVM_ARGS=-Xmx16G sbin/gluten-it.sh queries-compare \
612+ --local --preset=velox-with-celeborn --extra-conf=spark.celeborn.client.spark.shuffle.writer=${{ matrix.writer }} \
613+ --extra-conf=spark.gluten.sql.columnar.shuffle.celeborn.useRssSort=false \
614+ --extra-conf=spark.celeborn.client.eagerlyCreateInputStream.threads=4 \
615+ --extra-conf=spark.sql.shuffle.partitions=16 \
616+ --benchmark-type=ds --error-on-memleak \
617+ --off-heap-size=16g -s=1.0 --threads=16 --iterations=1
618+ fi
612619
613620 spark-test-spark32 :
614621 needs : build-native-lib-centos-7
0 commit comments