Skip to content

GitLab

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

Updated ceph to 14.2.9

parent c8129342
Show whitespace changes
Inline Side-by-side
Showing with 46 additions and 46 deletions
Makefile
View file @ 5a517263
......@@ -30,15 +30,15 @@ all: ceph-config
mount --bind tmp /tmp
ln -s /lib /lib64
tar xf ceph-14.2.8.tar.gz
patch -Np1 -d ceph-14.2.8 < ceph-14.2.8-fix_cpu_detection.patch
patch -Np1 -d ceph-14.2.8 < ceph-14.2.8-fix_tests.patch
patch -Np1 -d ceph-14.2.8 < ceph-14.2.8-fix_ceph-volume_systemd_unit.patch
cd ceph-14.2.8 && ./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
$(MAKE) -C ceph-14.2.8/build npm_config_cache=/build/.npm
tar xf ceph-14.2.9.tar.gz
patch -Np1 -d ceph-14.2.9 < ceph-14.2.9-fix_cpu_detection.patch
patch -Np1 -d ceph-14.2.9 < ceph-14.2.9-fix_tests.patch
patch -Np1 -d ceph-14.2.9 < ceph-14.2.9-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
$(MAKE) -C ceph-14.2.9/build npm_config_cache=/build/.npm
hostname localhost
cd ceph-14.2.8 && tar xf ../ceph-object-corpus.tar.xz
cd ceph-14.2.8/build && CTEST_OUTPUT_ON_FAILURE=1 make check
cd ceph-14.2.9 && tar xf ../ceph-object-corpus.tar.xz
cd ceph-14.2.9/build && CTEST_OUTPUT_ON_FAILURE=1 make check
rm -rf /lib64
umount /tmp
......@@ -46,7 +46,7 @@ all: ceph-config
swapoff swap
rm -rf swap
$(MAKE) -C ceph-14.2.8/build install
$(MAKE) -C ceph-14.2.9/build install
rm /usr/bin/ceph_test*
find / -name *.pyc -exec rm -f '{}' ';'
find / -name *.js.map -exec rm -f '{}' ';'
......@@ -82,7 +82,7 @@ all: ceph-config
systemctl enable ceph-osd.target
systemctl enable ceph-radosgw.target
rm -rf ceph-14.2.8
rm -rf ceph-14.2.9
ceph-config:
define CEPH_CONFIG
......
ceph-14.2.8-fix_ceph-volume_systemd_unit.patch → ceph-14.2.9-fix_ceph-volume_systemd_unit.patch
View file @ 5a517263
diff -uNr ceph-14.2.8/systemd/ceph-volume@.service ceph-14.2.8-fix_ceph-volume_systemd_unit/systemd/ceph-volume@.service
--- ceph-14.2.8/systemd/ceph-volume@.service 2020-03-03 04:19:20.000000000 +1030
+++ ceph-14.2.8-fix_ceph-volume_systemd_unit/systemd/ceph-volume@.service 2020-03-04 09:52:35.858628510 +1030
diff -uNr ceph-14.2.9/systemd/ceph-volume@.service ceph-14.2.9-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-14.2.9-fix_ceph-volume_systemd_unit/systemd/ceph-volume@.service 2020-05-16 15:59:32.320108510 +0930
@@ -7,7 +7,7 @@
Type=oneshot
KillMode=none
......
ceph-14.2.8-fix_cpu_detection.patch → ceph-14.2.9-fix_cpu_detection.patch
View file @ 5a517263
diff -uNr ceph-14.2.8/cmake/modules/SIMDExt.cmake ceph-14.2.8-fix_cpu_detection/cmake/modules/SIMDExt.cmake
--- ceph-14.2.8/cmake/modules/SIMDExt.cmake 2020-03-03 04:19:20.000000000 +1030
+++ ceph-14.2.8-fix_cpu_detection/cmake/modules/SIMDExt.cmake 2020-03-04 09:56:29.939050462 +1030
diff -uNr ceph-14.2.9/cmake/modules/SIMDExt.cmake ceph-14.2.9-fix_cpu_detection/cmake/modules/SIMDExt.cmake
--- ceph-14.2.9/cmake/modules/SIMDExt.cmake 2020-04-10 01:47:28.000000000 +0930
+++ ceph-14.2.9-fix_cpu_detection/cmake/modules/SIMDExt.cmake 2020-05-16 16:04:15.693999479 +0930
@@ -48,32 +48,53 @@
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i386|i686|amd64|x86_64|AMD64")
set(HAVE_INTEL 1)
......@@ -62,9 +62,9 @@ diff -uNr ceph-14.2.8/cmake/modules/SIMDExt.cmake ceph-14.2.8-fix_cpu_detection/
if(HAVE_INTEL_SSE4_2)
set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse4.2")
endif()
diff -uNr ceph-14.2.8/src/test/test_arch.cc ceph-14.2.8-fix_cpu_detection/src/test/test_arch.cc
--- ceph-14.2.8/src/test/test_arch.cc 2020-03-03 04:19:20.000000000 +1030
+++ ceph-14.2.8-fix_cpu_detection/src/test/test_arch.cc 2020-03-04 09:56:29.940050464 +1030
diff -uNr ceph-14.2.9/src/test/test_arch.cc ceph-14.2.9-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-14.2.9-fix_cpu_detection/src/test/test_arch.cc 2020-05-16 16:04:15.695999485 +0930
@@ -69,7 +69,7 @@
expected = strstr(flags, " sse4_1 ") ? 1 : 0;
EXPECT_EQ(expected, ceph_arch_intel_sse41);
......
ceph-14.2.8-fix_tests.patch → ceph-14.2.9-fix_tests.patch
View file @ 5a517263
diff -uNr ceph-14.2.8/src/pybind/mgr/dashboard/tests/test_task.py ceph-14.2.8-fix_tests/src/pybind/mgr/dashboard/tests/test_task.py
--- ceph-14.2.8/src/pybind/mgr/dashboard/tests/test_task.py 2020-03-03 04:19:20.000000000 +1030
+++ ceph-14.2.8-fix_tests/src/pybind/mgr/dashboard/tests/test_task.py 2020-03-04 10:01:32.782595530 +1030
diff -uNr ceph-14.2.9/src/pybind/mgr/dashboard/tests/test_task.py ceph-14.2.9-fix_tests/src/pybind/mgr/dashboard/tests/test_task.py
--- ceph-14.2.9/src/pybind/mgr/dashboard/tests/test_task.py 2020-04-10 01:47:28.000000000 +0930
+++ ceph-14.2.9-fix_tests/src/pybind/mgr/dashboard/tests/test_task.py 2020-05-16 16:07:16.313567373 +0930
@@ -127,18 +127,6 @@
self.assertEqual(result,
{'args': ['dummy arg'], 'kwargs': {'dummy': 'arg'}})
......@@ -228,9 +228,9 @@ diff -uNr ceph-14.2.8/src/pybind/mgr/dashboard/tests/test_task.py ceph-14.2.8-fi
def test_task_serialization_format_on_failure(self):
task1 = MyTask(1, fail=True)
task1.run('test14/task1', 0.5)
diff -uNr ceph-14.2.8/src/test/CMakeLists.txt ceph-14.2.8-fix_tests/src/test/CMakeLists.txt
--- ceph-14.2.8/src/test/CMakeLists.txt 2020-03-03 04:19:20.000000000 +1030
+++ ceph-14.2.8-fix_tests/src/test/CMakeLists.txt 2020-03-04 10:01:32.782595530 +1030
diff -uNr ceph-14.2.9/src/test/CMakeLists.txt ceph-14.2.9-fix_tests/src/test/CMakeLists.txt
--- ceph-14.2.9/src/test/CMakeLists.txt 2020-04-10 01:47:28.000000000 +0930
+++ ceph-14.2.9-fix_tests/src/test/CMakeLists.txt 2020-05-16 16:07:16.314567376 +0930
@@ -529,6 +529,7 @@
if(WITH_RBD)
......@@ -239,18 +239,18 @@ diff -uNr ceph-14.2.8/src/test/CMakeLists.txt ceph-14.2.8-fix_tests/src/test/CMa
if(FREEBSD)
add_ceph_test(rbd-ggate.sh ${CMAKE_CURRENT_SOURCE_DIR}/rbd-ggate.sh)
endif(FREEBSD)
diff -uNr ceph-14.2.8/src/test/encoding/CMakeLists.txt ceph-14.2.8-fix_tests/src/test/encoding/CMakeLists.txt
--- ceph-14.2.8/src/test/encoding/CMakeLists.txt 2020-03-03 04:19:20.000000000 +1030
+++ ceph-14.2.8-fix_tests/src/test/encoding/CMakeLists.txt 2020-03-04 10:01:32.782595530 +1030
diff -uNr ceph-14.2.9/src/test/encoding/CMakeLists.txt ceph-14.2.9-fix_tests/src/test/encoding/CMakeLists.txt
--- ceph-14.2.9/src/test/encoding/CMakeLists.txt 2020-04-10 01:47:28.000000000 +0930
+++ ceph-14.2.9-fix_tests/src/test/encoding/CMakeLists.txt 2020-05-16 16:07:16.314567376 +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-14.2.8/src/test/journal/test_ObjectRecorder.cc ceph-14.2.8-fix_tests/src/test/journal/test_ObjectRecorder.cc
--- ceph-14.2.8/src/test/journal/test_ObjectRecorder.cc 2020-03-03 04:19:20.000000000 +1030
+++ ceph-14.2.8-fix_tests/src/test/journal/test_ObjectRecorder.cc 2020-03-04 10:01:32.782595530 +1030
diff -uNr ceph-14.2.9/src/test/journal/test_ObjectRecorder.cc ceph-14.2.9-fix_tests/src/test/journal/test_ObjectRecorder.cc
--- ceph-14.2.9/src/test/journal/test_ObjectRecorder.cc 2020-04-10 01:47:28.000000000 +0930
+++ ceph-14.2.9-fix_tests/src/test/journal/test_ObjectRecorder.cc 2020-05-16 16:07:16.314567376 +0930
@@ -240,38 +240,6 @@
ASSERT_EQ(0U, object->get_pending_appends());
}
......@@ -290,9 +290,9 @@ diff -uNr ceph-14.2.8/src/test/journal/test_ObjectRecorder.cc ceph-14.2.8-fix_te
TEST_F(TestObjectRecorder, Flush) {
std::string oid = get_temp_oid();
ASSERT_EQ(0, create(oid));
diff -uNr ceph-14.2.8/src/test/mgr/CMakeLists.txt ceph-14.2.8-fix_tests/src/test/mgr/CMakeLists.txt
--- ceph-14.2.8/src/test/mgr/CMakeLists.txt 2020-03-03 04:19:20.000000000 +1030
+++ ceph-14.2.8-fix_tests/src/test/mgr/CMakeLists.txt 2020-03-04 10:01:32.782595530 +1030
diff -uNr ceph-14.2.9/src/test/mgr/CMakeLists.txt ceph-14.2.9-fix_tests/src/test/mgr/CMakeLists.txt
--- ceph-14.2.9/src/test/mgr/CMakeLists.txt 2020-04-10 01:47:28.000000000 +0930
+++ ceph-14.2.9-fix_tests/src/test/mgr/CMakeLists.txt 2020-05-16 16:07:16.314567376 +0930
@@ -9,6 +9,7 @@
if(WITH_MGR_DASHBOARD_FRONTEND)
if(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64|arm|ARM")
......@@ -301,9 +301,9 @@ diff -uNr ceph-14.2.8/src/test/mgr/CMakeLists.txt ceph-14.2.8-fix_tests/src/test
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-14.2.8/src/test/mgr/CMakeLists.txt.orig ceph-14.2.8-fix_tests/src/test/mgr/CMakeLists.txt.orig
--- ceph-14.2.8/src/test/mgr/CMakeLists.txt.orig 1970-01-01 09:30:00.000000000 +0930
+++ ceph-14.2.8-fix_tests/src/test/mgr/CMakeLists.txt.orig 2020-03-03 04:19:20.000000000 +1030
diff -uNr ceph-14.2.9/src/test/mgr/CMakeLists.txt.orig ceph-14.2.9-fix_tests/src/test/mgr/CMakeLists.txt.orig
--- ceph-14.2.9/src/test/mgr/CMakeLists.txt.orig 1970-01-01 09:30:00.000000000 +0930
+++ ceph-14.2.9-fix_tests/src/test/mgr/CMakeLists.txt.orig 2020-05-16 16:07:16.314567376 +0930
@@ -0,0 +1,16 @@
+# unittest_mgr_mgrcap
+add_executable(unittest_mgr_mgrcap
......@@ -321,9 +321,9 @@ diff -uNr ceph-14.2.8/src/test/mgr/CMakeLists.txt.orig ceph-14.2.8-fix_tests/src
+ add_ceph_test(mgr-dashboard-smoke.sh ${CMAKE_CURRENT_SOURCE_DIR}/mgr-dashboard-smoke.sh)
+endif(WITH_MGR_DASHBOARD_FRONTEND)
+
diff -uNr ceph-14.2.8/src/test/objectstore/CMakeLists.txt ceph-14.2.8-fix_tests/src/test/objectstore/CMakeLists.txt
--- ceph-14.2.8/src/test/objectstore/CMakeLists.txt 2020-03-03 04:19:20.000000000 +1030
+++ ceph-14.2.8-fix_tests/src/test/objectstore/CMakeLists.txt 2020-03-04 10:01:32.782595530 +1030
diff -uNr ceph-14.2.9/src/test/objectstore/CMakeLists.txt ceph-14.2.9-fix_tests/src/test/objectstore/CMakeLists.txt
--- ceph-14.2.9/src/test/objectstore/CMakeLists.txt 2020-04-10 01:47:28.000000000 +0930
+++ ceph-14.2.9-fix_tests/src/test/objectstore/CMakeLists.txt 2020-05-16 16:07:16.314567376 +0930
@@ -110,6 +110,7 @@
test_bluefs.cc
)
......@@ -332,9 +332,9 @@ diff -uNr ceph-14.2.8/src/test/objectstore/CMakeLists.txt ceph-14.2.8-fix_tests/
target_link_libraries(unittest_bluefs os global)
# unittest_bluestore_types
diff -uNr ceph-14.2.8/src/test/osd/TestOSDScrub.cc ceph-14.2.8-fix_tests/src/test/osd/TestOSDScrub.cc
--- ceph-14.2.8/src/test/osd/TestOSDScrub.cc 2020-03-03 04:19:20.000000000 +1030
+++ ceph-14.2.8-fix_tests/src/test/osd/TestOSDScrub.cc 2020-03-04 10:01:32.783595532 +1030
diff -uNr ceph-14.2.9/src/test/osd/TestOSDScrub.cc ceph-14.2.9-fix_tests/src/test/osd/TestOSDScrub.cc
--- ceph-14.2.9/src/test/osd/TestOSDScrub.cc 2020-04-10 01:47:28.000000000 +0930
+++ ceph-14.2.9-fix_tests/src/test/osd/TestOSDScrub.cc 2020-05-16 16:07:16.314567376 +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");
......@@ -344,9 +344,9 @@ diff -uNr ceph-14.2.8/src/test/osd/TestOSDScrub.cc ceph-14.2.8-fix_tests/src/tes
strptime("2015-01-16 12:05:13", "%Y-%m-%d %H:%M:%S", &tm);
utime_t now = utime_t(mktime(&tm), 0);
bool ret = osd->scrub_time_permit(now);
diff -uNr ceph-14.2.8/src/test/smoke.sh ceph-14.2.8-fix_tests/src/test/smoke.sh
--- ceph-14.2.8/src/test/smoke.sh 2020-03-03 04:19:20.000000000 +1030
+++ ceph-14.2.8-fix_tests/src/test/smoke.sh 2020-03-04 10:01:32.783595532 +1030
diff -uNr ceph-14.2.9/src/test/smoke.sh ceph-14.2.9-fix_tests/src/test/smoke.sh
--- ceph-14.2.9/src/test/smoke.sh 2020-04-10 01:47:28.000000000 +0930
+++ ceph-14.2.9-fix_tests/src/test/smoke.sh 2020-05-16 16:07:16.315567380 +0930
@@ -53,7 +53,7 @@
ceph osd out 0
wait_for_clean
......
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