From 9456a139247450ab0c170adb61e985315daefb5a Mon Sep 17 00:00:00 2001 From: yfeng Date: Tue, 20 Sep 2022 00:35:50 +0800 Subject: [PATCH] Revert "fdb : remove fdb cli" This reverts commit ada019e0eb7cfada340f342636cc288b984820c9. --- .github/actions/clickhouse/action.yml | 6 ++++++ .github/actions/fio/action.yml | 6 ++++++ .github/actions/gateway/action.yml | 5 +++++ .github/actions/load/action.yml | 6 ++++++ .github/actions/rmr/action.yml | 5 +++++ .github/actions/sysbenchrndrw/action.yml | 5 +++++ .github/actions/sysbenchseqrw/action.yml | 6 ++++++ .github/actions/vdbench/action.yml | 6 ++++++ .github/actions/version-compatible/action.yml | 5 +++++ .github/workflows/aitests.yml | 5 +++++ .github/workflows/aitests_limitcache.yml | 5 +++++ .github/workflows/config.yml | 4 ++++ .github/workflows/elastictest.yml | 5 +++++ .github/workflows/encoding_mysql.yml | 5 +++++ .github/workflows/format.yml | 5 +++++ .github/workflows/gateway.yml | 5 +++++ .github/workflows/gc.yml | 5 +++++ .github/workflows/integrationtests.yml | 4 ++++ .github/workflows/ltpfs.yml | 5 +++++ .github/workflows/ltpsyscallshead.yml | 4 ++++ .github/workflows/ltpsyscallsmiddle.yml | 5 +++++ .github/workflows/ltpsyscallstail.yml | 5 +++++ .github/workflows/mdtest.yml | 5 +++++ .github/workflows/mongodb_mmap.yml | 5 +++++ .github/workflows/mysqltest_bigtable.yml | 5 +++++ .github/workflows/mysqltest_smalltable.yml | 5 +++++ .github/workflows/pjdfstest.yml | 5 +++++ .github/workflows/redis_compile.yml | 5 +++++ .github/workflows/sdktest.yml | 5 +++++ .github/workflows/sync.yml | 9 +++++++++ .github/workflows/tpcds.yml | 5 +++++ .github/workflows/verify.yml | 9 +++++++++ 32 files changed, 170 insertions(+) diff --git a/.github/actions/clickhouse/action.yml b/.github/actions/clickhouse/action.yml index f0f37dc2e56b1..f0708ad8a25a0 100644 --- a/.github/actions/clickhouse/action.yml +++ b/.github/actions/clickhouse/action.yml @@ -26,6 +26,12 @@ runs: restore-keys: | ${{ runner.os }}-go- + - name: Install Fdb C Lib + shell: bash + run: | + wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients_6.3.23-1_amd64.deb + sudo dpkg -i foundationdb-clients_6.3.23-1_amd64.deb + - name: Build linux target shell: bash run: make juicefs diff --git a/.github/actions/fio/action.yml b/.github/actions/fio/action.yml index 806b822e97955..f8ba5ff59e698 100644 --- a/.github/actions/fio/action.yml +++ b/.github/actions/fio/action.yml @@ -77,6 +77,12 @@ runs: key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} restore-keys: | ${{ runner.os }}-go- + + - name: Install Fdb C Lib + shell: bash + run: | + wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients_6.3.23-1_amd64.deb + sudo dpkg -i foundationdb-clients_6.3.23-1_amd64.deb - name: Build linux target run: | diff --git a/.github/actions/gateway/action.yml b/.github/actions/gateway/action.yml index e7d2d2b8e9e91..7e4d93b07f610 100644 --- a/.github/actions/gateway/action.yml +++ b/.github/actions/gateway/action.yml @@ -51,6 +51,11 @@ runs: key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} restore-keys: | ${{ runner.os }}-go- + - name: Install Fdb C Lib + shell: bash + run: | + wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients_6.3.23-1_amd64.deb + sudo dpkg -i foundationdb-clients_6.3.23-1_amd64.deb - name: Build linux target run: | diff --git a/.github/actions/load/action.yml b/.github/actions/load/action.yml index 5bd93178abf58..3b4f8f7a0d886 100644 --- a/.github/actions/load/action.yml +++ b/.github/actions/load/action.yml @@ -27,6 +27,12 @@ runs: restore-keys: | ${{ runner.os }}-go- + - name: Install Fdb C Lib + shell: bash + run: | + wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients_6.3.23-1_amd64.deb + sudo dpkg -i foundationdb-clients_6.3.23-1_amd64.deb + - name: Build linux target run: | make juicefs diff --git a/.github/actions/rmr/action.yml b/.github/actions/rmr/action.yml index 233554cf32503..19bd5fabdeea5 100644 --- a/.github/actions/rmr/action.yml +++ b/.github/actions/rmr/action.yml @@ -30,6 +30,11 @@ runs: key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} restore-keys: | ${{ runner.os }}-go- + - name: Install Fdb C Lib + shell: bash + run: | + wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients_6.3.23-1_amd64.deb + sudo dpkg -i foundationdb-clients_6.3.23-1_amd64.deb - name: Build linux target run: | diff --git a/.github/actions/sysbenchrndrw/action.yml b/.github/actions/sysbenchrndrw/action.yml index c811cae555e8b..effc84593c9c8 100644 --- a/.github/actions/sysbenchrndrw/action.yml +++ b/.github/actions/sysbenchrndrw/action.yml @@ -25,6 +25,11 @@ runs: key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} restore-keys: | ${{ runner.os }}-go- + - name: Install Fdb C Lib + shell: bash + run: | + wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients_6.3.23-1_amd64.deb + sudo dpkg -i foundationdb-clients_6.3.23-1_amd64.deb - name: Build linux target shell: bash diff --git a/.github/actions/sysbenchseqrw/action.yml b/.github/actions/sysbenchseqrw/action.yml index 8e149fba2bc89..2dd1170e64515 100644 --- a/.github/actions/sysbenchseqrw/action.yml +++ b/.github/actions/sysbenchseqrw/action.yml @@ -26,6 +26,12 @@ runs: restore-keys: | ${{ runner.os }}-go- + - name: Install Fdb C Lib + shell: bash + run: | + wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients_6.3.23-1_amd64.deb + sudo dpkg -i foundationdb-clients_6.3.23-1_amd64.deb + - name: Build linux target shell: bash run: make juicefs diff --git a/.github/actions/vdbench/action.yml b/.github/actions/vdbench/action.yml index 1a5eef345727a..d318f8ba58ba4 100644 --- a/.github/actions/vdbench/action.yml +++ b/.github/actions/vdbench/action.yml @@ -74,6 +74,12 @@ runs: restore-keys: | ${{ runner.os }}-go- + - name: Install Fdb C Lib + shell: bash + run: | + wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients_6.3.23-1_amd64.deb + sudo dpkg -i foundationdb-clients_6.3.23-1_amd64.deb + - name: Build linux target shell: bash run: | diff --git a/.github/actions/version-compatible/action.yml b/.github/actions/version-compatible/action.yml index 0c2e7ba4fdd46..fa1b88aeed78d 100644 --- a/.github/actions/version-compatible/action.yml +++ b/.github/actions/version-compatible/action.yml @@ -41,6 +41,11 @@ runs: with: go-version: '1.18.x' + - name: Install Fdb C Lib + shell: bash + run: | + wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients_6.3.23-1_amd64.deb + sudo dpkg -i foundationdb-clients_6.3.23-1_amd64.deb - name: Build linux target run: | diff --git a/.github/workflows/aitests.yml b/.github/workflows/aitests.yml index e4e06661d7a1f..2eb6a252a8da5 100644 --- a/.github/workflows/aitests.yml +++ b/.github/workflows/aitests.yml @@ -43,6 +43,11 @@ jobs: restore-keys: | ${{ runner.os }}-go- + - name: Install Fdb C Lib + run: | + wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients_6.3.23-1_amd64.deb + sudo dpkg -i foundationdb-clients_6.3.23-1_amd64.deb + - name: Build linux target run: | make juicefs diff --git a/.github/workflows/aitests_limitcache.yml b/.github/workflows/aitests_limitcache.yml index cc47af3bb33cd..6d917612baaad 100644 --- a/.github/workflows/aitests_limitcache.yml +++ b/.github/workflows/aitests_limitcache.yml @@ -43,6 +43,11 @@ jobs: restore-keys: | ${{ runner.os }}-go- + - name: Install Fdb C Lib + run: | + wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients_6.3.23-1_amd64.deb + sudo dpkg -i foundationdb-clients_6.3.23-1_amd64.deb + - name: Build linux target run: | make juicefs diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml index e944279277504..2d874b2ac7c43 100644 --- a/.github/workflows/config.yml +++ b/.github/workflows/config.yml @@ -53,6 +53,10 @@ jobs: with: go-version: '1.18.x' + - name: Install Fdb C Lib + run: | + wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients_6.3.23-1_amd64.deb + sudo dpkg -i foundationdb-clients_6.3.23-1_amd64.deb - uses: actions/cache@v3 with: diff --git a/.github/workflows/elastictest.yml b/.github/workflows/elastictest.yml index c3b4cc0168381..4465347e16450 100644 --- a/.github/workflows/elastictest.yml +++ b/.github/workflows/elastictest.yml @@ -42,6 +42,11 @@ jobs: key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} restore-keys: | ${{ runner.os }}-go- + + - name: Install Fdb C Lib + run: | + wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients_6.3.23-1_amd64.deb + sudo dpkg -i foundationdb-clients_6.3.23-1_amd64.deb - name: Build linux target run: make juicefs diff --git a/.github/workflows/encoding_mysql.yml b/.github/workflows/encoding_mysql.yml index f722237c333e4..13f0755e73d43 100644 --- a/.github/workflows/encoding_mysql.yml +++ b/.github/workflows/encoding_mysql.yml @@ -49,6 +49,11 @@ jobs: restore-keys: | ${{ runner.os }}-go- + - name: Install Fdb C Lib + run: | + wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients_6.3.23-1_amd64.deb + sudo dpkg -i foundationdb-clients_6.3.23-1_amd64.deb + - name: Build linux target run: | url=https://github.com/juicedata/juicefs/releases/download/v1.0.0-beta2/juicefs-1.0.0-beta2-linux-amd64.tar.gz diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index 057e158d82301..6f7d59ac714c1 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -52,6 +52,11 @@ jobs: restore-keys: | ${{ runner.os }}-go- + - name: Install Fdb C Lib + run: | + wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients_6.3.23-1_amd64.deb + sudo dpkg -i foundationdb-clients_6.3.23-1_amd64.deb + - name: Build linux target run: make juicefs diff --git a/.github/workflows/gateway.yml b/.github/workflows/gateway.yml index 1aff319be70eb..7d0a781eb190f 100644 --- a/.github/workflows/gateway.yml +++ b/.github/workflows/gateway.yml @@ -535,6 +535,11 @@ jobs: key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} restore-keys: | ${{ runner.os }}-go- + + - name: Install Fdb C Lib + run: | + wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients_6.3.23-1_amd64.deb + sudo dpkg -i foundationdb-clients_6.3.23-1_amd64.deb - name: Build linux target run: | diff --git a/.github/workflows/gc.yml b/.github/workflows/gc.yml index d4f680e0b11b9..2d3f5f703683a 100644 --- a/.github/workflows/gc.yml +++ b/.github/workflows/gc.yml @@ -50,6 +50,11 @@ jobs: restore-keys: | ${{ runner.os }}-go- + - name: Install Fdb C Lib + run: | + wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients_6.3.23-1_amd64.deb + sudo dpkg -i foundationdb-clients_6.3.23-1_amd64.deb + - name: Build linux target run: make juicefs diff --git a/.github/workflows/integrationtests.yml b/.github/workflows/integrationtests.yml index 6b7e773934bb1..7d6a6747a086a 100644 --- a/.github/workflows/integrationtests.yml +++ b/.github/workflows/integrationtests.yml @@ -45,6 +45,10 @@ jobs: restore-keys: | ${{ runner.os }}-go- + - name: Install Fdb C Lib + run: | + wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients_6.3.23-1_amd64.deb + sudo dpkg -i foundationdb-clients_6.3.23-1_amd64.deb - name: Build linux target run: | diff --git a/.github/workflows/ltpfs.yml b/.github/workflows/ltpfs.yml index c7dd5162aa83b..b150a5ee9d9ce 100644 --- a/.github/workflows/ltpfs.yml +++ b/.github/workflows/ltpfs.yml @@ -42,6 +42,11 @@ jobs: restore-keys: | ${{ runner.os }}-go- + - name: Install Fdb C Lib + run: | + wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients_6.3.23-1_amd64.deb + sudo dpkg -i foundationdb-clients_6.3.23-1_amd64.deb + - name: Build linux target run: | make juicefs diff --git a/.github/workflows/ltpsyscallshead.yml b/.github/workflows/ltpsyscallshead.yml index 23e98f88eacca..bdd85568f738e 100644 --- a/.github/workflows/ltpsyscallshead.yml +++ b/.github/workflows/ltpsyscallshead.yml @@ -42,6 +42,10 @@ jobs: restore-keys: | ${{ runner.os }}-go- + - name: Install Fdb C Lib + run: | + wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients_6.3.23-1_amd64.deb + sudo dpkg -i foundationdb-clients_6.3.23-1_amd64.deb - name: Build linux target run: | diff --git a/.github/workflows/ltpsyscallsmiddle.yml b/.github/workflows/ltpsyscallsmiddle.yml index 63a883d0f4470..eb7d9a3c42adb 100644 --- a/.github/workflows/ltpsyscallsmiddle.yml +++ b/.github/workflows/ltpsyscallsmiddle.yml @@ -42,6 +42,11 @@ jobs: restore-keys: | ${{ runner.os }}-go- + - name: Install Fdb C Lib + run: | + wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients_6.3.23-1_amd64.deb + sudo dpkg -i foundationdb-clients_6.3.23-1_amd64.deb + - name: Build linux target run: | make juicefs diff --git a/.github/workflows/ltpsyscallstail.yml b/.github/workflows/ltpsyscallstail.yml index aa657a5a19d78..34cc9a032bfe0 100644 --- a/.github/workflows/ltpsyscallstail.yml +++ b/.github/workflows/ltpsyscallstail.yml @@ -42,6 +42,11 @@ jobs: restore-keys: | ${{ runner.os }}-go- + - name: Install Fdb C Lib + run: | + wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients_6.3.23-1_amd64.deb + sudo dpkg -i foundationdb-clients_6.3.23-1_amd64.deb + - name: Build linux target run: | make juicefs diff --git a/.github/workflows/mdtest.yml b/.github/workflows/mdtest.yml index 677d38d0867c3..52031ec6818e5 100644 --- a/.github/workflows/mdtest.yml +++ b/.github/workflows/mdtest.yml @@ -49,6 +49,11 @@ jobs: restore-keys: | ${{ runner.os }}-go- + - name: Install Fdb C Lib + run: | + wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients_6.3.23-1_amd64.deb + sudo dpkg -i foundationdb-clients_6.3.23-1_amd64.deb + - name: Build linux target run: | export GOPATH=/usr/local/go diff --git a/.github/workflows/mongodb_mmap.yml b/.github/workflows/mongodb_mmap.yml index 9a18826f8f3a6..b3e649813b608 100644 --- a/.github/workflows/mongodb_mmap.yml +++ b/.github/workflows/mongodb_mmap.yml @@ -46,6 +46,11 @@ jobs: restore-keys: | ${{ runner.os }}-go- + - name: Install Fdb C Lib + run: | + wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients_6.3.23-1_amd64.deb + sudo dpkg -i foundationdb-clients_6.3.23-1_amd64.deb + - name: Build linux target run: | make juicefs diff --git a/.github/workflows/mysqltest_bigtable.yml b/.github/workflows/mysqltest_bigtable.yml index 40802f8d85c3a..c42f5e057129b 100644 --- a/.github/workflows/mysqltest_bigtable.yml +++ b/.github/workflows/mysqltest_bigtable.yml @@ -42,6 +42,11 @@ jobs: restore-keys: | ${{ runner.os }}-go- + - name: Install Fdb C Lib + run: | + wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients_6.3.23-1_amd64.deb + sudo dpkg -i foundationdb-clients_6.3.23-1_amd64.deb + - name: Build linux target run: make juicefs diff --git a/.github/workflows/mysqltest_smalltable.yml b/.github/workflows/mysqltest_smalltable.yml index 1b8da2a57897b..26db0a4924040 100644 --- a/.github/workflows/mysqltest_smalltable.yml +++ b/.github/workflows/mysqltest_smalltable.yml @@ -42,6 +42,11 @@ jobs: restore-keys: | ${{ runner.os }}-go- + - name: Install Fdb C Lib + run: | + wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients_6.3.23-1_amd64.deb + sudo dpkg -i foundationdb-clients_6.3.23-1_amd64.deb + - name: Build linux target run: make juicefs diff --git a/.github/workflows/pjdfstest.yml b/.github/workflows/pjdfstest.yml index e3a34df7b8b96..9e9f42279dc6e 100644 --- a/.github/workflows/pjdfstest.yml +++ b/.github/workflows/pjdfstest.yml @@ -49,6 +49,11 @@ jobs: restore-keys: | ${{ runner.os }}-go- + - name: Install Fdb C Lib + run: | + wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients_6.3.23-1_amd64.deb + sudo dpkg -i foundationdb-clients_6.3.23-1_amd64.deb + - name: Build linux target run: make juicefs diff --git a/.github/workflows/redis_compile.yml b/.github/workflows/redis_compile.yml index 270a07cf5a09c..1b727dad5daa9 100644 --- a/.github/workflows/redis_compile.yml +++ b/.github/workflows/redis_compile.yml @@ -39,6 +39,11 @@ jobs: restore-keys: | ${{ runner.os }}-go- + - name: Install Fdb C Lib + run: | + wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients_6.3.23-1_amd64.deb + sudo dpkg -i foundationdb-clients_6.3.23-1_amd64.deb + - name: Build linux target run: make juicefs diff --git a/.github/workflows/sdktest.yml b/.github/workflows/sdktest.yml index 0e72381349d29..b390460ff3fa9 100644 --- a/.github/workflows/sdktest.yml +++ b/.github/workflows/sdktest.yml @@ -47,6 +47,11 @@ jobs: restore-keys: | ${{ runner.os }}-go- + - name: Install Fdb C Lib + run: | + wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients_6.3.23-1_amd64.deb + sudo dpkg -i foundationdb-clients_6.3.23-1_amd64.deb + - name: Build linux target run: | make juicefs diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index 22f2ad48fa8d9..8e93bb5decc3f 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -50,6 +50,11 @@ jobs: restore-keys: | ${{ runner.os }}-go- + - name: Install Fdb C Lib + run: | + wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients_6.3.23-1_amd64.deb + sudo dpkg -i foundationdb-clients_6.3.23-1_amd64.deb + - name: Build linux target run: make juicefs @@ -180,6 +185,10 @@ jobs: with: go-version: '1.18.x' + - name: Install Fdb C Lib + run: | + wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients_6.3.23-1_amd64.deb + sudo dpkg -i foundationdb-clients_6.3.23-1_amd64.deb - uses: actions/cache@v3 with: diff --git a/.github/workflows/tpcds.yml b/.github/workflows/tpcds.yml index 43c85261df1da..c580bcfdfbde1 100644 --- a/.github/workflows/tpcds.yml +++ b/.github/workflows/tpcds.yml @@ -59,6 +59,11 @@ jobs: key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} restore-keys: | ${{ runner.os }}-go- + + - name: Install Fdb C Lib + run: | + wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients_6.3.23-1_amd64.deb + sudo dpkg -i foundationdb-clients_6.3.23-1_amd64.deb - name: Build linux target run: make juicefs diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 183fc6f9dfcaa..a50c0dec749b5 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -28,6 +28,10 @@ jobs: go-version: '1.17.x' - uses: actions/checkout@v2 + - name: Install Fdb C Lib + run: | + wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients_6.3.23-1_amd64.deb + sudo dpkg -i foundationdb-clients_6.3.23-1_amd64.deb - name: golangci-lint uses: golangci/golangci-lint-action@v3 @@ -49,6 +53,11 @@ jobs: run: | sudo apt-get update sudo apt-get install g++-multilib gcc-mingw-w64 + + - name: Install Fdb C Lib + run: | + wget https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients_6.3.23-1_amd64.deb + sudo dpkg -i foundationdb-clients_6.3.23-1_amd64.deb - uses: actions/cache@v3 with: