Updated ceph to 15.2.3

Makefile

@@ -30,15 +30,16 @@ all: ceph-config
 	mount --bind tmp /tmp
 	ln -s /lib /lib64
 
-	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
+	tar xf ceph-15.2.3.tar.gz
+	patch -Np1 -d ceph-15.2.3 < ceph-15.2.3-fix_cpu_detection.patch
+	patch -Np1 -d ceph-15.2.3 < ceph-15.2.3-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.3 < ceph-15.2.3-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
+	$(MAKE) -C ceph-15.2.3/build npm_config_cache=/build/.npm NODE_OPTIONS="--max-old-space-size=4096"
 	hostname localhost
-	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
+	cd ceph-15.2.3 && 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
 
 	rm -rf /lib64
 	umount /tmp
@@ -46,13 +47,14 @@ all: ceph-config
 	swapoff 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*
 	find / -name *.pyc -exec rm -f '{}' ';'
 	find / -name *.js.map -exec rm -f '{}' ';'
 	find / -name *.css.map -exec rm -f '{}' ';'
 	find / -depth -name .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
 	rm -rf /lib/ceph
 	install -v -Dm755 -d /etc/sysconfig
@@ -82,7 +84,7 @@ all: ceph-config
 	systemctl enable ceph-osd.target
 	systemctl enable ceph-radosgw.target
 
-	rm -rf ceph-14.2.9
+	rm -rf ceph-15.2.3
 
 ceph-config:
 define CEPH_CONFIG

ceph-14.2.9-fix_tests.patch

-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'}})
- 
--    def test_fast_task(self):
--        task1 = MyTask(1)
--        state, result = task1.run('test1/task1')
--        self.assertEqual(state, TaskManager.VALUE_DONE)
--        self.assertTaskResult(result)
--        self.wait_for_task('test1/task1')
--        _, fn_t = TaskManager.list('test1/*')
--        self.assertEqual(len(fn_t), 1)
--        self.assertIsNone(fn_t[0].exception)
--        self.assertTaskResult(fn_t[0].ret_value)
--        self.assertEqual(fn_t[0].progress, 100)
--
-     def test_slow_task(self):
-         task1 = MyTask(1)
-         state, result = task1.run('test2/task1', 0.5)
-@@ -151,20 +139,6 @@
-         self.assertTaskResult(fn_t[0].ret_value)
-         self.assertEqual(fn_t[0].progress, 100)
- 
--    def test_fast_task_with_failure(self):
--        task1 = MyTask(1, fail=True, progress=40)
--
--        with self.assertRaises(Exception) as ctx:
--            task1.run('test3/task1')
--
--        self.assertEqual(str(ctx.exception), "Task Unexpected Exception")
--        self.wait_for_task('test3/task1')
--        _, fn_t = TaskManager.list('test3/*')
--        self.assertEqual(len(fn_t), 1)
--        self.assertIsNone(fn_t[0].ret_value)
--        self.assertEqual(str(fn_t[0].exception), "Task Unexpected Exception")
--        self.assertEqual(fn_t[0].progress, 40)
--
-     def test_slow_task_with_failure(self):
-         task1 = MyTask(1, fail=True, progress=70)
-         state, result = task1.run('test4/task1', 0.5)
-@@ -177,145 +151,6 @@
-         self.assertEqual(str(fn_t[0].exception), "Task Unexpected Exception")
-         self.assertEqual(fn_t[0].progress, 70)
- 
--    def test_executing_tasks_list(self):
--        task1 = MyTask(0, wait=True, progress=30)
--        task2 = MyTask(0, wait=True, progress=60)
--        state, result = task1.run('test5/task1', 0.5)
--        self.assertEqual(state, TaskManager.VALUE_EXECUTING)
--        self.assertIsNone(result)
--        ex_t, _ = TaskManager.list('test5/*')
--        self.assertEqual(len(ex_t), 1)
--        self.assertEqual(ex_t[0].name, 'test5/task1')
--        self.assertEqual(ex_t[0].progress, 30)
--        state, result = task2.run('test5/task2', 0.5)
--        self.assertEqual(state, TaskManager.VALUE_EXECUTING)
--        self.assertIsNone(result)
--        ex_t, _ = TaskManager.list('test5/*')
--        self.assertEqual(len(ex_t), 2)
--        for task in ex_t:
--            if task.name == 'test5/task1':
--                self.assertEqual(task.progress, 30)
--            elif task.name == 'test5/task2':
--                self.assertEqual(task.progress, 60)
--        task2.resume()
--        self.wait_for_task('test5/task2')
--        ex_t, _ = TaskManager.list('test5/*')
--        self.assertEqual(len(ex_t), 1)
--        self.assertEqual(ex_t[0].name, 'test5/task1')
--        task1.resume()
--        self.wait_for_task('test5/task1')
--        ex_t, _ = TaskManager.list('test5/*')
--        self.assertEqual(len(ex_t), 0)
--
--    def test_task_idempotent(self):
--        task1 = MyTask(0, wait=True)
--        task1_clone = MyTask(0, wait=True)
--        state, result = task1.run('test6/task1', 0.5)
--        self.assertEqual(state, TaskManager.VALUE_EXECUTING)
--        self.assertIsNone(result)
--        ex_t, _ = TaskManager.list('test6/*')
--        self.assertEqual(len(ex_t), 1)
--        self.assertEqual(ex_t[0].name, 'test6/task1')
--        state, result = task1_clone.run('test6/task1', 0.5)
--        self.assertEqual(state, TaskManager.VALUE_EXECUTING)
--        self.assertIsNone(result)
--        ex_t, _ = TaskManager.list('test6/*')
--        self.assertEqual(len(ex_t), 1)
--        self.assertEqual(ex_t[0].name, 'test6/task1')
--        task1.resume()
--        self.wait_for_task('test6/task1')
--        ex_t, fn_t = TaskManager.list('test6/*')
--        self.assertEqual(len(ex_t), 0)
--        self.assertEqual(len(fn_t), 1)
--
--    def test_finished_cleanup(self):
--        TaskManager.FINISHED_TASK_SIZE = 2
--        TaskManager.FINISHED_TASK_TTL = 0.5
--        task1 = MyTask(0)
--        task2 = MyTask(0)
--        state, result = task1.run('test7/task1')
--        self.assertEqual(state, TaskManager.VALUE_DONE)
--        self.assertTaskResult(result)
--        self.wait_for_task('test7/task1')
--        state, result = task2.run('test7/task2')
--        self.assertEqual(state, TaskManager.VALUE_DONE)
--        self.assertTaskResult(result)
--        self.wait_for_task('test7/task2')
--        time.sleep(1)
--        _, fn_t = TaskManager.list('test7/*')
--        self.assertEqual(len(fn_t), 2)
--        for idx, task in enumerate(fn_t):
--            self.assertEqual(task.name,
--                             "test7/task{}".format(len(fn_t)-idx))
--        task3 = MyTask(0)
--        state, result = task3.run('test7/task3')
--        self.assertEqual(state, TaskManager.VALUE_DONE)
--        self.assertTaskResult(result)
--        self.wait_for_task('test7/task3')
--        time.sleep(1)
--        _, fn_t = TaskManager.list('test7/*')
--        self.assertEqual(len(fn_t), 3)
--        for idx, task in enumerate(fn_t):
--            self.assertEqual(task.name,
--                             "test7/task{}".format(len(fn_t)-idx))
--        _, fn_t = TaskManager.list('test7/*')
--        self.assertEqual(len(fn_t), 2)
--        for idx, task in enumerate(fn_t):
--            self.assertEqual(task.name,
--                             "test7/task{}".format(len(fn_t)-idx+1))
--
--    def test_task_serialization_format(self):
--        task1 = MyTask(0, wait=True, progress=20)
--        task2 = MyTask(1)
--        task1.run('test8/task1', 0.5)
--        task2.run('test8/task2', 0.5)
--        self.wait_for_task('test8/task2')
--        ex_t, fn_t = TaskManager.list_serializable('test8/*')
--        self.assertEqual(len(ex_t), 1)
--        self.assertEqual(len(fn_t), 1)
--
--        try:
--            json.dumps(ex_t)
--        except ValueError as ex:
--            self.fail("Failed to serialize executing tasks: {}".format(str(ex)))
--
--        try:
--            json.dumps(fn_t)
--        except ValueError as ex:
--            self.fail("Failed to serialize finished tasks: {}".format(str(ex)))
--
--        # validate executing tasks attributes
--        self.assertEqual(len(ex_t[0].keys()), 4)
--        self.assertEqual(ex_t[0]['name'], 'test8/task1')
--        self.assertEqual(ex_t[0]['metadata'], task1.metadata())
--        self.assertIsNotNone(ex_t[0]['begin_time'])
--        self.assertEqual(ex_t[0]['progress'], 20)
--        # validate finished tasks attributes
--        self.assertEqual(len(fn_t[0].keys()), 9)
--        self.assertEqual(fn_t[0]['name'], 'test8/task2')
--        self.assertEqual(fn_t[0]['metadata'], task2.metadata())
--        self.assertIsNotNone(fn_t[0]['begin_time'])
--        self.assertIsNotNone(fn_t[0]['end_time'])
--        self.assertGreaterEqual(fn_t[0]['duration'], 1.0)
--        self.assertEqual(fn_t[0]['progress'], 100)
--        self.assertTrue(fn_t[0]['success'])
--        self.assertTaskResult(fn_t[0]['ret_value'])
--        self.assertIsNone(fn_t[0]['exception'])
--        task1.resume()
--        self.wait_for_task('test8/task1')
--
--    def test_fast_async_task(self):
--        task1 = MyTask(1, is_async=True)
--        state, result = task1.run('test9/task1')
--        self.assertEqual(state, TaskManager.VALUE_DONE)
--        self.assertTaskResult(result)
--        self.wait_for_task('test9/task1')
--        _, fn_t = TaskManager.list('test9/*')
--        self.assertEqual(len(fn_t), 1)
--        self.assertIsNone(fn_t[0].exception)
--        self.assertTaskResult(fn_t[0].ret_value)
--        self.assertEqual(fn_t[0].progress, 100)
--
-     def test_slow_async_task(self):
-         task1 = MyTask(1, is_async=True)
-         state, result = task1.run('test10/task1', 0.5)
-@@ -328,20 +163,6 @@
-         self.assertTaskResult(fn_t[0].ret_value)
-         self.assertEqual(fn_t[0].progress, 100)
- 
--    def test_fast_async_task_with_failure(self):
--        task1 = MyTask(1, fail=True, progress=40, is_async=True)
--
--        with self.assertRaises(Exception) as ctx:
--            task1.run('test11/task1')
--
--        self.assertEqual(str(ctx.exception), "Task Unexpected Exception")
--        self.wait_for_task('test11/task1')
--        _, fn_t = TaskManager.list('test11/*')
--        self.assertEqual(len(fn_t), 1)
--        self.assertIsNone(fn_t[0].ret_value)
--        self.assertEqual(str(fn_t[0].exception), "Task Unexpected Exception")
--        self.assertEqual(fn_t[0].progress, 40)
--
-     def test_slow_async_task_with_failure(self):
-         task1 = MyTask(1, fail=True, progress=70, is_async=True)
-         state, result = task1.run('test12/task1', 0.5)
-@@ -354,19 +175,6 @@
-         self.assertEqual(str(fn_t[0].exception), "Task Unexpected Exception")
-         self.assertEqual(fn_t[0].progress, 70)
- 
--    def test_fast_async_task_with_premature_failure(self):
--        task1 = MyTask(1, fail="premature", progress=40, is_async=True)
--
--        with self.assertRaises(Exception) as ctx:
--            task1.run('test13/task1')
--
--        self.assertEqual(str(ctx.exception), "Task Unexpected Exception")
--        self.wait_for_task('test13/task1')
--        _, fn_t = TaskManager.list('test13/*')
--        self.assertEqual(len(fn_t), 1)
--        self.assertIsNone(fn_t[0].ret_value)
--        self.assertEqual(str(fn_t[0].exception), "Task Unexpected Exception")
--
-     def test_task_serialization_format_on_failure(self):
-         task1 = MyTask(1, fail=True)
-         task1.run('test14/task1', 0.5)
-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)
-   add_ceph_test(run-rbd-unit-tests.sh ${CMAKE_CURRENT_SOURCE_DIR}/run-rbd-unit-tests.sh)
-+  set_tests_properties(run-rbd-unit-tests.sh PROPERTIES TIMEOUT 7200)
-   if(FREEBSD)
-     add_ceph_test(rbd-ggate.sh ${CMAKE_CURRENT_SOURCE_DIR}/rbd-ggate.sh)
-   endif(FREEBSD)
-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.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());
- }
- 
--TEST_F(TestObjectRecorder, AppendFilledObject) {
--  std::string oid = get_temp_oid();
--  ASSERT_EQ(0, create(oid));
--  ASSERT_EQ(0, client_register(oid));
--  journal::JournalMetadataPtr metadata = create_metadata(oid);
--  ASSERT_EQ(0, init_metadata(metadata));
--
--  shared_ptr<Mutex> lock(new Mutex("object_recorder_lock"));
--  journal::ObjectRecorderPtr object = create_object(oid, 12, lock);
--
--  std::string payload(2048, '1');
--  journal::AppendBuffer append_buffer1 = create_append_buffer(234, 123,
--                                                              payload);
--  journal::AppendBuffers append_buffers;
--  append_buffers = {append_buffer1};
--  lock->Lock();
--  ASSERT_FALSE(object->append(std::move(append_buffers)));
--  lock->Unlock();
--
--  journal::AppendBuffer append_buffer2 = create_append_buffer(234, 124,
--                                                              payload);
--  append_buffers = {append_buffer2};
--  lock->Lock();
--  ASSERT_TRUE(object->append(std::move(append_buffers)));
--  lock->Unlock();
--
--  C_SaferCond cond;
--  append_buffer2.first->wait(&cond);
--  ASSERT_EQ(0, cond.wait());
--  ASSERT_EQ(0U, object->get_pending_appends());
--}
--
- TEST_F(TestObjectRecorder, Flush) {
-   std::string oid = get_temp_oid();
-   ASSERT_EQ(0, create(oid));
-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")
-     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-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
-+  test_mgrcap.cc
-+  $<TARGET_OBJECTS:mgr_cap_obj>)
-+add_ceph_unittest(unittest_mgr_mgrcap)
-+target_link_libraries(unittest_mgr_mgrcap global)
-+
-+#scripts
-+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)
-+  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)
-+endif(WITH_MGR_DASHBOARD_FRONTEND)
-+
-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
-     )
-   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-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");
-   g_ceph_context->_conf.apply_changes(nullptr);
--  tm tm;
-+  tm tm = {0};
-   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.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
- 
--    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-14.2.9-fix_ceph-volume_systemd_unit.patch → ceph-15.2.3-fix_ceph-volume_systemd_unit.patch

