Skip to content

GitLab

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

Updated ceph to 15.2.3

parent 5a517263
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 138 additions and 377 deletions
Makefile
View file @ a8a92e23
...@@ -30,15 +30,16 @@ all: ceph-config ...@@ -30,15 +30,16 @@ all: ceph-config
mount --bind tmp /tmp mount --bind tmp /tmp
ln -s /lib /lib64 ln -s /lib /lib64
tar xf ceph-14.2.9.tar.gz tar xf ceph-15.2.3.tar.gz
patch -Np1 -d ceph-14.2.9 < ceph-14.2.9-fix_cpu_detection.patch patch -Np1 -d ceph-15.2.3 < ceph-15.2.3-fix_cpu_detection.patch
patch -Np1 -d ceph-14.2.9 < ceph-14.2.9-fix_tests.patch patch -Np1 -d ceph-15.2.3 < ceph-15.2.3-fix_tests.patch
patch -Np1 -d ceph-14.2.9 < ceph-14.2.9-fix_ceph-volume_systemd_unit.patch patch -Np1 -d ceph-15.2.3 < ceph-15.2.3-fix_ceph-volume_systemd_unit.patch
cd ceph-14.2.9 && ./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 -DMGR_PYTHON_VERSION=3 patch -Np1 -d ceph-15.2.3 < ceph-15.2.3-no_git.patch
$(MAKE) -C ceph-14.2.9/build npm_config_cache=/build/.npm 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
$(MAKE) -C ceph-15.2.3/build npm_config_cache=/build/.npm NODE_OPTIONS="--max-old-space-size=4096"
hostname localhost hostname localhost
cd ceph-14.2.9 && tar xf ../ceph-object-corpus.tar.xz cd ceph-15.2.3 && tar xf ../ceph-object-corpus.tar.xz
cd ceph-14.2.9/build && CTEST_OUTPUT_ON_FAILURE=1 make check cd ceph-15.2.3/build && CTEST_OUTPUT_ON_FAILURE=1 NODE_OPTIONS="--max-old-space-size=4096" make check
rm -rf /lib64 rm -rf /lib64
umount /tmp umount /tmp
...@@ -46,13 +47,14 @@ all: ceph-config ...@@ -46,13 +47,14 @@ all: ceph-config
swapoff swap swapoff swap
rm -rf swap rm -rf swap
$(MAKE) -C ceph-14.2.9/build install $(MAKE) -C ceph-15.2.3/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 '{}' ';'
find / -name *.css.map -exec rm -f '{}' ';' find / -name *.css.map -exec rm -f '{}' ';'
find / -depth -name .cache -type d -exec rm -rf '{}' ';' find / -depth -name .cache -type d -exec rm -rf '{}' ';'
find / -depth -name .pytest_cache -type d -exec rm -rf '{}' ';' find / -depth -name .pytest_cache -type d -exec rm -rf '{}' ';'
find / -depth -name .tox -type d -exec rm -rf '{}' ';'
mv -v /lib/ceph/* /usr/lib/ceph mv -v /lib/ceph/* /usr/lib/ceph
rm -rf /lib/ceph rm -rf /lib/ceph
install -v -Dm755 -d /etc/sysconfig install -v -Dm755 -d /etc/sysconfig
...@@ -82,7 +84,7 @@ all: ceph-config ...@@ -82,7 +84,7 @@ all: ceph-config
systemctl enable ceph-osd.target systemctl enable ceph-osd.target
systemctl enable ceph-radosgw.target systemctl enable ceph-radosgw.target
rm -rf ceph-14.2.9 rm -rf ceph-15.2.3
ceph-config: ceph-config:
define CEPH_CONFIG define CEPH_CONFIG
......
ceph-14.2.9-fix_tests.patch deleted 100644 → 0
View file @ 5a517263
This diff is collapsed.
ceph-14.2.9-fix_ceph-volume_systemd_unit.patch → ceph-15.2.3-fix_ceph-volume_systemd_unit.patch
View file @ a8a92e23
diff -uNr ceph-14.2.9/systemd/ceph-volume@.service ceph-14.2.9-fix_ceph-volume_systemd_unit/systemd/ceph-volume@.service diff -uNr ceph-15.2.3/systemd/ceph-volume@.service ceph-15.2.3-fix_ceph-volume_systemd_unit/systemd/ceph-volume@.service
--- ceph-14.2.9/systemd/ceph-volume@.service 2020-04-10 01:47:28.000000000 +0930 --- ceph-15.2.3/systemd/ceph-volume@.service 2020-05-30 01:54:50.000000000 +0930
+++ ceph-14.2.9-fix_ceph-volume_systemd_unit/systemd/ceph-volume@.service 2020-05-16 15:59:32.320108510 +0930 +++ ceph-15.2.3-fix_ceph-volume_systemd_unit/systemd/ceph-volume@.service 2020-06-16 09:25:30.892671278 +0930
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
Type=oneshot Type=oneshot
KillMode=none KillMode=none
......
ceph-14.2.9-fix_cpu_detection.patch → ceph-15.2.3-fix_cpu_detection.patch
View file @ a8a92e23
diff -uNr ceph-14.2.9/cmake/modules/SIMDExt.cmake ceph-14.2.9-fix_cpu_detection/cmake/modules/SIMDExt.cmake diff -uNr ceph-15.2.3/cmake/modules/SIMDExt.cmake ceph-15.2.3-fix_cpu_detection/cmake/modules/SIMDExt.cmake
--- ceph-14.2.9/cmake/modules/SIMDExt.cmake 2020-04-10 01:47:28.000000000 +0930 --- ceph-15.2.3/cmake/modules/SIMDExt.cmake 2020-05-30 01:54:50.000000000 +0930
+++ ceph-14.2.9-fix_cpu_detection/cmake/modules/SIMDExt.cmake 2020-05-16 16:04:15.693999479 +0930 +++ ceph-15.2.3-fix_cpu_detection/cmake/modules/SIMDExt.cmake 2020-06-16 09:27:50.267149100 +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-14.2.9/cmake/modules/SIMDExt.cmake ceph-14.2.9-fix_cpu_detection/ ...@@ -62,9 +62,9 @@ diff -uNr ceph-14.2.9/cmake/modules/SIMDExt.cmake ceph-14.2.9-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-14.2.9/src/test/test_arch.cc ceph-14.2.9-fix_cpu_detection/src/test/test_arch.cc diff -uNr ceph-15.2.3/src/test/test_arch.cc ceph-15.2.3-fix_cpu_detection/src/test/test_arch.cc
--- ceph-14.2.9/src/test/test_arch.cc 2020-04-10 01:47:28.000000000 +0930 --- ceph-15.2.3/src/test/test_arch.cc 2020-05-30 01:54:50.000000000 +0930
+++ ceph-14.2.9-fix_cpu_detection/src/test/test_arch.cc 2020-05-16 16:04:15.695999485 +0930 +++ ceph-15.2.3-fix_cpu_detection/src/test/test_arch.cc 2020-06-16 09:27:50.268149103 +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 0 → 100644
View file @ a8a92e23
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
--- ceph-15.2.3/src/test/cli/ceph-conf/env-vs-args.t 2020-05-30 01:54:50.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
@@ -2,9 +2,9 @@
$ env CEPH_CONF=from-env ceph-conf -s foo bar
did not load config file, using default settings.
.* \-1 Errors while parsing config file! (re)
- .* \-1 parse_file: filesystem error: .* file.size: (No such file or directory )?\[from-env\] (re)
+ .* \-1 parse_file: filesystem error: .* file.size:? (No such file or directory )?\[from-env\] (re)
.* \-1 Errors while parsing config file! (re)
- .* \-1 parse_file: filesystem error: .* file.size: (No such file or directory )?\[from-env\] (re)
+ .* \-1 parse_file: filesystem error: .* file.size:? (No such file or directory )?\[from-env\] (re)
[1]
# 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
--- ceph-15.2.3/src/test/CMakeLists.txt 2020-05-30 01:54:50.000000000 +0930
+++ ceph-15.2.3-fix_tests/src/test/CMakeLists.txt 2020-06-28 12:03:26.090133791 +0930
@@ -528,11 +528,17 @@
# Run rbd-unit-tests separate so they an run in parallel
# For values see: src/include/rbd/features.h
add_ceph_test(run-rbd-unit-tests-N.sh ${CMAKE_CURRENT_SOURCE_DIR}/run-rbd-unit-tests.sh N)
+ set_tests_properties(run-rbd-unit-tests-N.sh PROPERTIES TIMEOUT 7200)
add_ceph_test(run-rbd-unit-tests-0.sh ${CMAKE_CURRENT_SOURCE_DIR}/run-rbd-unit-tests.sh 0)
+ set_tests_properties(run-rbd-unit-tests-0.sh PROPERTIES TIMEOUT 7200)
add_ceph_test(run-rbd-unit-tests-1.sh ${CMAKE_CURRENT_SOURCE_DIR}/run-rbd-unit-tests.sh 1)
+ set_tests_properties(run-rbd-unit-tests-1.sh PROPERTIES TIMEOUT 7200)
add_ceph_test(run-rbd-unit-tests-61.sh ${CMAKE_CURRENT_SOURCE_DIR}/run-rbd-unit-tests.sh 61)
+ set_tests_properties(run-rbd-unit-tests-61.sh PROPERTIES TIMEOUT 7200)
add_ceph_test(run-rbd-unit-tests-109.sh ${CMAKE_CURRENT_SOURCE_DIR}/run-rbd-unit-tests.sh 109)
+ set_tests_properties(run-rbd-unit-tests-109.sh PROPERTIES TIMEOUT 7200)
add_ceph_test(run-rbd-unit-tests-127.sh ${CMAKE_CURRENT_SOURCE_DIR}/run-rbd-unit-tests.sh 127)
+ set_tests_properties(run-rbd-unit-tests-127.sh PROPERTIES TIMEOUT 7200)
if(FREEBSD)
add_ceph_test(rbd-ggate.sh ${CMAKE_CURRENT_SOURCE_DIR}/rbd-ggate.sh)
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
--- ceph-15.2.3/src/test/common/test_lockdep.cc 2020-05-30 01:54:50.000000000 +0930
+++ ceph-15.2.3-fix_tests/src/test/common/test_lockdep.cc 2020-06-28 12:04:14.641295594 +0930
@@ -16,7 +16,7 @@
{
protected:
void SetUp() override {
-#ifdef CEPH_DEBUG_MUTEX
+#ifndef CEPH_DEBUG_MUTEX
GTEST_SKIP() << "WARNING: CEPH_DEBUG_MUTEX is not defined, lockdep will not work";
#endif
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
--- ceph-15.2.3/src/test/encoding/CMakeLists.txt 2020-05-30 01:54:50.000000000 +0930
+++ ceph-15.2.3-fix_tests/src/test/encoding/CMakeLists.txt 2020-06-28 12:03:26.090133791 +0930
@@ -1,3 +1,5 @@
# scripts
add_ceph_test(check-generated.sh ${CMAKE_CURRENT_SOURCE_DIR}/check-generated.sh)
+set_tests_properties(check-generated.sh PROPERTIES TIMEOUT 18000)
add_ceph_test(readable.sh ${CMAKE_CURRENT_SOURCE_DIR}/readable.sh)
+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
--- ceph-15.2.3/src/test/mgr/CMakeLists.txt 2020-05-30 01:54:50.000000000 +0930
+++ ceph-15.2.3-fix_tests/src/test/mgr/CMakeLists.txt 2020-06-28 12:03:26.090133791 +0930
@@ -9,6 +9,7 @@
if(WITH_MGR_DASHBOARD_FRONTEND)
if(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64|arm|ARM")
add_ceph_test(mgr-dashboard-frontend-unittests ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/run-frontend-unittests.sh)
+ set_tests_properties(mgr-dashboard-frontend-unittests PROPERTIES TIMEOUT 18000)
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)
diff -uNr ceph-15.2.3/src/test/objectstore/CMakeLists.txt ceph-15.2.3-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.3-fix_tests/src/test/objectstore/CMakeLists.txt 2020-06-28 12:03:26.090133791 +0930
@@ -121,6 +121,7 @@
test_bluefs.cc
)
add_ceph_unittest(unittest_bluefs)
+ set_tests_properties(unittest_bluefs PROPERTIES TIMEOUT 7200)
target_link_libraries(unittest_bluefs os global)
# 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
--- ceph-15.2.3/src/test/osd/TestOSDScrub.cc 2020-05-30 01:54:50.000000000 +0930
+++ ceph-15.2.3-fix_tests/src/test/osd/TestOSDScrub.cc 2020-06-28 12:03:26.091133794 +0930
@@ -70,7 +70,7 @@
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.apply_changes(nullptr);
- tm tm;
+ tm tm = {0};
tm.tm_isdst = -1;
strptime("2015-01-16 12:05:13", "%Y-%m-%d %H:%M:%S", &tm);
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
--- ceph-15.2.3/src/test/smoke.sh 2020-05-30 01:54:50.000000000 +0930
+++ ceph-15.2.3-fix_tests/src/test/smoke.sh 2020-06-28 12:03:26.091133794 +0930
@@ -53,7 +53,7 @@
ceph osd out 0
wait_for_clean
- timeout 8 rados -p foo bench 4 write -b 4096 --no-cleanup || return 1
+ timeout 80 rados -p foo bench 4 write -b 4096 --no-cleanup || return 1
wait_for_clean
ceph osd in 0
ceph-15.2.3-no_git.patch 0 → 100644
View file @ a8a92e23
diff -uNr ceph-15.2.3/do_cmake.sh ceph-15.2.3-no_git/do_cmake.sh
--- ceph-15.2.3/do_cmake.sh 2020-05-30 01:54:50.000000000 +0930
+++ ceph-15.2.3-no_git/do_cmake.sh 2020-06-16 09:38:43.008406364 +0930
@@ -1,7 +1,9 @@
#!/usr/bin/env bash
set -ex
-git submodule update --init --recursive
+if [ -d .git ]; then
+ git submodule update --init --recursive
+fi
: ${BUILD_DIR:=build}
: ${CEPH_GIT_DIR:=..}
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