Skip to content

GitLab

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

Updated to ceph 14.2.5

parent a330d761
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 43 deletions
Makefile
View file @ df08a451
...@@ -30,15 +30,15 @@ all: ceph-config ...@@ -30,15 +30,15 @@ all: ceph-config
mount --bind tmp /tmp mount --bind tmp /tmp
ln -s /lib /lib64 ln -s /lib /lib64
tar xf ceph-14.2.4.tar.gz tar xf ceph-14.2.5.tar.gz
patch -Np1 -d ceph-14.2.4 < ceph-14.2.4-fix_cpu_detection.patch patch -Np1 -d ceph-14.2.5 < ceph-14.2.5-fix_cpu_detection.patch
patch -Np1 -d ceph-14.2.4 < ceph-14.2.4-fix_tests.patch patch -Np1 -d ceph-14.2.5 < ceph-14.2.5-fix_tests.patch
patch -Np1 -d ceph-14.2.4 < ceph-14.2.4-fix_ceph-volume_systemd_unit.patch patch -Np1 -d ceph-14.2.5 < ceph-14.2.5-fix_ceph-volume_systemd_unit.patch
cd ceph-14.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 cd ceph-14.2.5 && ./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
$(MAKE) -C ceph-14.2.4/build npm_config_cache=/build/.npm $(MAKE) -C ceph-14.2.5/build npm_config_cache=/build/.npm
hostname localhost hostname localhost
cd ceph-14.2.4 && tar xf ../ceph-object-corpus.tar.xz cd ceph-14.2.5 && tar xf ../ceph-object-corpus.tar.xz
cd ceph-14.2.4/build && CTEST_OUTPUT_ON_FAILURE=1 make check cd ceph-14.2.5/build && CTEST_OUTPUT_ON_FAILURE=1 make check
rm -rf /lib64 rm -rf /lib64
umount /tmp umount /tmp
...@@ -46,7 +46,7 @@ all: ceph-config ...@@ -46,7 +46,7 @@ all: ceph-config
swapoff swap swapoff swap
rm -rf swap rm -rf swap
$(MAKE) -C ceph-14.2.4/build install $(MAKE) -C ceph-14.2.5/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 '{}' ';'
...@@ -80,7 +80,7 @@ all: ceph-config ...@@ -80,7 +80,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.4 rm -rf ceph-14.2.5
ceph-config: ceph-config:
define CEPH_CONFIG define CEPH_CONFIG
......
ceph-14.2.4-fix_ceph-volume_systemd_unit.patch → ceph-14.2.5-fix_ceph-volume_systemd_unit.patch
View file @ df08a451
diff -uNr ceph-14.2.4/systemd/ceph-volume@.service ceph-14.2.4-fix_ceph-volume_systemd_unit/systemd/ceph-volume@.service diff -uNr ceph-14.2.5/systemd/ceph-volume@.service ceph-14.2.5-fix_ceph-volume_systemd_unit/systemd/ceph-volume@.service
--- ceph-14.2.4/systemd/ceph-volume@.service 2019-09-14 03:37:41.000000000 +0930 --- ceph-14.2.5/systemd/ceph-volume@.service 2019-12-07 03:12:34.000000000 +1030
+++ ceph-14.2.4-fix_ceph-volume_systemd_unit/systemd/ceph-volume@.service 2019-11-21 09:51:28.143608923 +1030 +++ ceph-14.2.5-fix_ceph-volume_systemd_unit/systemd/ceph-volume@.service 2019-12-12 09:54:42.332695768 +1030
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
Type=oneshot Type=oneshot
KillMode=none KillMode=none
......
ceph-14.2.4-fix_cpu_detection.patch → ceph-14.2.5-fix_cpu_detection.patch
View file @ df08a451
diff -uNr ceph-14.2.4/cmake/modules/SIMDExt.cmake ceph-14.2.4-fix_cpu_detection/cmake/modules/SIMDExt.cmake diff -uNr ceph-14.2.5/cmake/modules/SIMDExt.cmake ceph-14.2.5-fix_cpu_detection/cmake/modules/SIMDExt.cmake
--- ceph-14.2.4/cmake/modules/SIMDExt.cmake 2019-09-14 03:37:41.000000000 +0930 --- ceph-14.2.5/cmake/modules/SIMDExt.cmake 2019-12-07 03:12:34.000000000 +1030
+++ ceph-14.2.4-fix_cpu_detection/cmake/modules/SIMDExt.cmake 2019-10-22 20:54:05.941235917 +1030 +++ ceph-14.2.5-fix_cpu_detection/cmake/modules/SIMDExt.cmake 2019-12-12 09:58:23.020158663 +1030
@@ -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.4/cmake/modules/SIMDExt.cmake ceph-14.2.4-fix_cpu_detection/ ...@@ -62,9 +62,9 @@ diff -uNr ceph-14.2.4/cmake/modules/SIMDExt.cmake ceph-14.2.4-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.4/src/test/test_arch.cc ceph-14.2.4-fix_cpu_detection/src/test/test_arch.cc diff -uNr ceph-14.2.5/src/test/test_arch.cc ceph-14.2.5-fix_cpu_detection/src/test/test_arch.cc
--- ceph-14.2.4/src/test/test_arch.cc 2019-09-14 03:37:41.000000000 +0930 --- ceph-14.2.5/src/test/test_arch.cc 2019-12-07 03:12:34.000000000 +1030
+++ ceph-14.2.4-fix_cpu_detection/src/test/test_arch.cc 2019-10-22 21:31:22.290390502 +1030 +++ ceph-14.2.5-fix_cpu_detection/src/test/test_arch.cc 2019-12-12 09:58:23.041158707 +1030
@@ -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-14.2.4-fix_tests.patch → ceph-14.2.5-fix_tests.patch
View file @ df08a451
diff -uNr ceph-14.2.4/src/pybind/mgr/dashboard/tests/test_task.py ceph-14.2.4-fix_tests/src/pybind/mgr/dashboard/tests/test_task.py diff -uNr ceph-14.2.5/src/pybind/mgr/dashboard/tests/test_task.py ceph-14.2.5-fix_tests/src/pybind/mgr/dashboard/tests/test_task.py
--- ceph-14.2.4/src/pybind/mgr/dashboard/tests/test_task.py 2019-09-14 03:37:41.000000000 +0930 --- ceph-14.2.5/src/pybind/mgr/dashboard/tests/test_task.py 2019-12-07 03:12:34.000000000 +1030
+++ ceph-14.2.4-fix_tests/src/pybind/mgr/dashboard/tests/test_task.py 2019-10-30 23:42:11.011023004 +1030 +++ ceph-14.2.5-fix_tests/src/pybind/mgr/dashboard/tests/test_task.py 2019-12-12 10:01:09.002506817 +1030
@@ -151,20 +151,6 @@ @@ -151,20 +151,6 @@
self.assertTaskResult(fn_t[0].ret_value) self.assertTaskResult(fn_t[0].ret_value)
self.assertEqual(fn_t[0].progress, 100) self.assertEqual(fn_t[0].progress, 100)
...@@ -127,9 +127,9 @@ diff -uNr ceph-14.2.4/src/pybind/mgr/dashboard/tests/test_task.py ceph-14.2.4-fi ...@@ -127,9 +127,9 @@ diff -uNr ceph-14.2.4/src/pybind/mgr/dashboard/tests/test_task.py ceph-14.2.4-fi
def test_fast_async_task(self): def test_fast_async_task(self):
task1 = MyTask(1, is_async=True) task1 = MyTask(1, is_async=True)
state, result = task1.run('test9/task1') state, result = task1.run('test9/task1')
diff -uNr ceph-14.2.4/src/test/CMakeLists.txt ceph-14.2.4-fix_tests/src/test/CMakeLists.txt diff -uNr ceph-14.2.5/src/test/CMakeLists.txt ceph-14.2.5-fix_tests/src/test/CMakeLists.txt
--- ceph-14.2.4/src/test/CMakeLists.txt 2019-09-14 03:37:41.000000000 +0930 --- ceph-14.2.5/src/test/CMakeLists.txt 2019-12-07 03:12:34.000000000 +1030
+++ ceph-14.2.4-fix_tests/src/test/CMakeLists.txt 2019-10-30 13:22:43.888087653 +1030 +++ ceph-14.2.5-fix_tests/src/test/CMakeLists.txt 2019-12-12 10:01:09.003506819 +1030
@@ -529,6 +529,7 @@ @@ -529,6 +529,7 @@
if(WITH_RBD) if(WITH_RBD)
...@@ -138,18 +138,18 @@ diff -uNr ceph-14.2.4/src/test/CMakeLists.txt ceph-14.2.4-fix_tests/src/test/CMa ...@@ -138,18 +138,18 @@ diff -uNr ceph-14.2.4/src/test/CMakeLists.txt ceph-14.2.4-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-14.2.4/src/test/encoding/CMakeLists.txt ceph-14.2.4-fix_tests/src/test/encoding/CMakeLists.txt diff -uNr ceph-14.2.5/src/test/encoding/CMakeLists.txt ceph-14.2.5-fix_tests/src/test/encoding/CMakeLists.txt
--- ceph-14.2.4/src/test/encoding/CMakeLists.txt 2019-09-14 03:37:41.000000000 +0930 --- ceph-14.2.5/src/test/encoding/CMakeLists.txt 2019-12-07 03:12:34.000000000 +1030
+++ ceph-14.2.4-fix_tests/src/test/encoding/CMakeLists.txt 2019-10-30 13:22:43.888087653 +1030 +++ ceph-14.2.5-fix_tests/src/test/encoding/CMakeLists.txt 2019-12-12 10:01:09.003506819 +1030
@@ -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-14.2.4/src/test/journal/test_ObjectRecorder.cc ceph-14.2.4-fix_tests/src/test/journal/test_ObjectRecorder.cc diff -uNr ceph-14.2.5/src/test/journal/test_ObjectRecorder.cc ceph-14.2.5-fix_tests/src/test/journal/test_ObjectRecorder.cc
--- ceph-14.2.4/src/test/journal/test_ObjectRecorder.cc 2019-09-14 03:37:41.000000000 +0930 --- ceph-14.2.5/src/test/journal/test_ObjectRecorder.cc 2019-12-07 03:12:34.000000000 +1030
+++ ceph-14.2.4-fix_tests/src/test/journal/test_ObjectRecorder.cc 2019-10-30 13:22:43.888087653 +1030 +++ ceph-14.2.5-fix_tests/src/test/journal/test_ObjectRecorder.cc 2019-12-12 10:01:09.003506819 +1030
@@ -240,38 +240,6 @@ @@ -240,38 +240,6 @@
ASSERT_EQ(0U, object->get_pending_appends()); ASSERT_EQ(0U, object->get_pending_appends());
} }
...@@ -189,9 +189,9 @@ diff -uNr ceph-14.2.4/src/test/journal/test_ObjectRecorder.cc ceph-14.2.4-fix_te ...@@ -189,9 +189,9 @@ diff -uNr ceph-14.2.4/src/test/journal/test_ObjectRecorder.cc ceph-14.2.4-fix_te
TEST_F(TestObjectRecorder, Flush) { TEST_F(TestObjectRecorder, Flush) {
std::string oid = get_temp_oid(); std::string oid = get_temp_oid();
ASSERT_EQ(0, create(oid)); ASSERT_EQ(0, create(oid));
diff -uNr ceph-14.2.4/src/test/mgr/CMakeLists.txt ceph-14.2.4-fix_tests/src/test/mgr/CMakeLists.txt diff -uNr ceph-14.2.5/src/test/mgr/CMakeLists.txt ceph-14.2.5-fix_tests/src/test/mgr/CMakeLists.txt
--- ceph-14.2.4/src/test/mgr/CMakeLists.txt 2019-09-14 03:37:41.000000000 +0930 --- ceph-14.2.5/src/test/mgr/CMakeLists.txt 2019-12-07 03:12:34.000000000 +1030
+++ ceph-14.2.4-fix_tests/src/test/mgr/CMakeLists.txt 2019-11-01 01:14:49.795949847 +1030 +++ ceph-14.2.5-fix_tests/src/test/mgr/CMakeLists.txt 2019-12-12 10:01:09.003506819 +1030
@@ -2,6 +2,7 @@ @@ -2,6 +2,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")
...@@ -200,9 +200,9 @@ diff -uNr ceph-14.2.4/src/test/mgr/CMakeLists.txt ceph-14.2.4-fix_tests/src/test ...@@ -200,9 +200,9 @@ diff -uNr ceph-14.2.4/src/test/mgr/CMakeLists.txt ceph-14.2.4-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-14.2.4/src/test/objectstore/CMakeLists.txt ceph-14.2.4-fix_tests/src/test/objectstore/CMakeLists.txt diff -uNr ceph-14.2.5/src/test/objectstore/CMakeLists.txt ceph-14.2.5-fix_tests/src/test/objectstore/CMakeLists.txt
--- ceph-14.2.4/src/test/objectstore/CMakeLists.txt 2019-09-14 03:37:41.000000000 +0930 --- ceph-14.2.5/src/test/objectstore/CMakeLists.txt 2019-12-07 03:12:34.000000000 +1030
+++ ceph-14.2.4-fix_tests/src/test/objectstore/CMakeLists.txt 2019-10-30 13:22:43.888087653 +1030 +++ ceph-14.2.5-fix_tests/src/test/objectstore/CMakeLists.txt 2019-12-12 10:01:09.003506819 +1030
@@ -110,6 +110,7 @@ @@ -110,6 +110,7 @@
test_bluefs.cc test_bluefs.cc
) )
...@@ -211,9 +211,9 @@ diff -uNr ceph-14.2.4/src/test/objectstore/CMakeLists.txt ceph-14.2.4-fix_tests/ ...@@ -211,9 +211,9 @@ diff -uNr ceph-14.2.4/src/test/objectstore/CMakeLists.txt ceph-14.2.4-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-14.2.4/src/test/osd/TestOSDScrub.cc ceph-14.2.4-fix_tests/src/test/osd/TestOSDScrub.cc diff -uNr ceph-14.2.5/src/test/osd/TestOSDScrub.cc ceph-14.2.5-fix_tests/src/test/osd/TestOSDScrub.cc
--- ceph-14.2.4/src/test/osd/TestOSDScrub.cc 2019-09-14 03:37:41.000000000 +0930 --- ceph-14.2.5/src/test/osd/TestOSDScrub.cc 2019-12-07 03:12:34.000000000 +1030
+++ ceph-14.2.4-fix_tests/src/test/osd/TestOSDScrub.cc 2019-10-30 13:22:43.888087653 +1030 +++ ceph-14.2.5-fix_tests/src/test/osd/TestOSDScrub.cc 2019-12-12 10:01:09.004506821 +1030
@@ -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");
...@@ -223,9 +223,9 @@ diff -uNr ceph-14.2.4/src/test/osd/TestOSDScrub.cc ceph-14.2.4-fix_tests/src/tes ...@@ -223,9 +223,9 @@ diff -uNr ceph-14.2.4/src/test/osd/TestOSDScrub.cc ceph-14.2.4-fix_tests/src/tes
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);
bool ret = osd->scrub_time_permit(now); bool ret = osd->scrub_time_permit(now);
diff -uNr ceph-14.2.4/src/test/smoke.sh ceph-14.2.4-fix_tests/src/test/smoke.sh diff -uNr ceph-14.2.5/src/test/smoke.sh ceph-14.2.5-fix_tests/src/test/smoke.sh
--- ceph-14.2.4/src/test/smoke.sh 2019-09-14 03:37:41.000000000 +0930 --- ceph-14.2.5/src/test/smoke.sh 2019-12-07 03:12:34.000000000 +1030
+++ ceph-14.2.4-fix_tests/src/test/smoke.sh 2019-10-30 13:22:43.889087655 +1030 +++ ceph-14.2.5-fix_tests/src/test/smoke.sh 2019-12-12 10:01:09.004506821 +1030
@@ -53,7 +53,7 @@ @@ -53,7 +53,7 @@
ceph osd out 0 ceph osd out 0
wait_for_clean 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