Skip to content

Commit d4f774a

Browse files
authored
Merge pull request #10 from bdice/fix-cache-save
Fix ccache saving
2 parents 448fcb5 + 9000158 commit d4f774a

File tree

3 files changed

+69
-5
lines changed

3 files changed

+69
-5
lines changed

.github/disabled-workflows/experimental.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,12 @@ jobs:
103103
name: join
104104
path: velox/_build/debug/velox/exec/tests/velox_join_fuzzer_test
105105

106-
107106
presto-java-aggregation-fuzzer-run:
108107
runs-on: linux-amd64-cpu8
109108
container: ghcr.io/facebookincubator/velox-dev:presto-java
110109
timeout-minutes: 120
111110
env:
112-
CCACHE_DIR: "${GITHUB_WORKSPACE}/.ccache/"
111+
CCACHE_DIR: "${{ github.workspace }}/.ccache/"
113112
LINUX_DISTRO: "centos"
114113
steps:
115114

.github/disabled-workflows/scheduled.yml

Lines changed: 66 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
container: ghcr.io/facebookincubator/velox-dev:centos9
9393
timeout-minutes: 120
9494
env:
95-
CCACHE_DIR: "${GITHUB_WORKSPACE}/.ccache"
95+
CCACHE_DIR: "${{ github.workspace }}/.ccache"
9696
LINUX_DISTRO: "ubuntu"
9797
MAKEFLAGS: "NUM_THREADS=${{ inputs.numThreads || 16 }} MAX_HIGH_MEM_JOBS=${{ inputs.maxHighMemJobs || 8 }} MAX_LINK_JOBS=${{ inputs.maxLinkJobs || 4 }}"
9898

@@ -892,3 +892,68 @@ jobs:
892892
path: |
893893
/tmp/window_fuzzer_repro
894894
/tmp/server.log
895+
896+
presto-java-writer-fuzzer-run:
897+
name: Writer Fuzzer with Presto as source of truth
898+
needs: compile
899+
runs-on: ubuntu-latest
900+
container: ghcr.io/facebookincubator/velox-dev:presto-java
901+
timeout-minutes: 120
902+
env:
903+
CCACHE_DIR: "${{ github.workspace }}/.ccache/"
904+
LINUX_DISTRO: "centos"
905+
steps:
906+
907+
- name: Download writer fuzzer
908+
uses: actions/download-artifact@v4
909+
with:
910+
name: writer
911+
912+
- name: "Checkout Repo"
913+
uses: actions/checkout@v4
914+
with:
915+
path: velox
916+
submodules: 'recursive'
917+
ref: "${{ inputs.ref }}"
918+
919+
- name: Fix git permissions
920+
# Usually actions/checkout does this but as we run in a container
921+
# it doesn't work
922+
run: git config --global --add safe.directory ${GITHUB_WORKSPACE}/velox
923+
924+
- name: "Run Writer Fuzzer"
925+
run: |
926+
cd velox
927+
cp ./scripts/presto/etc/hive.properties $PRESTO_HOME/etc/catalog
928+
ls -lR $PRESTO_HOME/etc
929+
echo "jvm config content:"
930+
cat $PRESTO_HOME/etc/jvm.config
931+
$PRESTO_HOME/bin/launcher run -v > /tmp/server.log 2>&1 &
932+
ls -lR /var/log
933+
# Sleep for 60 seconds to allow Presto server to start.
934+
sleep 60
935+
/opt/presto-cli --version
936+
/opt/presto-cli --server 127.0.0.1:8080 --execute 'CREATE SCHEMA hive.tpch;'
937+
cd -
938+
mkdir -p /tmp/writer_fuzzer_repro/logs/
939+
chmod -R 777 /tmp/writer_fuzzer_repro
940+
chmod +x velox_writer_fuzzer_test
941+
./velox_writer_fuzzer_test \
942+
--seed ${RANDOM} \
943+
--duration_sec $DURATION \
944+
--minloglevel=0 \
945+
--stderrthreshold=2 \
946+
--req_timeout_ms 60000 \
947+
--log_dir=/tmp/writer_fuzzer_repro/logs \
948+
--presto_url=http://127.0.0.1:8080 \
949+
&& echo -e "\n\Writer fuzzer run finished successfully."
950+
951+
- name: Archive writer production artifacts
952+
if: ${{ !cancelled() }}
953+
uses: actions/upload-artifact@v4
954+
with:
955+
name: presto-sot-writer-fuzzer-failure-artifacts
956+
path: |
957+
/tmp/writer_fuzzer_repro
958+
/tmp/server.log
959+
/var/log

.github/workflows/linux-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
run:
4141
shell: bash
4242
env:
43-
CCACHE_DIR: "${GITHUB_WORKSPACE}/.ccache"
43+
CCACHE_DIR: "${{ github.workspace }}/.ccache"
4444
VELOX_DEPENDENCY_SOURCE: SYSTEM
4545
Protobuf_SOURCE: BUNDLED # can be removed after #10134 is merged
4646
simdjson_SOURCE: BUNDLED
@@ -109,7 +109,7 @@ jobs:
109109
# Some of the adapters dependencies are in the 'adapters' conda env
110110
shell: mamba run --no-capture-output -n adapters /usr/bin/bash -e {0}
111111
env:
112-
LIBHDFS3_CONF: "${GITHUB_WORKSPACE}/scripts/hdfs-client.xml"
112+
LIBHDFS3_CONF: "${{ github.workspace }}/scripts/hdfs-client.xml"
113113
working-directory: _build/release
114114
run: |
115115
ctest -j 8 --output-on-failure --no-tests=error -E "velox_exec_test|velox_hdfs_file_test|velox_s3"

0 commit comments

Comments
 (0)