mirror of
https://github.com/dragonflydb/dragonfly.git
synced 2025-05-10 18:05:44 +02:00
chore: replace deprecated HELIO_STACK_CHECK (#4465)
* remove HELIO_STACK_CHECK * use FLAGS_fiber_safety_margin --------- Signed-off-by: kostas <kostas@dragonflydb.io>
This commit is contained in:
parent
ac8e1c80f0
commit
c759eb8ce6
3 changed files with 8 additions and 12 deletions
10
.github/workflows/ci.yml
vendored
10
.github/workflows/ci.yml
vendored
|
@ -111,7 +111,6 @@ jobs:
|
||||||
-DCMAKE_CXX_COMPILER="${{matrix.compiler.cxx}}" \
|
-DCMAKE_CXX_COMPILER="${{matrix.compiler.cxx}}" \
|
||||||
-DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DCMAKE_C_COMPILER_LAUNCHER=sccache \
|
-DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DCMAKE_C_COMPILER_LAUNCHER=sccache \
|
||||||
-DCMAKE_CXX_FLAGS="${{matrix.cxx_flags}} -no-pie" -DWITH_AWS:BOOL=OFF \
|
-DCMAKE_CXX_FLAGS="${{matrix.cxx_flags}} -no-pie" -DWITH_AWS:BOOL=OFF \
|
||||||
-DHELIO_STACK_CHECK:STRING=4096 \
|
|
||||||
-L
|
-L
|
||||||
cd ${GITHUB_WORKSPACE}/build && pwd
|
cd ${GITHUB_WORKSPACE}/build && pwd
|
||||||
du -hcs _deps/
|
du -hcs _deps/
|
||||||
|
@ -135,7 +134,7 @@ jobs:
|
||||||
cd ${GITHUB_WORKSPACE}/build
|
cd ${GITHUB_WORKSPACE}/build
|
||||||
echo Run ctest -V -L DFLY
|
echo Run ctest -V -L DFLY
|
||||||
GLOG_alsologtostderr=1 GLOG_vmodule=rdb_load=1,rdb_save=1,snapshot=1 \
|
GLOG_alsologtostderr=1 GLOG_vmodule=rdb_load=1,rdb_save=1,snapshot=1 \
|
||||||
FLAGS_list_experimental_v2=true timeout 20m ctest -V -L DFLY
|
FLAGS_fiber_safety_margin=4096 FLAGS_list_experimental_v2=true timeout 20m ctest -V -L DFLY
|
||||||
|
|
||||||
echo "Running tests with --force_epoll"
|
echo "Running tests with --force_epoll"
|
||||||
|
|
||||||
|
@ -148,19 +147,20 @@ jobs:
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
gdb -ix ./init.gdb --batch -ex r --args ./dragonfly_test --force_epoll
|
gdb -ix ./init.gdb --batch -ex r --args ./dragonfly_test --force_epoll
|
||||||
FLAGS_force_epoll=true GLOG_vmodule=rdb_load=1,rdb_save=1,snapshot=1 timeout 20m ctest -V -L DFLY
|
FLAGS_fiber_safety_margin=4096 FLAGS_force_epoll=true GLOG_vmodule=rdb_load=1,rdb_save=1,snapshot=1 timeout 20m ctest -V -L DFLY
|
||||||
|
|
||||||
echo "Finished running tests with --force_epoll"
|
echo "Finished running tests with --force_epoll"
|
||||||
|
|
||||||
echo "Running tests with --cluster_mode=emulated"
|
echo "Running tests with --cluster_mode=emulated"
|
||||||
FLAGS_cluster_mode=emulated timeout 20m ctest -V -L DFLY
|
FLAGS_fiber_safety_margin=4096 FLAGS_cluster_mode=emulated timeout 20m ctest -V -L DFLY
|
||||||
|
|
||||||
echo "Running tests with both --cluster_mode=emulated & --lock_on_hashtags"
|
echo "Running tests with both --cluster_mode=emulated & --lock_on_hashtags"
|
||||||
FLAGS_cluster_mode=emulated FLAGS_lock_on_hashtags=true timeout 20m ctest -V -L DFLY
|
FLAGS_fiber_safety_margin=4096 FLAGS_cluster_mode=emulated FLAGS_lock_on_hashtags=true timeout 20m ctest -V -L DFLY
|
||||||
|
|
||||||
timeout 5m ./dragonfly_test
|
timeout 5m ./dragonfly_test
|
||||||
timeout 5m ./json_family_test --jsonpathv2=false
|
timeout 5m ./json_family_test --jsonpathv2=false
|
||||||
timeout 5m ./tiered_storage_test --vmodule=db_slice=2 --logtostderr
|
timeout 5m ./tiered_storage_test --vmodule=db_slice=2 --logtostderr
|
||||||
|
|
||||||
- name: Upload unit logs on failure
|
- name: Upload unit logs on failure
|
||||||
if: failure()
|
if: failure()
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
|
|
|
@ -78,16 +78,9 @@ io::Result<io::Bytes> Lz4Compressor::Compress(io::Bytes data) {
|
||||||
compr_buf_.reserve(buf_size);
|
compr_buf_.reserve(buf_size);
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: to remove LZ4F_compressFrame code once we confirm this code actually works.
|
|
||||||
#if 1
|
|
||||||
size_t frame_size =
|
size_t frame_size =
|
||||||
LZ4F_compressFrame_usingCDict(cctx_, compr_buf_.data(), compr_buf_.capacity(), data.data(),
|
LZ4F_compressFrame_usingCDict(cctx_, compr_buf_.data(), compr_buf_.capacity(), data.data(),
|
||||||
data.size(), nullptr /* dict */, &lz4_pref);
|
data.size(), nullptr /* dict */, &lz4_pref);
|
||||||
#else
|
|
||||||
size_t frame_size = LZ4F_compressFrame(compr_buf_.data(), compr_buf_.capacity(), data.data(),
|
|
||||||
data.size(), &lz4_pref);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (LZ4F_isError(frame_size)) {
|
if (LZ4F_isError(frame_size)) {
|
||||||
LOG(ERROR) << "LZ4F_compressFrame failed with error " << LZ4F_getErrorName(frame_size);
|
LOG(ERROR) << "LZ4F_compressFrame failed with error " << LZ4F_getErrorName(frame_size);
|
||||||
return nonstd::make_unexpected(make_error_code(errc::operation_not_supported));
|
return nonstd::make_unexpected(make_error_code(errc::operation_not_supported));
|
||||||
|
|
|
@ -429,6 +429,9 @@ class DflyInstanceFactory:
|
||||||
if version >= 1.21 and "serialization_max_chunk_size" not in args:
|
if version >= 1.21 and "serialization_max_chunk_size" not in args:
|
||||||
args.setdefault("serialization_max_chunk_size", 300000)
|
args.setdefault("serialization_max_chunk_size", 300000)
|
||||||
|
|
||||||
|
if version >= 1.26:
|
||||||
|
args.setdefault("fiber_safety_margin=4096")
|
||||||
|
|
||||||
for k, v in args.items():
|
for k, v in args.items():
|
||||||
args[k] = v.format(**self.params.env) if isinstance(v, str) else v
|
args[k] = v.format(**self.params.env) if isinstance(v, str) else v
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue