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.

Sign up for GitHub

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

Jump to bottom

[CI TEST][DO NOT MERGE]Frocksdb 8.10 fix ci #75

Open
wants to merge 5 commits into
base: FRocksDB-8.10.0
Choose a base branch
from
Open

[CI TEST][DO NOT MERGE]Frocksdb 8.10 fix ci #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
956b005
[FLINK-35575] Disable PERF_CONTEXT by default in compilation
mayuehappy Jun 28, 2024
f646cba
DISABLE_PERF_CONTEXT in build script
mayuehappy Jul 22, 2024
5320c1c
test DISABLE_PERF_CONTEXT
mayuehappy Jul 23, 2024
c69e3fb
update config
mayuehappy Aug 12, 2024
901772c
fix ci
mayuehappy Aug 12, 2024
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
5 changes: 3 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ commands:
echo "export SNAPPY_DOWNLOAD_BASE=https://rocksdb-deps.s3.us-west-2.amazonaws.com/pkgs/snappy" >> $BASH_ENV
echo "export LZ4_DOWNLOAD_BASE=https://rocksdb-deps.s3.us-west-2.amazonaws.com/pkgs/lz4" >> $BASH_ENV
echo "export ZSTD_DOWNLOAD_BASE=https://rocksdb-deps.s3.us-west-2.amazonaws.com/pkgs/zstd" >> $BASH_ENV
echo "export DISABLE_PERF_CONTEXT=0" >> $BASH_ENV

windows-build-steps:
steps:
Expand Down Expand Up @@ -361,7 +362,7 @@ jobs:
resource_class: xlarge
steps:
- checkout # check out the code in the project directory
- run: CC=clang CXX=clang++ USE_CLANG=1 PORTABLE=1 make V=1 -j16 all
- run: CC=clang CXX=clang++ USE_CLANG=1 PORTABLE=1 DISABLE_PERF_CONTEXT=0 make V=1 -j16 all
- post-steps

build-linux-clang10-asan:
Expand Down Expand Up @@ -474,7 +475,7 @@ jobs:
- run: apt-get update -y && apt-get install -y libgflags-dev
- run:
name: "Unity build"
command: make V=1 -j8 unity_test
command: DISABLE_PERF_CONTEXT=0 make V=1 -j8 unity_test
no_output_timeout: 20m
- run: make V=1 -j8 -k check-headers # could be moved to a different build
- post-steps
Expand Down
2 changes: 1 addition & 1 deletion FROCKSDB-RELEASE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ To start the crossbuild within a Mac OSX environment:
cp <path-to-ppc64le-musl-lib-so>/librocksdbjni-linux-ppc64le-musl.so java/target/librocksdbjni-linux-ppc64le-musl.so
cp <path-to-arm-lib-so>/librocksdbjni-linux-aarch64.so java/target/librocksdbjni-linux-aarch64.so
cp <path-to-arm-musl-lib-so>/librocksdbjni-linux-aarch64-musl.so java/target/librocksdbjni-linux-aarch64-musl.so
FROCKSDB_VERSION=1.0 PORTABLE=1 ROCKSDB_DISABLE_JEMALLOC=true DEBUG_LEVEL=0 make frocksdbjavastaticreleasedocker
FROCKSDB_VERSION=1.0 PORTABLE=1 ROCKSDB_DISABLE_JEMALLOC=true DEBUG_LEVEL=0 DISABLE_PERF_CONTEXT=1 make frocksdbjavastaticreleasedocker

*Note, we disable jemalloc on mac due to https://github.com/facebook/rocksdb/issues/5787*.

Expand Down
6 changes: 6 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,12 @@ ifndef DISABLE_JEMALLOC
PLATFORM_CCFLAGS += $(JEMALLOC_INCLUDE)
endif

DISABLE_PERF_CONTEXT ?= 1
ifeq ($(DISABLE_PERF_CONTEXT),1)
PLATFORM_CXXFLAGS += -DNPERF_CONTEXT
PLATFORM_CCFLAGS += -DNPERF_CONTEXT
endif

ifndef USE_FOLLY
USE_FOLLY=0
endif
Expand Down
2 changes: 1 addition & 1 deletion java/crossbuild/docker-build-linux-alpine.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ cp -r /rocksdb-host/* /rocksdb-local-build
cd /rocksdb-local-build

make clean-not-downloaded
PORTABLE=1 make -j2 rocksdbjavastatic
PORTABLE=1 DISABLE_PERF_CONTEXT=1 make -j2 rocksdbjavastatic

cp java/target/librocksdbjni-linux*.so java/target/rocksdbjni-*-linux*.jar java/target/rocksdbjni-*-linux*.jar.sha1 /rocksdb-java-target
9 changes: 5 additions & 4 deletions java/crossbuild/docker-build-linux-centos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,23 @@ if hash scl 2>/dev/null; then
if scl --list | grep -q 'devtoolset-8'; then
# CentOS 6+
scl enable devtoolset-8 'make clean-not-downloaded'
scl enable devtoolset-8 'PORTABLE=1 make -j2 rocksdbjavastatic'
scl enable devtoolset-8 'PORTABLE=1 DISABLE_PERF_CONTEXT=1 make -j2 rocksdbjavastatic'
elif scl --list | grep -q 'devtoolset-7'; then
# CentOS 6+
scl enable devtoolset-7 'make clean-not-downloaded'
scl enable devtoolset-7 'PORTABLE=1 make -j2 rocksdbjavastatic'
scl enable devtoolset-7 'PORTABLE=1 DISABLE_PERF_CONTEXT=1 make -j2 rocksdbjavastatic'
elif scl --list | grep -q 'devtoolset-2'; then
# CentOS 5 or 6
scl enable devtoolset-2 'make clean-not-downloaded'
scl enable devtoolset-2 'PORTABLE=1 make -j2 rocksdbjavastatic'
scl enable devtoolset-2 'PORTABLE=1 DISABLE_PERF_CONTEXT=1 make -j2 rocksdbjavastatic'
else
echo "Could not find devtoolset"
exit 1;
fi
else
make clean-not-downloaded
PORTABLE=1 make -j2 rocksdbjavastatic
echo "PORTABLE=1 DISABLE_PERF_CONTEXT=1 make -j2 rocksdbjavastatic"
PORTABLE=1 DISABLE_PERF_CONTEXT=1 make -j2 rocksdbjavastatic
fi

cp java/target/librocksdbjni-linux*.so java/target/rocksdbjni-*-linux*.jar java/target/rocksdbjni-*-linux*.jar.sha1 /rocksdb-java-target
Expand Down
Loading