-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
+diff -uNr ceph-15.2.3/systemd/ceph-volume@.service ceph-15.2.3-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.3-fix_ceph-volume_systemd_unit/systemd/ceph-volume@.service	2020-06-16 09:25:30.892671278 +0930
 @@ -7,7 +7,7 @@
  Type=oneshot
  KillMode=none

ceph-14.2.9-fix_cpu_detection.patch → ceph-15.2.3-fix_cpu_detection.patch

-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
+diff -uNr ceph-15.2.3/cmake/modules/SIMDExt.cmake ceph-15.2.3-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.3-fix_cpu_detection/cmake/modules/SIMDExt.cmake	2020-06-16 09:27:50.267149100 +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.9/cmake/modules/SIMDExt.cmake ceph-14.2.9-fix_cpu_detection/
        if(HAVE_INTEL_SSE4_2)
          set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse4.2")
        endif()
-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
+diff -uNr ceph-15.2.3/src/test/test_arch.cc ceph-15.2.3-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.3-fix_cpu_detection/src/test/test_arch.cc	2020-06-16 09:27:50.268149103 +0930
 @@ -69,7 +69,7 @@
    expected = strstr(flags, " sse4_1 ") ? 1 : 0;
    EXPECT_EQ(expected, ceph_arch_intel_sse41);

ceph-15.2.3-fix_tests.patch

+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

+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:=..}