Updated ceph to 15.2.15

Makefile

@@ -22,7 +22,7 @@ all: ceph-config ceph-sudoer
 	mv -v /etc/gshadow /data/etc/gshadow
 	ln -sv /data/etc/gshadow /etc/gshadow
 
-	dd if=/dev/zero of=swap bs=1048576 count=9216
+	dd if=/dev/zero of=swap bs=1048576 count=10240
 	chmod 600 swap
 	mkswap swap
 	swapon swap
@@ -30,29 +30,26 @@ all: ceph-config ceph-sudoer
 	mount --bind tmp /tmp
 	ln -s /lib /lib64
 
-	tar xf ceph-15.2.4.tar.gz
-	patch -Np1 -d ceph-15.2.4 < ceph-15.2.4-fix_v2_frame.patch
-	patch -Np1 -d ceph-15.2.4 < ceph-15.2.4-fix_cpu_detection.patch
-	patch -Np1 -d ceph-15.2.4 < ceph-15.2.4-fix_tests.patch
-	patch -Np1 -d ceph-15.2.4 < ceph-15.2.4-fix_ceph-volume_systemd_unit.patch
-	patch -Np1 -d ceph-15.2.4 < ceph-15.2.4-no_git.patch
-	patch -Np1 -d ceph-15.2.4 < ceph-15.2.4-fix_librbd_duplicate.patch
-	patch -Np1 -d ceph-15.2.4 < ceph-15.2.4-fix_ErasureCodeShec.patch
-	patch -Np1 -d ceph-15.2.4 < ceph-15.2.4-fix_ceph_thread_timeout.patch
-	patch -Np1 -d ceph-15.2.4 < ceph-15.2.4-fix_cram.patch
-	patch -Np1 -d ceph-15.2.4 < ceph-15.2.4-fix_mypy.patch
-	cp cram-0.5.0.post20110114.tar.gz ceph-15.2.4/src/test/downloads
+	tar xf ceph-15.2.15.tar.gz
+	patch -Np1 -d ceph-15.2.15 < ceph-15.2.15-fix_v2_frame.patch
+	patch -Np1 -d ceph-15.2.15 < ceph-15.2.15-fix_cpu_detection.patch
+	patch -Np1 -d ceph-15.2.15 < ceph-15.2.15-fix_tests.patch
+	patch -Np1 -d ceph-15.2.15 < ceph-15.2.15-fix_ceph-volume_systemd_unit.patch
+	patch -Np1 -d ceph-15.2.15 < ceph-15.2.15-no_git.patch
+	patch -Np1 -d ceph-15.2.15 < ceph-15.2.15-fix_librbd_duplicate.patch
+	patch -Np1 -d ceph-15.2.15 < ceph-15.2.15-fix_ErasureCodeShec.patch
+	patch -Np1 -d ceph-15.2.15 < ceph-15.2.15-fix_mypy.patch
 	if [ `uname -m` = 'armv7l' ] ; then \
-	    patch -Np1 -d ceph-15.2.4 < ceph-15.2.4-arm32_fix.patch ; \
-	    patch -Np1 -d ceph-15.2.4 < ceph-15.2.4-arm32_fix_tests.patch ; \
+	    patch -Np1 -d ceph-15.2.15 < ceph-15.2.15-arm32_fix.patch ; \
+	    patch -Np1 -d ceph-15.2.15 < ceph-15.2.15-arm32_fix_tests.patch ; \
 	fi
-	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 -DALLOCATOR=tcmalloc_minimal
-	$(MAKE) -C ceph-15.2.4/build npm_config_cache=/build/.npm NODE_OPTIONS="--max-old-space-size=3072"
+	cd ceph-15.2.15 && ./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 -DALLOCATOR=tcmalloc_minimal
+	$(MAKE) -C ceph-15.2.15/build npm_config_cache=/build/.npm NODE_OPTIONS="--max-old-space-size=3072"
 	hostname localhost
-	cd ceph-15.2.4 && tar xf ../ceph-object-corpus.tar.xz
-	cd ceph-15.2.4/build && CTEST_OUTPUT_ON_FAILURE=1 NODE_OPTIONS="--max-old-space-size=3072" VIRTUALENV_SYSTEM_SITE_PACKAGES=True SETUPTOOLS_USE_DISTUTILS=stdlib make check
+	cd ceph-15.2.15 && tar xf ../ceph-object-corpus.tar.xz
+	cd ceph-15.2.15/build && CTEST_OUTPUT_ON_FAILURE=1 NODE_OPTIONS="--max-old-space-size=3072" VIRTUALENV_SYSTEM_SITE_PACKAGES=True SETUPTOOLS_USE_DISTUTILS=stdlib make check
 
-	$(MAKE) -C ceph-15.2.4/build install
+	$(MAKE) -C ceph-15.2.15/build install
 	rm /usr/bin/ceph_test*
 	find / -name *.pyc -exec rm -f '{}' ';'
 	find / -name *.js.map -exec rm -f '{}' ';'
@@ -99,7 +96,7 @@ all: ceph-config ceph-sudoer
 	swapoff swap
 	rm -rf swap
 
-	rm -rf ceph-15.2.4
+	rm -rf ceph-15.2.15
 
 ceph-config:
 define CEPH_CONFIG

ceph-15.2.4-arm32_fix_tests.patch → ceph-15.2.15-arm32_fix_tests.patch

-diff -uNr ceph-15.2.4/src/test/librados_test_stub/TestIoCtxImpl.h ceph-15.2.4-arm32_fix_tests/src/test/librados_test_stub/TestIoCtxImpl.h
---- ceph-15.2.4/src/test/librados_test_stub/TestIoCtxImpl.h	2020-07-01 01:10:51.000000000 +0930
-+++ ceph-15.2.4-arm32_fix_tests/src/test/librados_test_stub/TestIoCtxImpl.h	2021-01-04 13:34:04.620220180 +1030
+diff -uNr ceph-15.2.15/src/test/librados_test_stub/TestIoCtxImpl.h ceph-15.2.15-arm32_fix_tests/src/test/librados_test_stub/TestIoCtxImpl.h
+--- ceph-15.2.15/src/test/librados_test_stub/TestIoCtxImpl.h	2021-10-21 00:49:57.000000000 +1030
++++ ceph-15.2.15-arm32_fix_tests/src/test/librados_test_stub/TestIoCtxImpl.h	2022-01-19 15:42:45.769681530 +1030
 @@ -197,6 +197,9 @@
    };
  
@@ -11,9 +11,9 @@ diff -uNr ceph-15.2.4/src/test/librados_test_stub/TestIoCtxImpl.h ceph-15.2.4-ar
    int64_t m_pool_id = 0;
    std::string m_pool_name;
    std::string m_namespace_name;
-diff -uNr ceph-15.2.4/src/test/librbd/CMakeLists.txt ceph-15.2.4-arm32_fix_tests/src/test/librbd/CMakeLists.txt
---- ceph-15.2.4/src/test/librbd/CMakeLists.txt	2020-07-01 01:10:51.000000000 +0930
-+++ ceph-15.2.4-arm32_fix_tests/src/test/librbd/CMakeLists.txt	2021-01-04 13:35:20.848449585 +1030
+diff -uNr ceph-15.2.15/src/test/librbd/CMakeLists.txt ceph-15.2.15-arm32_fix_tests/src/test/librbd/CMakeLists.txt
+--- ceph-15.2.15/src/test/librbd/CMakeLists.txt	2021-10-21 00:49:57.000000000 +1030
++++ ceph-15.2.15-arm32_fix_tests/src/test/librbd/CMakeLists.txt	2022-01-19 15:42:45.769681530 +1030
 @@ -15,6 +15,7 @@
    test_DeepCopy.cc
    test_Groups.cc
@@ -22,9 +22,9 @@ diff -uNr ceph-15.2.4/src/test/librbd/CMakeLists.txt ceph-15.2.4-arm32_fix_tests
    test_MirroringWatcher.cc
    test_ObjectMap.cc
    test_Operations.cc
-diff -uNr ceph-15.2.4/src/test/librbd/test_DeepCopy.cc ceph-15.2.4-arm32_fix_tests/src/test/librbd/test_DeepCopy.cc
---- ceph-15.2.4/src/test/librbd/test_DeepCopy.cc	2020-07-01 01:10:51.000000000 +0930
-+++ ceph-15.2.4-arm32_fix_tests/src/test/librbd/test_DeepCopy.cc	2021-01-04 13:35:20.848449585 +1030
+diff -uNr ceph-15.2.15/src/test/librbd/test_DeepCopy.cc ceph-15.2.15-arm32_fix_tests/src/test/librbd/test_DeepCopy.cc
+--- ceph-15.2.15/src/test/librbd/test_DeepCopy.cc	2021-10-21 00:49:57.000000000 +1030
++++ ceph-15.2.15-arm32_fix_tests/src/test/librbd/test_DeepCopy.cc	2022-01-19 15:42:45.770681533 +1030
 @@ -362,14 +362,14 @@
        size = initial_size = m_src_ictx->get_image_size(CEPH_NOSNAP);
      }
@@ -42,9 +42,9 @@ diff -uNr ceph-15.2.4/src/test/librbd/test_DeepCopy.cc ceph-15.2.4-arm32_fix_tes
      c = getenv("TEST_RBD_DEEPCOPY_STRESS_NWRITES");
      if (c != NULL) {
        std::stringstream ss(c);
-diff -uNr ceph-15.2.4/src/test/librbd/test_main.cc ceph-15.2.4-arm32_fix_tests/src/test/librbd/test_main.cc
---- ceph-15.2.4/src/test/librbd/test_main.cc	2020-07-01 01:10:51.000000000 +0930
-+++ ceph-15.2.4-arm32_fix_tests/src/test/librbd/test_main.cc	2021-01-04 13:35:20.848449585 +1030
+diff -uNr ceph-15.2.15/src/test/librbd/test_main.cc ceph-15.2.15-arm32_fix_tests/src/test/librbd/test_main.cc
+--- ceph-15.2.15/src/test/librbd/test_main.cc	2021-10-21 00:49:57.000000000 +1030
++++ ceph-15.2.15-arm32_fix_tests/src/test/librbd/test_main.cc	2022-01-19 15:42:45.770681533 +1030
 @@ -18,6 +18,7 @@
  extern void register_test_journal_entries();
  extern void register_test_journal_replay();
@@ -61,10 +61,10 @@ diff -uNr ceph-15.2.4/src/test/librbd/test_main.cc ceph-15.2.4-arm32_fix_tests/s
    register_test_mirroring();
    register_test_mirroring_watcher();
    register_test_object_map();
-diff -uNr ceph-15.2.4/src/test/librbd/test_Migration.cc ceph-15.2.4-arm32_fix_tests/src/test/librbd/test_Migration.cc
---- ceph-15.2.4/src/test/librbd/test_Migration.cc	2020-07-01 01:10:51.000000000 +0930
-+++ ceph-15.2.4-arm32_fix_tests/src/test/librbd/test_Migration.cc	2021-01-04 13:35:20.849449588 +1030
-@@ -432,94 +432,6 @@
+diff -uNr ceph-15.2.15/src/test/librbd/test_Migration.cc ceph-15.2.15-arm32_fix_tests/src/test/librbd/test_Migration.cc
+--- ceph-15.2.15/src/test/librbd/test_Migration.cc	2021-10-21 00:49:57.000000000 +1030
++++ ceph-15.2.15-arm32_fix_tests/src/test/librbd/test_Migration.cc	2022-01-19 15:42:45.770681533 +1030
+@@ -427,94 +427,6 @@
      close_image(child_ictx);
    }
  
@@ -159,7 +159,7 @@ diff -uNr ceph-15.2.4/src/test/librbd/test_Migration.cc ceph-15.2.4-arm32_fix_te
    static std::string _other_pool_name;
    static librados::IoCtx _other_pool_ioctx;
  
-@@ -1300,27 +1212,3 @@
+@@ -1326,27 +1238,3 @@
             migration_abort(m_ioctx, m_image_name);
           });
  }
@@ -187,9 +187,9 @@ diff -uNr ceph-15.2.4/src/test/librbd/test_Migration.cc ceph-15.2.4-arm32_fix_te
 -{
 -  test_stress2(true);
 -}
-diff -uNr ceph-15.2.4/src/test/librbd/test_MigrationStress.cc ceph-15.2.4-arm32_fix_tests/src/test/librbd/test_MigrationStress.cc
---- ceph-15.2.4/src/test/librbd/test_MigrationStress.cc	1970-01-01 09:30:00.000000000 +0930
-+++ ceph-15.2.4-arm32_fix_tests/src/test/librbd/test_MigrationStress.cc	2021-01-04 13:35:20.849449588 +1030
+diff -uNr ceph-15.2.15/src/test/librbd/test_MigrationStress.cc ceph-15.2.15-arm32_fix_tests/src/test/librbd/test_MigrationStress.cc
+--- ceph-15.2.15/src/test/librbd/test_MigrationStress.cc	1970-01-01 09:30:00.000000000 +0930
++++ ceph-15.2.15-arm32_fix_tests/src/test/librbd/test_MigrationStress.cc	2022-01-19 15:42:45.770681533 +1030
 @@ -0,0 +1,456 @@
 +// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 +// vim: ts=8 sw=2 smarttab
@@ -647,9 +647,9 @@ diff -uNr ceph-15.2.4/src/test/librbd/test_MigrationStress.cc ceph-15.2.4-arm32_
 +{
 +  test_stress2(true);
 +}
-diff -uNr ceph-15.2.4/src/test/objectstore/test_bdev.cc ceph-15.2.4-arm32_fix_tests/src/test/objectstore/test_bdev.cc
---- ceph-15.2.4/src/test/objectstore/test_bdev.cc	2020-07-01 01:10:51.000000000 +0930
-+++ ceph-15.2.4-arm32_fix_tests/src/test/objectstore/test_bdev.cc	2021-01-04 13:34:04.621220183 +1030
+diff -uNr ceph-15.2.15/src/test/objectstore/test_bdev.cc ceph-15.2.15-arm32_fix_tests/src/test/objectstore/test_bdev.cc
+--- ceph-15.2.15/src/test/objectstore/test_bdev.cc	2021-10-21 00:49:57.000000000 +1030
++++ ceph-15.2.15-arm32_fix_tests/src/test/objectstore/test_bdev.cc	2022-01-19 15:42:45.770681533 +1030
 @@ -54,8 +54,8 @@
      BlockDevice::create(g_ceph_context, bdev.path, NULL, NULL,
        [](void* handle, void* aio) {}, NULL));
@@ -661,33 +661,30 @@ diff -uNr ceph-15.2.4/src/test/objectstore/test_bdev.cc ceph-15.2.4-arm32_fix_te
      string s(1048576, 'a' + (i % 28));
      bl.append(s);
    }
-diff -uNr ceph-15.2.4/src/test/objectstore/test_bluefs.cc ceph-15.2.4-arm32_fix_tests/src/test/objectstore/test_bluefs.cc
---- ceph-15.2.4/src/test/objectstore/test_bluefs.cc	2020-07-01 01:10:51.000000000 +0930
-+++ ceph-15.2.4-arm32_fix_tests/src/test/objectstore/test_bluefs.cc	2021-01-04 13:34:04.621220183 +1030
-@@ -206,7 +206,7 @@
+diff -uNr ceph-15.2.15/src/test/objectstore/test_bluefs.cc ceph-15.2.15-arm32_fix_tests/src/test/objectstore/test_bluefs.cc
+--- ceph-15.2.15/src/test/objectstore/test_bluefs.cc	2021-10-21 00:49:57.000000000 +1030
++++ ceph-15.2.15-arm32_fix_tests/src/test/objectstore/test_bluefs.cc	2022-01-19 15:55:52.662196838 +1030
+@@ -237,8 +237,8 @@
  }
  
  TEST(BlueFS, very_large_write) {
--  // we'll write a ~3G file, so allocate more than that for the whole fs
+-  // we'll write a ~5G file, so allocate more than that for the whole fs
+-  uint64_t size = 1048576 * 1024 * 6ull;
 +  // we'll write a ~1G file, so allocate more than that for the whole fs
-   uint64_t size = 1048576 * 1024 * 8ull;
++  uint64_t size = 1048576 * 1024 * 1ull;
    TempBdev bdev{size};
    BlueFS fs(g_ceph_context);
-@@ -228,7 +228,7 @@
-     BlueFS::FileWriter *h;
-     ASSERT_EQ(0, fs.mkdir("dir"));
-     ASSERT_EQ(0, fs.open_for_write("dir", "bigfile", &h, false));
--    for (unsigned i = 0; i < 3*1024*1048576ull / sizeof(buf); ++i) {
-+    for (unsigned i = 0; i < 1*1024*1048576ull / sizeof(buf); ++i) {
-       h->append(buf, sizeof(buf));
-     }
-     fs.fsync(h);
-@@ -239,7 +239,7 @@
-     ASSERT_EQ(0, fs.open_for_read("dir", "bigfile", &h));
-     bufferlist bl;
-     BlueFS::FileReaderBuffer readbuf(10485760);
--    for (unsigned i = 0; i < 3*1024*1048576ull / sizeof(buf); ++i) {
-+    for (unsigned i = 0; i < 1*1024*1048576ull / sizeof(buf); ++i) {
-       bl.clear();
-       fs.read(h, &readbuf, i * sizeof(buf), sizeof(buf), &bl, NULL);
-       int r = memcmp(buf, bl.c_str(), sizeof(buf));
+ 
+@@ -313,9 +313,9 @@
+ }
+ 
+ TEST(BlueFS, very_large_write2) {
+-  // we'll write a ~5G file, so allocate more than that for the whole fs
+-  uint64_t size_full = 1048576 * 1024 * 6ull;
+-  uint64_t size = 1048576 * 1024 * 5ull;
++  // we'll write a ~1G file, so allocate more than that for the whole fs
++  uint64_t size_full = 1048576 * 1024 * 1ull + 1048576 * 256 * 1ull;
++  uint64_t size = 1048576 * 1024 * 1ull;
+   TempBdev bdev{ size_full };
+   BlueFS fs(g_ceph_context);
+ 

ceph-15.2.4-fix_ErasureCodeShec.patch → ceph-15.2.15-fix_ErasureCodeShec.patch

-diff -uNr ceph-15.2.4/src/erasure-code/shec/ErasureCodeShec.cc ceph-15.2.4-fix_ErasureCodeShec/src/erasure-code/shec/ErasureCodeShec.cc
---- ceph-15.2.4/src/erasure-code/shec/ErasureCodeShec.cc	2020-07-01 01:10:51.000000000 +0930
-+++ ceph-15.2.4-fix_ErasureCodeShec/src/erasure-code/shec/ErasureCodeShec.cc	2020-12-27 14:09:11.480903740 +1030
+diff -uNr ceph-15.2.15/src/erasure-code/shec/ErasureCodeShec.cc ceph-15.2.15-fix_ErasureCodeShec/src/erasure-code/shec/ErasureCodeShec.cc
+--- ceph-15.2.15/src/erasure-code/shec/ErasureCodeShec.cc	2021-10-21 00:49:57.000000000 +1030
++++ ceph-15.2.15-fix_ErasureCodeShec/src/erasure-code/shec/ErasureCodeShec.cc	2022-01-19 16:17:29.215308480 +1030
 @@ -179,6 +179,10 @@
    if (!decoded || !decoded->empty()){
      return -EINVAL;
@@ -12,9 +12,9 @@ diff -uNr ceph-15.2.4/src/erasure-code/shec/ErasureCodeShec.cc ceph-15.2.4-fix_E
  
    have.reserve(chunks.size());
    for (map<int, bufferlist>::const_iterator i = chunks.begin();
-diff -uNr ceph-15.2.4/src/test/erasure-code/TestErasureCodeShec_arguments.cc ceph-15.2.4-fix_ErasureCodeShec/src/test/erasure-code/TestErasureCodeShec_arguments.cc
---- ceph-15.2.4/src/test/erasure-code/TestErasureCodeShec_arguments.cc	2020-07-01 01:10:51.000000000 +0930
-+++ ceph-15.2.4-fix_ErasureCodeShec/src/test/erasure-code/TestErasureCodeShec_arguments.cc	2020-12-27 14:09:11.480903740 +1030
+diff -uNr ceph-15.2.15/src/test/erasure-code/TestErasureCodeShec_arguments.cc ceph-15.2.15-fix_ErasureCodeShec/src/test/erasure-code/TestErasureCodeShec_arguments.cc
+--- ceph-15.2.15/src/test/erasure-code/TestErasureCodeShec_arguments.cc	2021-10-21 00:49:57.000000000 +1030
++++ ceph-15.2.15-fix_ErasureCodeShec/src/test/erasure-code/TestErasureCodeShec_arguments.cc	2022-01-19 16:17:29.215308480 +1030
 @@ -323,7 +323,6 @@
                EXPECT_EQ(-EIO, result);
  	      EXPECT_EQ(0u, minimum_chunks.size());

ceph-15.2.4-fix_ceph-volume_systemd_unit.patch → ceph-15.2.15-fix_ceph-volume_systemd_unit.patch

-diff -uNr ceph-15.2.4/cmake/modules/Distutils.cmake ceph-15.2.4-fix_ceph-volume_systemd_unit/cmake/modules/Distutils.cmake
---- ceph-15.2.4/cmake/modules/Distutils.cmake	2020-07-01 01:10:51.000000000 +0930
-+++ ceph-15.2.4-fix_ceph-volume_systemd_unit/cmake/modules/Distutils.cmake	2020-12-07 09:34:12.979605660 +1030
+diff -uNr ceph-15.2.15/cmake/modules/Distutils.cmake ceph-15.2.15-fix_ceph-volume_systemd_unit/cmake/modules/Distutils.cmake
+--- ceph-15.2.15/cmake/modules/Distutils.cmake	2021-10-21 00:49:57.000000000 +1030
++++ ceph-15.2.15-fix_ceph-volume_systemd_unit/cmake/modules/Distutils.cmake	2022-01-19 16:32:53.117200509 +1030
 @@ -25,9 +25,9 @@
        list(APPEND options
          --root=\$ENV{DESTDIR}

ceph-15.2.4-fix_cpu_detection.patch → ceph-15.2.15-fix_cpu_detection.patch

-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.4/src/test/test_arch.cc	2020-07-01 01:10:51.000000000 +0930
-+++ ceph-15.2.4-fix_cpu_detection/src/test/test_arch.cc	2020-07-07 11:30:28.239565039 +0930
+diff -uNr ceph-15.2.15/src/test/test_arch.cc ceph-15.2.15-fix_cpu_detection/src/test/test_arch.cc
+--- ceph-15.2.15/src/test/test_arch.cc	2021-10-21 00:49:57.000000000 +1030
++++ ceph-15.2.15-fix_cpu_detection/src/test/test_arch.cc	2022-01-19 16:38:25.602238282 +1030
 @@ -69,7 +69,7 @@
    expected = strstr(flags, " sse4_1 ") ? 1 : 0;
    EXPECT_EQ(expected, ceph_arch_intel_sse41);

ceph-15.2.4-fix_mypy.patch → ceph-15.2.15-fix_mypy.patch

-diff -uNr ceph-15.2.4/src/pybind/mgr/dashboard/cherrypy_backports.py ceph-15.2.4-fix_mypy/src/pybind/mgr/dashboard/cherrypy_backports.py
---- ceph-15.2.4/src/pybind/mgr/dashboard/cherrypy_backports.py	2020-07-01 01:10:51.000000000 +0930
-+++ ceph-15.2.4-fix_mypy/src/pybind/mgr/dashboard/cherrypy_backports.py	2022-01-23 11:51:01.356453830 +1030
+diff -uNr ceph-15.2.15/src/pybind/mgr/dashboard/cherrypy_backports.py ceph-15.2.15-fix_mypy/src/pybind/mgr/dashboard/cherrypy_backports.py
+--- ceph-15.2.15/src/pybind/mgr/dashboard/cherrypy_backports.py	2021-10-21 00:49:57.000000000 +1030
++++ ceph-15.2.15-fix_mypy/src/pybind/mgr/dashboard/cherrypy_backports.py	2022-01-25 15:02:42.034121126 +1030
 @@ -75,7 +75,7 @@
      if v < StrictVersion("9.0.0"):
          from cherrypy.wsgiserver.ssl_builtin import BuiltinSSLAdapter as builtin_ssl

ceph-15.2.4-fix_v2_frame.patch → ceph-15.2.15-fix_v2_frame.patch

-diff -uNr ceph-15.2.4/src/msg/async/frames_v2.h ceph-15.2.4-fix_v2_frame/src/msg/async/frames_v2.h
---- ceph-15.2.4/src/msg/async/frames_v2.h	2020-07-01 01:10:51.000000000 +0930
-+++ ceph-15.2.4-fix_v2_frame/src/msg/async/frames_v2.h	2021-08-14 10:06:23.517830235 +0930
-@@ -60,7 +60,7 @@
+diff -uNr ceph-15.2.15/src/msg/async/frames_v2.h ceph-15.2.15-fix_v2_frame/src/msg/async/frames_v2.h
+--- ceph-15.2.15/src/msg/async/frames_v2.h	2021-10-21 00:49:57.000000000 +1030
++++ ceph-15.2.15-fix_v2_frame/src/msg/async/frames_v2.h	2022-01-19 16:50:18.478348557 +1030
+@@ -63,7 +63,7 @@
    // We need them because of the rx_buffers zero-copy optimization.
    static constexpr __u16 PAGE_SIZE_ALIGNMENT = 4096;
  

ceph-15.2.4-no_git.patch → ceph-15.2.15-no_git.patch

-diff -uNr ceph-15.2.4/do_cmake.sh ceph-15.2.4-no_git/do_cmake.sh
---- ceph-15.2.4/do_cmake.sh	2020-07-01 01:10:51.000000000 +0930
-+++ ceph-15.2.4-no_git/do_cmake.sh	2020-07-07 11:45:30.305162268 +0930
+diff -uNr ceph-15.2.15/do_cmake.sh ceph-15.2.15-no_git/do_cmake.sh
+--- ceph-15.2.15/do_cmake.sh	2021-10-21 00:49:57.000000000 +1030
++++ ceph-15.2.15-no_git/do_cmake.sh	2022-01-19 16:52:23.781718316 +1030
 @@ -1,7 +1,9 @@
  #!/usr/bin/env bash
  set -ex

ceph-15.2.15-skip_promtool_tests.patch

+diff -uNr ceph-15.2.15/src/test/CMakeLists.txt ceph-15.2.15-skip_promtool_tests/src/test/CMakeLists.txt
+--- ceph-15.2.15/src/test/CMakeLists.txt	2021-10-21 00:49:57.000000000 +1030
++++ ceph-15.2.15-skip_promtool_tests/src/test/CMakeLists.txt	2022-02-07 20:05:41.506213691 +1030
+@@ -531,24 +531,6 @@
+ 
+ add_ceph_test(smoke.sh ${CMAKE_CURRENT_SOURCE_DIR}/smoke.sh)
+ 
+-find_program(PROMTOOL_EXECUTABLE promtool)
+-if(PROMTOOL_EXECUTABLE)
+-  execute_process(
+-    COMMAND ${PROMTOOL_EXECUTABLE} test rules /dev/null
+-    RESULT_VARIABLE rc
+-    OUTPUT_QUIET)
+-  if(NOT rc)
+-    add_ceph_test(run-promtool-unittests
+-      ${PROMTOOL_EXECUTABLE} test rules ${CMAKE_SOURCE_DIR}/monitoring/prometheus/alerts/test_alerts.yml)
+-  else()
+-    message(WARNING "'${PROMTOOL_EXECUTABLE} test rules' does not work, "
+-      "please use a newer prometheus")
+-  endif()
+-else()
+-  add_ceph_test(run-promtool-unittests
+-    {CMAKE_CURRENT_SOURCE_DIR}/run-promtool-unittests.sh)
+-endif()
+-
+ set_property(
+   TEST ${tox_tests}
+   PROPERTY ENVIRONMENT ${env_vars_for_tox_tests})

ceph-15.2.4-fix_ceph_thread_timeout.patch

-diff -uNr ceph-15.2.4/src/pybind/ceph_argparse.py ceph-15.2.4-fix_ceph_thread_timeout/src/pybind/ceph_argparse.py
---- ceph-15.2.4/src/pybind/ceph_argparse.py	2020-07-01 01:10:51.000000000 +0930
-+++ ceph-15.2.4-fix_ceph_thread_timeout/src/pybind/ceph_argparse.py	2020-12-27 14:15:28.161241445 +1030
-@@ -1317,9 +1317,11 @@
-     if timeout == 0 or timeout == None:
-         # python threading module will just get blocked if timeout is `None`,
-         # otherwise it will keep polling until timeout or thread stops.
--        # wait for INT32_MAX, as python 3.6.8 use int32_t to present the
--        # timeout in integer when converting it to nanoseconds
--        timeout = (1 << (32 - 1)) - 1
-+        # timeout in integer when converting it to nanoseconds, but since
-+        # python3 uses `int64_t` for the deadline before timeout expires,
-+        # we have to use a safe value which does not overflow after being
-+        # added to current time in microseconds.
-+        timeout = 24 * 60 * 60
-     t = RadosThread(func, *args, **kwargs)
- 
-     # allow the main thread to exit (presumably, avoid a join() on this

ceph-15.2.4-fix_cram.patch

-Binary files ceph-15.2.4/src/test/downloads/cram-0.5.0ceph.2011-01-14.tar.gz and ceph-15.2.4-fix_cram/src/test/downloads/cram-0.5.0ceph.2011-01-14.tar.gz differ
-Binary files ceph-15.2.4/src/test/downloads/cram-0.5.0.post20110114.tar.gz and ceph-15.2.4-fix_cram/src/test/downloads/cram-0.5.0.post20110114.tar.gz differ
-diff -uNr ceph-15.2.4/src/test/run-cli-tests ceph-15.2.4-fix_cram/src/test/run-cli-tests
---- ceph-15.2.4/src/test/run-cli-tests	2020-07-01 01:10:51.000000000 +0930
-+++ ceph-15.2.4-fix_cram/src/test/run-cli-tests	2021-02-18 12:01:54.643685626 +1030
-@@ -30,7 +30,7 @@
-     # patched cram to support that. See upstream ticket at
-     # https://bitbucket.org/brodie/cram/issue/9/allow-read-only-directories-for-t
-     # -- tv@inktank.com
--    virtualenv "$VENV" && $VENV/bin/pip --log "$VENV"/log.txt install "$SRCDIR/downloads/cram-0.5.0ceph.2011-01-14.tar.gz"
-+    virtualenv "$VENV" && $VENV/bin/pip --log "$VENV"/log.txt install "$SRCDIR/downloads/cram-0.5.0.post20110114.tar.gz"
- fi
- 
- SRCDIR_ABS="$(readlink -f "$SRCDIR")"

ceph-15.2.4-fix_librbd_duplicate.patch

-diff -uNr ceph-15.2.4/src/librbd/image/OpenRequest.cc ceph-15.2.4-fix_librbd_duplicate/src/librbd/image/OpenRequest.cc
---- ceph-15.2.4/src/librbd/image/OpenRequest.cc	2020-06-30 15:40:51.000000000 +0000
-+++ ceph-15.2.4-fix_librbd_duplicate/src/librbd/image/OpenRequest.cc	2020-09-30 07:58:38.979496776 +0000
-@@ -9,7 +9,7 @@
- #include "librbd/Utils.h"
- #include "librbd/cache/ObjectCacherObjectDispatch.h"
- #include "librbd/cache/WriteAroundObjectDispatch.h"
--#include "librbd/cache/ParentCacheObjectDispatch.cc"
-+#include "librbd/cache/ParentCacheObjectDispatch.h"
- #include "librbd/image/CloseRequest.h"
- #include "librbd/image/RefreshRequest.h"
- #include "librbd/image/SetSnapRequest.h"