Skip to content

GitLab

C
ceph
Commit 0ff356ba authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Updated ceph to 15.2.4

parent d32fa2b9
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 48 deletions
Makefile
View file @ 0ff356ba
...@@ -30,18 +30,18 @@ all: ceph-config ...@@ -30,18 +30,18 @@ all: ceph-config
mount --bind tmp /tmp mount --bind tmp /tmp
ln -s /lib /lib64 ln -s /lib /lib64
tar xf ceph-15.2.3.tar.gz tar xf ceph-15.2.4.tar.gz
patch -Np1 -d ceph-15.2.3 < ceph-15.2.3-fix_cpu_detection.patch patch -Np1 -d ceph-15.2.4 < ceph-15.2.4-fix_cpu_detection.patch
patch -Np1 -d ceph-15.2.3 < ceph-15.2.3-fix_tests.patch patch -Np1 -d ceph-15.2.4 < ceph-15.2.4-fix_tests.patch
patch -Np1 -d ceph-15.2.3 < ceph-15.2.3-fix_ceph-volume_systemd_unit.patch patch -Np1 -d ceph-15.2.4 < ceph-15.2.4-fix_ceph-volume_systemd_unit.patch
patch -Np1 -d ceph-15.2.3 < ceph-15.2.3-no_git.patch patch -Np1 -d ceph-15.2.4 < ceph-15.2.4-no_git.patch
cd ceph-15.2.3 && ./do_cmake.sh -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_LIBEXECDIR=/lib -DWITH_SPDK=OFF -DWITH_RDMA=OFF -DWITH_RADOSGW_AMQP_ENDPOINT=OFF -DWITH_PYTHON2=OFF -DWITH_PYTHON3=ON cd ceph-15.2.4 && ./do_cmake.sh -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_SYSCONFDIR=/etc -DCMAKE_INSTALL_LIBEXECDIR=/lib -DWITH_SPDK=OFF -DWITH_RDMA=OFF -DWITH_RADOSGW_AMQP_ENDPOINT=OFF -DWITH_PYTHON2=OFF -DWITH_PYTHON3=ON
$(MAKE) -C ceph-15.2.3/build npm_config_cache=/build/.npm NODE_OPTIONS="--max-old-space-size=4096" $(MAKE) -C ceph-15.2.4/build npm_config_cache=/build/.npm NODE_OPTIONS="--max-old-space-size=4096"
hostname localhost hostname localhost
cd ceph-15.2.3 && tar xf ../ceph-object-corpus.tar.xz cd ceph-15.2.4 && tar xf ../ceph-object-corpus.tar.xz
cd ceph-15.2.3/build && CTEST_OUTPUT_ON_FAILURE=1 NODE_OPTIONS="--max-old-space-size=4096" make check cd ceph-15.2.4/build && CTEST_OUTPUT_ON_FAILURE=1 NODE_OPTIONS="--max-old-space-size=4096" make check
$(MAKE) -C ceph-15.2.3/build install $(MAKE) -C ceph-15.2.4/build install
rm /usr/bin/ceph_test* rm /usr/bin/ceph_test*
find / -name *.pyc -exec rm -f '{}' ';' find / -name *.pyc -exec rm -f '{}' ';'
find / -name *.js.map -exec rm -f '{}' ';' find / -name *.js.map -exec rm -f '{}' ';'
...@@ -84,7 +84,7 @@ all: ceph-config ...@@ -84,7 +84,7 @@ all: ceph-config
swapoff swap swapoff swap
rm -rf swap rm -rf swap
rm -rf ceph-15.2.3 rm -rf ceph-15.2.4
ceph-config: ceph-config:
define CEPH_CONFIG define CEPH_CONFIG
......
ceph-15.2.3-fix_ceph-volume_systemd_unit.patch → ceph-15.2.4-fix_ceph-volume_systemd_unit.patch
View file @ 0ff356ba
diff -uNr ceph-15.2.3/systemd/ceph-volume@.service ceph-15.2.3-fix_ceph-volume_systemd_unit/systemd/ceph-volume@.service diff -uNr ceph-15.2.4/systemd/ceph-volume@.service ceph-15.2.4-fix_ceph-volume_systemd_unit/systemd/ceph-volume@.service
--- ceph-15.2.3/systemd/ceph-volume@.service 2020-05-30 01:54:50.000000000 +0930 --- ceph-15.2.4/systemd/ceph-volume@.service 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.3-fix_ceph-volume_systemd_unit/systemd/ceph-volume@.service 2020-06-16 09:25:30.892671278 +0930 +++ ceph-15.2.4-fix_ceph-volume_systemd_unit/systemd/ceph-volume@.service 2020-07-07 11:19:46.911351551 +0930
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
Type=oneshot Type=oneshot
KillMode=none KillMode=none
......
ceph-15.2.3-fix_cpu_detection.patch → ceph-15.2.4-fix_cpu_detection.patch
View file @ 0ff356ba
diff -uNr ceph-15.2.3/cmake/modules/SIMDExt.cmake ceph-15.2.3-fix_cpu_detection/cmake/modules/SIMDExt.cmake diff -uNr ceph-15.2.4/cmake/modules/SIMDExt.cmake ceph-15.2.4-fix_cpu_detection/cmake/modules/SIMDExt.cmake
--- ceph-15.2.3/cmake/modules/SIMDExt.cmake 2020-05-30 01:54:50.000000000 +0930 --- ceph-15.2.4/cmake/modules/SIMDExt.cmake 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.3-fix_cpu_detection/cmake/modules/SIMDExt.cmake 2020-06-16 09:27:50.267149100 +0930 +++ ceph-15.2.4-fix_cpu_detection/cmake/modules/SIMDExt.cmake 2020-07-07 11:30:28.234565030 +0930
@@ -48,32 +48,53 @@ @@ -48,32 +48,53 @@
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i386|i686|amd64|x86_64|AMD64") elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i386|i686|amd64|x86_64|AMD64")
set(HAVE_INTEL 1) set(HAVE_INTEL 1)
...@@ -62,9 +62,9 @@ diff -uNr ceph-15.2.3/cmake/modules/SIMDExt.cmake ceph-15.2.3-fix_cpu_detection/ ...@@ -62,9 +62,9 @@ diff -uNr ceph-15.2.3/cmake/modules/SIMDExt.cmake ceph-15.2.3-fix_cpu_detection/
if(HAVE_INTEL_SSE4_2) if(HAVE_INTEL_SSE4_2)
set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse4.2") set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse4.2")
endif() endif()
diff -uNr ceph-15.2.3/src/test/test_arch.cc ceph-15.2.3-fix_cpu_detection/src/test/test_arch.cc diff -uNr ceph-15.2.4/src/test/test_arch.cc ceph-15.2.4-fix_cpu_detection/src/test/test_arch.cc
--- ceph-15.2.3/src/test/test_arch.cc 2020-05-30 01:54:50.000000000 +0930 --- ceph-15.2.4/src/test/test_arch.cc 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.3-fix_cpu_detection/src/test/test_arch.cc 2020-06-16 09:27:50.268149103 +0930 +++ ceph-15.2.4-fix_cpu_detection/src/test/test_arch.cc 2020-07-07 11:30:28.239565039 +0930
@@ -69,7 +69,7 @@ @@ -69,7 +69,7 @@
expected = strstr(flags, " sse4_1 ") ? 1 : 0; expected = strstr(flags, " sse4_1 ") ? 1 : 0;
EXPECT_EQ(expected, ceph_arch_intel_sse41); EXPECT_EQ(expected, ceph_arch_intel_sse41);
......
ceph-15.2.3-fix_tests.patch → ceph-15.2.4-fix_tests.patch
View file @ 0ff356ba
diff -uNr ceph-15.2.3/src/test/cli/ceph-conf/env-vs-args.t ceph-15.2.3-fix_tests/src/test/cli/ceph-conf/env-vs-args.t diff -uNr ceph-15.2.4/src/test/cli/ceph-conf/env-vs-args.t ceph-15.2.4-fix_tests/src/test/cli/ceph-conf/env-vs-args.t
--- ceph-15.2.3/src/test/cli/ceph-conf/env-vs-args.t 2020-05-30 01:54:50.000000000 +0930 --- ceph-15.2.4/src/test/cli/ceph-conf/env-vs-args.t 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.3-fix_tests/src/test/cli/ceph-conf/env-vs-args.t 2020-06-28 12:03:26.089133788 +0930 +++ ceph-15.2.4-fix_tests/src/test/cli/ceph-conf/env-vs-args.t 2020-07-07 11:35:29.041097648 +0930
@@ -2,9 +2,9 @@ @@ -2,9 +2,9 @@
$ env CEPH_CONF=from-env ceph-conf -s foo bar $ env CEPH_CONF=from-env ceph-conf -s foo bar
did not load config file, using default settings. did not load config file, using default settings.
...@@ -13,9 +13,9 @@ diff -uNr ceph-15.2.3/src/test/cli/ceph-conf/env-vs-args.t ceph-15.2.3-fix_tests ...@@ -13,9 +13,9 @@ diff -uNr ceph-15.2.3/src/test/cli/ceph-conf/env-vs-args.t ceph-15.2.3-fix_tests
[1] [1]
# command-line arguments should override environment # command-line arguments should override environment
diff -uNr ceph-15.2.3/src/test/CMakeLists.txt ceph-15.2.3-fix_tests/src/test/CMakeLists.txt diff -uNr ceph-15.2.4/src/test/CMakeLists.txt ceph-15.2.4-fix_tests/src/test/CMakeLists.txt
--- ceph-15.2.3/src/test/CMakeLists.txt 2020-05-30 01:54:50.000000000 +0930 --- ceph-15.2.4/src/test/CMakeLists.txt 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.3-fix_tests/src/test/CMakeLists.txt 2020-06-28 12:03:26.090133791 +0930 +++ ceph-15.2.4-fix_tests/src/test/CMakeLists.txt 2020-07-07 11:35:29.052097668 +0930
@@ -528,11 +528,17 @@ @@ -528,11 +528,17 @@
# Run rbd-unit-tests separate so they an run in parallel # Run rbd-unit-tests separate so they an run in parallel
# For values see: src/include/rbd/features.h # For values see: src/include/rbd/features.h
...@@ -34,9 +34,9 @@ diff -uNr ceph-15.2.3/src/test/CMakeLists.txt ceph-15.2.3-fix_tests/src/test/CMa ...@@ -34,9 +34,9 @@ diff -uNr ceph-15.2.3/src/test/CMakeLists.txt ceph-15.2.3-fix_tests/src/test/CMa
if(FREEBSD) if(FREEBSD)
add_ceph_test(rbd-ggate.sh ${CMAKE_CURRENT_SOURCE_DIR}/rbd-ggate.sh) add_ceph_test(rbd-ggate.sh ${CMAKE_CURRENT_SOURCE_DIR}/rbd-ggate.sh)
endif(FREEBSD) endif(FREEBSD)
diff -uNr ceph-15.2.3/src/test/common/test_lockdep.cc ceph-15.2.3-fix_tests/src/test/common/test_lockdep.cc diff -uNr ceph-15.2.4/src/test/common/test_lockdep.cc ceph-15.2.4-fix_tests/src/test/common/test_lockdep.cc
--- ceph-15.2.3/src/test/common/test_lockdep.cc 2020-05-30 01:54:50.000000000 +0930 --- ceph-15.2.4/src/test/common/test_lockdep.cc 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.3-fix_tests/src/test/common/test_lockdep.cc 2020-06-28 12:04:14.641295594 +0930 +++ ceph-15.2.4-fix_tests/src/test/common/test_lockdep.cc 2020-07-07 11:35:29.058097678 +0930
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
{ {
protected: protected:
...@@ -46,18 +46,18 @@ diff -uNr ceph-15.2.3/src/test/common/test_lockdep.cc ceph-15.2.3-fix_tests/src/ ...@@ -46,18 +46,18 @@ diff -uNr ceph-15.2.3/src/test/common/test_lockdep.cc ceph-15.2.3-fix_tests/src/
GTEST_SKIP() << "WARNING: CEPH_DEBUG_MUTEX is not defined, lockdep will not work"; GTEST_SKIP() << "WARNING: CEPH_DEBUG_MUTEX is not defined, lockdep will not work";
#endif #endif
CephInitParameters params(CEPH_ENTITY_TYPE_CLIENT); CephInitParameters params(CEPH_ENTITY_TYPE_CLIENT);
diff -uNr ceph-15.2.3/src/test/encoding/CMakeLists.txt ceph-15.2.3-fix_tests/src/test/encoding/CMakeLists.txt diff -uNr ceph-15.2.4/src/test/encoding/CMakeLists.txt ceph-15.2.4-fix_tests/src/test/encoding/CMakeLists.txt
--- ceph-15.2.3/src/test/encoding/CMakeLists.txt 2020-05-30 01:54:50.000000000 +0930 --- ceph-15.2.4/src/test/encoding/CMakeLists.txt 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.3-fix_tests/src/test/encoding/CMakeLists.txt 2020-06-28 12:03:26.090133791 +0930 +++ ceph-15.2.4-fix_tests/src/test/encoding/CMakeLists.txt 2020-07-07 11:35:29.065097691 +0930
@@ -1,3 +1,5 @@ @@ -1,3 +1,5 @@
# scripts # scripts
add_ceph_test(check-generated.sh ${CMAKE_CURRENT_SOURCE_DIR}/check-generated.sh) add_ceph_test(check-generated.sh ${CMAKE_CURRENT_SOURCE_DIR}/check-generated.sh)
+set_tests_properties(check-generated.sh PROPERTIES TIMEOUT 18000) +set_tests_properties(check-generated.sh PROPERTIES TIMEOUT 18000)
add_ceph_test(readable.sh ${CMAKE_CURRENT_SOURCE_DIR}/readable.sh) add_ceph_test(readable.sh ${CMAKE_CURRENT_SOURCE_DIR}/readable.sh)
+set_tests_properties(readable.sh PROPERTIES TIMEOUT 18000) +set_tests_properties(readable.sh PROPERTIES TIMEOUT 18000)
diff -uNr ceph-15.2.3/src/test/mgr/CMakeLists.txt ceph-15.2.3-fix_tests/src/test/mgr/CMakeLists.txt diff -uNr ceph-15.2.4/src/test/mgr/CMakeLists.txt ceph-15.2.4-fix_tests/src/test/mgr/CMakeLists.txt
--- ceph-15.2.3/src/test/mgr/CMakeLists.txt 2020-05-30 01:54:50.000000000 +0930 --- ceph-15.2.4/src/test/mgr/CMakeLists.txt 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.3-fix_tests/src/test/mgr/CMakeLists.txt 2020-06-28 12:03:26.090133791 +0930 +++ ceph-15.2.4-fix_tests/src/test/mgr/CMakeLists.txt 2020-07-07 11:35:29.071097701 +0930
@@ -9,6 +9,7 @@ @@ -9,6 +9,7 @@
if(WITH_MGR_DASHBOARD_FRONTEND) if(WITH_MGR_DASHBOARD_FRONTEND)
if(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64|arm|ARM") if(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64|arm|ARM")
...@@ -66,10 +66,10 @@ diff -uNr ceph-15.2.3/src/test/mgr/CMakeLists.txt ceph-15.2.3-fix_tests/src/test ...@@ -66,10 +66,10 @@ diff -uNr ceph-15.2.3/src/test/mgr/CMakeLists.txt ceph-15.2.3-fix_tests/src/test
endif(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64|arm|ARM") endif(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64|arm|ARM")
add_ceph_test(mgr-dashboard-smoke.sh ${CMAKE_CURRENT_SOURCE_DIR}/mgr-dashboard-smoke.sh) add_ceph_test(mgr-dashboard-smoke.sh ${CMAKE_CURRENT_SOURCE_DIR}/mgr-dashboard-smoke.sh)
diff -uNr ceph-15.2.3/src/test/objectstore/CMakeLists.txt ceph-15.2.3-fix_tests/src/test/objectstore/CMakeLists.txt diff -uNr ceph-15.2.4/src/test/objectstore/CMakeLists.txt ceph-15.2.4-fix_tests/src/test/objectstore/CMakeLists.txt
--- ceph-15.2.3/src/test/objectstore/CMakeLists.txt 2020-05-30 01:54:50.000000000 +0930 --- ceph-15.2.4/src/test/objectstore/CMakeLists.txt 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.3-fix_tests/src/test/objectstore/CMakeLists.txt 2020-06-28 12:03:26.090133791 +0930 +++ ceph-15.2.4-fix_tests/src/test/objectstore/CMakeLists.txt 2020-07-07 11:35:29.078097714 +0930
@@ -121,6 +121,7 @@ @@ -131,6 +131,7 @@
test_bluefs.cc test_bluefs.cc
) )
add_ceph_unittest(unittest_bluefs) add_ceph_unittest(unittest_bluefs)
...@@ -77,9 +77,9 @@ diff -uNr ceph-15.2.3/src/test/objectstore/CMakeLists.txt ceph-15.2.3-fix_tests/ ...@@ -77,9 +77,9 @@ diff -uNr ceph-15.2.3/src/test/objectstore/CMakeLists.txt ceph-15.2.3-fix_tests/
target_link_libraries(unittest_bluefs os global) target_link_libraries(unittest_bluefs os global)
# unittest_bluestore_types # unittest_bluestore_types
diff -uNr ceph-15.2.3/src/test/osd/TestOSDScrub.cc ceph-15.2.3-fix_tests/src/test/osd/TestOSDScrub.cc diff -uNr ceph-15.2.4/src/test/osd/TestOSDScrub.cc ceph-15.2.4-fix_tests/src/test/osd/TestOSDScrub.cc
--- ceph-15.2.3/src/test/osd/TestOSDScrub.cc 2020-05-30 01:54:50.000000000 +0930 --- ceph-15.2.4/src/test/osd/TestOSDScrub.cc 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.3-fix_tests/src/test/osd/TestOSDScrub.cc 2020-06-28 12:03:26.091133794 +0930 +++ ceph-15.2.4-fix_tests/src/test/osd/TestOSDScrub.cc 2020-07-07 11:35:29.088097732 +0930
@@ -70,7 +70,7 @@ @@ -70,7 +70,7 @@
g_ceph_context->_conf.set_val("osd_scrub_begin_hour", "0"); g_ceph_context->_conf.set_val("osd_scrub_begin_hour", "0");
g_ceph_context->_conf.set_val("osd_scrub_end_hour", "24"); g_ceph_context->_conf.set_val("osd_scrub_end_hour", "24");
...@@ -89,9 +89,9 @@ diff -uNr ceph-15.2.3/src/test/osd/TestOSDScrub.cc ceph-15.2.3-fix_tests/src/tes ...@@ -89,9 +89,9 @@ diff -uNr ceph-15.2.3/src/test/osd/TestOSDScrub.cc ceph-15.2.3-fix_tests/src/tes
tm.tm_isdst = -1; tm.tm_isdst = -1;
strptime("2015-01-16 12:05:13", "%Y-%m-%d %H:%M:%S", &tm); strptime("2015-01-16 12:05:13", "%Y-%m-%d %H:%M:%S", &tm);
utime_t now = utime_t(mktime(&tm), 0); utime_t now = utime_t(mktime(&tm), 0);
diff -uNr ceph-15.2.3/src/test/smoke.sh ceph-15.2.3-fix_tests/src/test/smoke.sh diff -uNr ceph-15.2.4/src/test/smoke.sh ceph-15.2.4-fix_tests/src/test/smoke.sh
--- ceph-15.2.3/src/test/smoke.sh 2020-05-30 01:54:50.000000000 +0930 --- ceph-15.2.4/src/test/smoke.sh 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.3-fix_tests/src/test/smoke.sh 2020-06-28 12:03:26.091133794 +0930 +++ ceph-15.2.4-fix_tests/src/test/smoke.sh 2020-07-07 11:35:29.099097751 +0930
@@ -53,7 +53,7 @@ @@ -53,7 +53,7 @@
ceph osd out 0 ceph osd out 0
wait_for_clean wait_for_clean
......
ceph-15.2.3-no_git.patch → ceph-15.2.4-no_git.patch
View file @ 0ff356ba
diff -uNr ceph-15.2.3/do_cmake.sh ceph-15.2.3-no_git/do_cmake.sh diff -uNr ceph-15.2.4/do_cmake.sh ceph-15.2.4-no_git/do_cmake.sh
--- ceph-15.2.3/do_cmake.sh 2020-05-30 01:54:50.000000000 +0930 --- ceph-15.2.4/do_cmake.sh 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.3-no_git/do_cmake.sh 2020-06-16 09:38:43.008406364 +0930 +++ ceph-15.2.4-no_git/do_cmake.sh 2020-07-07 11:45:30.305162268 +0930
@@ -1,7 +1,9 @@ @@ -1,7 +1,9 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -ex set -ex
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment