Skip to content

GitLab

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

Updated ceph to 15.2.17

parent 941b2d1c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 155 additions and 179 deletions
Makefile
View file @ d40e5970
...@@ -30,27 +30,26 @@ all: ceph-config ceph-sudoer ...@@ -30,27 +30,26 @@ all: ceph-config ceph-sudoer
mount --bind tmp /tmp mount --bind tmp /tmp
ln -s /lib /lib64 ln -s /lib /lib64
tar xf ceph-15.2.15.tar.gz tar xf ceph-15.2.17.tar.gz
patch -Np1 -d ceph-15.2.15 < ceph-15.2.15-fix_v2_frame.patch patch -Np1 -d ceph-15.2.17 < ceph-15.2.17-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.17 < ceph-15.2.17-fix_cpu_detection.patch
patch -Np1 -d ceph-15.2.15 < ceph-15.2.15-fix_tests.patch patch -Np1 -d ceph-15.2.17 < ceph-15.2.17-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.17 < ceph-15.2.17-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.17 < ceph-15.2.17-no_git.patch
patch -Np1 -d ceph-15.2.15 < ceph-15.2.15-fix_librbd_duplicate.patch patch -Np1 -d ceph-15.2.17 < ceph-15.2.17-fix_librbd_duplicate.patch
patch -Np1 -d ceph-15.2.15 < ceph-15.2.15-fix_ErasureCodeShec.patch patch -Np1 -d ceph-15.2.17 < ceph-15.2.17-fix_ErasureCodeShec.patch
patch -Np1 -d ceph-15.2.15 < ceph-15.2.15-fix_mypy.patch patch -Np1 -d ceph-15.2.17 < ceph-15.2.17-fix_pip.patch
patch -Np1 -d ceph-15.2.15 < ceph-15.2.15-fix_pip.patch
if [ `uname -m` = 'armv7l' ] ; then \ if [ `uname -m` = 'armv7l' ] ; then \
patch -Np1 -d ceph-15.2.15 < ceph-15.2.15-arm32_fix.patch ; \ patch -Np1 -d ceph-15.2.17 < ceph-15.2.17-arm32_fix.patch ; \
patch -Np1 -d ceph-15.2.15 < ceph-15.2.15-arm32_fix_tests.patch ; \ patch -Np1 -d ceph-15.2.17 < ceph-15.2.17-arm32_fix_tests.patch ; \
fi fi
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 cd ceph-15.2.17 && ./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" $(MAKE) -C ceph-15.2.17/build npm_config_cache=/build/.npm NODE_OPTIONS="--max-old-space-size=3072"
hostname localhost hostname localhost
cd ceph-15.2.15 && tar xf ../ceph-object-corpus.tar.xz cd ceph-15.2.17 && 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 cd ceph-15.2.17/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.15/build install $(MAKE) -C ceph-15.2.17/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 '{}' ';'
...@@ -97,7 +96,7 @@ all: ceph-config ceph-sudoer ...@@ -97,7 +96,7 @@ all: ceph-config ceph-sudoer
swapoff swap swapoff swap
rm -rf swap rm -rf swap
rm -rf ceph-15.2.15 rm -rf ceph-15.2.17
ceph-config: ceph-config:
define CEPH_CONFIG define CEPH_CONFIG
......
ceph-15.2.15-fix_mypy.patch deleted 100644 → 0
View file @ 941b2d1c
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
else:
- from cheroot.ssl.builtin import BuiltinSSLAdapter as builtin_ssl
+ from cheroot.ssl.builtin import BuiltinSSLAdapter as builtin_ssl # type: ignore
builtin_ssl.wrap = new_wrap(builtin_ssl.wrap)
ceph-15.2.15-fix_ErasureCodeShec.patch → ceph-15.2.17-fix_ErasureCodeShec.patch
View file @ d40e5970
diff -uNr ceph-15.2.15/src/erasure-code/shec/ErasureCodeShec.cc ceph-15.2.15-fix_ErasureCodeShec/src/erasure-code/shec/ErasureCodeShec.cc diff -uNr ceph-15.2.17/src/erasure-code/shec/ErasureCodeShec.cc ceph-15.2.17-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.17/src/erasure-code/shec/ErasureCodeShec.cc 2022-08-10 02:37:01.000000000 +0930
+++ ceph-15.2.15-fix_ErasureCodeShec/src/erasure-code/shec/ErasureCodeShec.cc 2022-01-19 16:17:29.215308480 +1030 +++ ceph-15.2.17-fix_ErasureCodeShec/src/erasure-code/shec/ErasureCodeShec.cc 2023-02-09 13:56:36.584666287 +1030
@@ -179,6 +179,10 @@ @@ -179,6 +179,10 @@
if (!decoded || !decoded->empty()){ if (!decoded || !decoded->empty()){
return -EINVAL; return -EINVAL;
...@@ -12,9 +12,9 @@ diff -uNr ceph-15.2.15/src/erasure-code/shec/ErasureCodeShec.cc ceph-15.2.15-fix ...@@ -12,9 +12,9 @@ diff -uNr ceph-15.2.15/src/erasure-code/shec/ErasureCodeShec.cc ceph-15.2.15-fix
have.reserve(chunks.size()); have.reserve(chunks.size());
for (map<int, bufferlist>::const_iterator i = chunks.begin(); for (map<int, bufferlist>::const_iterator i = chunks.begin();
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 diff -uNr ceph-15.2.17/src/test/erasure-code/TestErasureCodeShec_arguments.cc ceph-15.2.17-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.17/src/test/erasure-code/TestErasureCodeShec_arguments.cc 2022-08-10 02:37:01.000000000 +0930
+++ ceph-15.2.15-fix_ErasureCodeShec/src/test/erasure-code/TestErasureCodeShec_arguments.cc 2022-01-19 16:17:29.215308480 +1030 +++ ceph-15.2.17-fix_ErasureCodeShec/src/test/erasure-code/TestErasureCodeShec_arguments.cc 2023-02-09 13:56:36.584666287 +1030
@@ -323,7 +323,6 @@ @@ -323,7 +323,6 @@
EXPECT_EQ(-EIO, result); EXPECT_EQ(-EIO, result);
EXPECT_EQ(0u, minimum_chunks.size()); EXPECT_EQ(0u, minimum_chunks.size());
......
ceph-15.2.15-fix_ceph-volume_systemd_unit.patch → ceph-15.2.17-fix_ceph-volume_systemd_unit.patch
View file @ d40e5970
diff -uNr ceph-15.2.15/cmake/modules/Distutils.cmake ceph-15.2.15-fix_ceph-volume_systemd_unit/cmake/modules/Distutils.cmake diff -uNr ceph-15.2.17/cmake/modules/Distutils.cmake ceph-15.2.17-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.17/cmake/modules/Distutils.cmake 2022-08-10 02:37:01.000000000 +0930
+++ ceph-15.2.15-fix_ceph-volume_systemd_unit/cmake/modules/Distutils.cmake 2022-01-19 16:32:53.117200509 +1030 +++ ceph-15.2.17-fix_ceph-volume_systemd_unit/cmake/modules/Distutils.cmake 2023-02-09 14:00:05.956304924 +1030
@@ -25,9 +25,9 @@ @@ -25,9 +25,9 @@
list(APPEND options list(APPEND options
--root=\$ENV{DESTDIR} --root=\$ENV{DESTDIR}
......
ceph-15.2.15-fix_cpu_detection.patch → ceph-15.2.17-fix_cpu_detection.patch
View file @ d40e5970
diff -uNr ceph-15.2.15/src/test/test_arch.cc ceph-15.2.15-fix_cpu_detection/src/test/test_arch.cc diff -uNr ceph-15.2.17/src/test/test_arch.cc ceph-15.2.17-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.17/src/test/test_arch.cc 2022-08-10 02:37:01.000000000 +0930
+++ ceph-15.2.15-fix_cpu_detection/src/test/test_arch.cc 2022-01-19 16:38:25.602238282 +1030 +++ ceph-15.2.17-fix_cpu_detection/src/test/test_arch.cc 2023-02-09 14:02:28.419739481 +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-15.2.15-fix_librbd_duplicate.patch → ceph-15.2.17-fix_librbd_duplicate.patch
View file @ d40e5970
diff -uNr ceph-15.2.15/src/librbd/image/OpenRequest.cc ceph-15.2.15-fix_librbd_duplicate/src/librbd/image/OpenRequest.cc diff -uNr ceph-15.2.17/src/librbd/image/OpenRequest.cc ceph-15.2.17-fix_librbd_duplicate/src/librbd/image/OpenRequest.cc
--- ceph-15.2.15/src/librbd/image/OpenRequest.cc 2021-10-21 00:49:57.000000000 +1030 --- ceph-15.2.17/src/librbd/image/OpenRequest.cc 2022-08-10 02:37:01.000000000 +0930
+++ ceph-15.2.15-fix_librbd_duplicate/src/librbd/image/OpenRequest.cc 2022-01-19 16:42:03.300887319 +1030 +++ ceph-15.2.17-fix_librbd_duplicate/src/librbd/image/OpenRequest.cc 2023-02-09 15:00:51.932398445 +1030
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
#include "librbd/Utils.h" #include "librbd/Utils.h"
#include "librbd/cache/ObjectCacherObjectDispatch.h" #include "librbd/cache/ObjectCacherObjectDispatch.h"
......
ceph-15.2.15-fix_pip.patch → ceph-15.2.17-fix_pip.patch
View file @ d40e5970
diff -uNr ceph-15.2.15/src/tools/setup-virtualenv.sh ceph-15.2.15-fix_pip/src/tools/setup-virtualenv.sh diff -uNr ceph-15.2.17/src/tools/setup-virtualenv.sh ceph-15.2.17-fix_pip/src/tools/setup-virtualenv.sh
--- ceph-15.2.15/src/tools/setup-virtualenv.sh 2021-10-21 00:49:57.000000000 +1030 --- ceph-15.2.17/src/tools/setup-virtualenv.sh 2022-08-10 02:37:01.000000000 +0930
+++ ceph-15.2.15-fix_pip/src/tools/setup-virtualenv.sh 2023-02-06 01:11:48.050823469 +1030 +++ ceph-15.2.17-fix_pip/src/tools/setup-virtualenv.sh 2023-02-09 16:30:01.085679996 +1030
@@ -66,17 +66,10 @@ @@ -66,17 +66,10 @@
DISABLE_PIP_VERSION_CHECK= DISABLE_PIP_VERSION_CHECK=
fi fi
......
ceph-15.2.15-fix_tests.patch → ceph-15.2.17-fix_tests.patch
View file @ d40e5970
diff -uNr --no-dereference ceph-15.2.15/src/test/cli/ceph-conf/env-vs-args.t ceph-15.2.15-fix_tests/src/test/cli/ceph-conf/env-vs-args.t diff -uNr ceph-15.2.17/src/test/cli/ceph-conf/env-vs-args.t ceph-15.2.17-fix_tests/src/test/cli/ceph-conf/env-vs-args.t
--- ceph-15.2.15/src/test/cli/ceph-conf/env-vs-args.t 2021-10-21 00:49:57.000000000 +1030 --- ceph-15.2.17/src/test/cli/ceph-conf/env-vs-args.t 2022-08-10 02:37:01.000000000 +0930
+++ ceph-15.2.15-fix_tests/src/test/cli/ceph-conf/env-vs-args.t 2023-02-03 23:15:37.499879540 +1030 +++ ceph-15.2.17-fix_tests/src/test/cli/ceph-conf/env-vs-args.t 2023-02-09 16:39:02.455326846 +1030
@@ -2,9 +2,9 @@ @@ -2,9 +2,9 @@
$ env CEPH_CONF=from-env ceph-conf -s foo bar $ env CEPH_CONF=from-env ceph-conf -s foo bar
did not load config file, using default settings. did not load config file, using default settings.
...@@ -13,9 +13,9 @@ diff -uNr --no-dereference ceph-15.2.15/src/test/cli/ceph-conf/env-vs-args.t cep ...@@ -13,9 +13,9 @@ diff -uNr --no-dereference ceph-15.2.15/src/test/cli/ceph-conf/env-vs-args.t cep
[1] [1]
# command-line arguments should override environment # command-line arguments should override environment
diff -uNr --no-dereference ceph-15.2.15/src/test/CMakeLists.txt ceph-15.2.15-fix_tests/src/test/CMakeLists.txt diff -uNr ceph-15.2.17/src/test/CMakeLists.txt ceph-15.2.17-fix_tests/src/test/CMakeLists.txt
--- ceph-15.2.15/src/test/CMakeLists.txt 2021-10-21 00:49:57.000000000 +1030 --- ceph-15.2.17/src/test/CMakeLists.txt 2022-08-10 02:37:01.000000000 +0930
+++ ceph-15.2.15-fix_tests/src/test/CMakeLists.txt 2023-02-03 23:15:37.499879540 +1030 +++ ceph-15.2.17-fix_tests/src/test/CMakeLists.txt 2023-02-09 16:39:02.455326846 +1030
@@ -512,11 +512,17 @@ @@ -512,11 +512,17 @@
# Run rbd-unit-tests separate so they an run in parallel # Run rbd-unit-tests separate so they an run in parallel
# For values see: src/include/rbd/features.h # For values see: src/include/rbd/features.h
...@@ -42,9 +42,9 @@ diff -uNr --no-dereference ceph-15.2.15/src/test/CMakeLists.txt ceph-15.2.15-fix ...@@ -42,9 +42,9 @@ diff -uNr --no-dereference ceph-15.2.15/src/test/CMakeLists.txt ceph-15.2.15-fix
find_program(PROMTOOL_EXECUTABLE promtool) find_program(PROMTOOL_EXECUTABLE promtool)
if(PROMTOOL_EXECUTABLE) if(PROMTOOL_EXECUTABLE)
diff -uNr --no-dereference ceph-15.2.15/src/test/common/Throttle.cc ceph-15.2.15-fix_tests/src/test/common/Throttle.cc diff -uNr ceph-15.2.17/src/test/common/Throttle.cc ceph-15.2.17-fix_tests/src/test/common/Throttle.cc
--- ceph-15.2.15/src/test/common/Throttle.cc 2021-10-21 00:49:57.000000000 +1030 --- ceph-15.2.17/src/test/common/Throttle.cc 2022-08-10 02:37:01.000000000 +0930
+++ ceph-15.2.15-fix_tests/src/test/common/Throttle.cc 2023-02-03 23:15:37.500879543 +1030 +++ ceph-15.2.17-fix_tests/src/test/common/Throttle.cc 2023-02-09 16:39:02.455326846 +1030
@@ -332,7 +332,7 @@ @@ -332,7 +332,7 @@
3, 3,
6); 6);
...@@ -54,18 +54,18 @@ diff -uNr --no-dereference ceph-15.2.15/src/test/common/Throttle.cc ceph-15.2.15 ...@@ -54,18 +54,18 @@ diff -uNr --no-dereference ceph-15.2.15/src/test/common/Throttle.cc ceph-15.2.15
ASSERT_LT(results.second.count(), 0.0002); ASSERT_LT(results.second.count(), 0.0002);
ASSERT_GT(results.second.count(), 0.00005); ASSERT_GT(results.second.count(), 0.00005);
} }
diff -uNr --no-dereference ceph-15.2.15/src/test/encoding/CMakeLists.txt ceph-15.2.15-fix_tests/src/test/encoding/CMakeLists.txt diff -uNr ceph-15.2.17/src/test/encoding/CMakeLists.txt ceph-15.2.17-fix_tests/src/test/encoding/CMakeLists.txt
--- ceph-15.2.15/src/test/encoding/CMakeLists.txt 2021-10-21 00:49:57.000000000 +1030 --- ceph-15.2.17/src/test/encoding/CMakeLists.txt 2022-08-10 02:37:01.000000000 +0930
+++ ceph-15.2.15-fix_tests/src/test/encoding/CMakeLists.txt 2023-02-03 23:15:37.500879543 +1030 +++ ceph-15.2.17-fix_tests/src/test/encoding/CMakeLists.txt 2023-02-09 16:39:02.456326849 +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 36000) +set_tests_properties(readable.sh PROPERTIES TIMEOUT 36000)
diff -uNr --no-dereference ceph-15.2.15/src/test/mgr/CMakeLists.txt ceph-15.2.15-fix_tests/src/test/mgr/CMakeLists.txt diff -uNr ceph-15.2.17/src/test/mgr/CMakeLists.txt ceph-15.2.17-fix_tests/src/test/mgr/CMakeLists.txt
--- ceph-15.2.15/src/test/mgr/CMakeLists.txt 2021-10-21 00:49:57.000000000 +1030 --- ceph-15.2.17/src/test/mgr/CMakeLists.txt 2022-08-10 02:37:01.000000000 +0930
+++ ceph-15.2.15-fix_tests/src/test/mgr/CMakeLists.txt 2023-02-03 23:15:37.500879543 +1030 +++ ceph-15.2.17-fix_tests/src/test/mgr/CMakeLists.txt 2023-02-09 16:39:02.456326849 +1030
@@ -9,6 +9,7 @@ @@ -9,6 +9,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")
...@@ -74,9 +74,9 @@ diff -uNr --no-dereference ceph-15.2.15/src/test/mgr/CMakeLists.txt ceph-15.2.15 ...@@ -74,9 +74,9 @@ diff -uNr --no-dereference ceph-15.2.15/src/test/mgr/CMakeLists.txt ceph-15.2.15
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 --no-dereference ceph-15.2.15/src/test/objectstore/CMakeLists.txt ceph-15.2.15-fix_tests/src/test/objectstore/CMakeLists.txt diff -uNr ceph-15.2.17/src/test/objectstore/CMakeLists.txt ceph-15.2.17-fix_tests/src/test/objectstore/CMakeLists.txt
--- ceph-15.2.15/src/test/objectstore/CMakeLists.txt 2021-10-21 00:49:57.000000000 +1030 --- ceph-15.2.17/src/test/objectstore/CMakeLists.txt 2022-08-10 02:37:01.000000000 +0930
+++ ceph-15.2.15-fix_tests/src/test/objectstore/CMakeLists.txt 2023-02-03 23:15:37.500879543 +1030 +++ ceph-15.2.17-fix_tests/src/test/objectstore/CMakeLists.txt 2023-02-09 16:39:02.456326849 +1030
@@ -131,6 +131,7 @@ @@ -131,6 +131,7 @@
test_bluefs.cc test_bluefs.cc
) )
...@@ -93,9 +93,9 @@ diff -uNr --no-dereference ceph-15.2.15/src/test/objectstore/CMakeLists.txt ceph ...@@ -93,9 +93,9 @@ diff -uNr --no-dereference ceph-15.2.15/src/test/objectstore/CMakeLists.txt ceph
target_link_libraries(unittest_bdev os global) target_link_libraries(unittest_bdev os global)
endif(WITH_BLUESTORE) endif(WITH_BLUESTORE)
diff -uNr --no-dereference ceph-15.2.15/src/test/objectstore/test_bluefs.cc ceph-15.2.15-fix_tests/src/test/objectstore/test_bluefs.cc diff -uNr ceph-15.2.17/src/test/objectstore/test_bluefs.cc ceph-15.2.17-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.17/src/test/objectstore/test_bluefs.cc 2022-08-10 02:37:01.000000000 +0930
+++ ceph-15.2.15-fix_tests/src/test/objectstore/test_bluefs.cc 2023-02-03 23:15:37.500879543 +1030 +++ ceph-15.2.17-fix_tests/src/test/objectstore/test_bluefs.cc 2023-02-09 16:39:02.456326849 +1030
@@ -263,13 +263,13 @@ @@ -263,13 +263,13 @@
for (unsigned i = 0; i < 3*1024*1048576ull / sizeof(buf); ++i) { for (unsigned i = 0; i < 3*1024*1048576ull / sizeof(buf); ++i) {
h->append(buf, sizeof(buf)); h->append(buf, sizeof(buf));
...@@ -112,9 +112,9 @@ diff -uNr --no-dereference ceph-15.2.15/src/test/objectstore/test_bluefs.cc ceph ...@@ -112,9 +112,9 @@ diff -uNr --no-dereference ceph-15.2.15/src/test/objectstore/test_bluefs.cc ceph
fs.close_writer(h); fs.close_writer(h);
} }
{ {
diff -uNr --no-dereference ceph-15.2.15/src/test/osd/CMakeLists.txt ceph-15.2.15-fix_tests/src/test/osd/CMakeLists.txt diff -uNr ceph-15.2.17/src/test/osd/CMakeLists.txt ceph-15.2.17-fix_tests/src/test/osd/CMakeLists.txt
--- ceph-15.2.15/src/test/osd/CMakeLists.txt 2021-10-21 00:49:57.000000000 +1030 --- ceph-15.2.17/src/test/osd/CMakeLists.txt 2022-08-10 02:37:01.000000000 +0930
+++ ceph-15.2.15-fix_tests/src/test/osd/CMakeLists.txt 2023-02-03 23:15:37.500879543 +1030 +++ ceph-15.2.17-fix_tests/src/test/osd/CMakeLists.txt 2023-02-09 16:39:02.456326849 +1030
@@ -35,6 +35,7 @@ @@ -35,6 +35,7 @@
# scripts # scripts
...@@ -123,9 +123,9 @@ diff -uNr --no-dereference ceph-15.2.15/src/test/osd/CMakeLists.txt ceph-15.2.15 ...@@ -123,9 +123,9 @@ diff -uNr --no-dereference ceph-15.2.15/src/test/osd/CMakeLists.txt ceph-15.2.15
# unittest_osdmap # unittest_osdmap
add_executable(unittest_osdmap add_executable(unittest_osdmap
diff -uNr --no-dereference ceph-15.2.15/src/test/osd/TestOSDScrub.cc ceph-15.2.15-fix_tests/src/test/osd/TestOSDScrub.cc diff -uNr ceph-15.2.17/src/test/osd/TestOSDScrub.cc ceph-15.2.17-fix_tests/src/test/osd/TestOSDScrub.cc
--- ceph-15.2.15/src/test/osd/TestOSDScrub.cc 2021-10-21 00:49:57.000000000 +1030 --- ceph-15.2.17/src/test/osd/TestOSDScrub.cc 2022-08-10 02:37:01.000000000 +0930
+++ ceph-15.2.15-fix_tests/src/test/osd/TestOSDScrub.cc 2023-02-03 23:15:37.501879546 +1030 +++ ceph-15.2.17-fix_tests/src/test/osd/TestOSDScrub.cc 2023-02-09 16:39:02.456326849 +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");
...@@ -135,9 +135,9 @@ diff -uNr --no-dereference ceph-15.2.15/src/test/osd/TestOSDScrub.cc ceph-15.2.1 ...@@ -135,9 +135,9 @@ diff -uNr --no-dereference ceph-15.2.15/src/test/osd/TestOSDScrub.cc ceph-15.2.1
tm.tm_isdst = -1; tm.tm_isdst = -1;
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);
diff -uNr --no-dereference ceph-15.2.15/src/test/smoke.sh ceph-15.2.15-fix_tests/src/test/smoke.sh diff -uNr ceph-15.2.17/src/test/smoke.sh ceph-15.2.17-fix_tests/src/test/smoke.sh
--- ceph-15.2.15/src/test/smoke.sh 2021-10-21 00:49:57.000000000 +1030 --- ceph-15.2.17/src/test/smoke.sh 2022-08-10 02:37:01.000000000 +0930
+++ ceph-15.2.15-fix_tests/src/test/smoke.sh 2023-02-03 23:15:37.501879546 +1030 +++ ceph-15.2.17-fix_tests/src/test/smoke.sh 2023-02-09 16:39:02.456326849 +1030
@@ -53,7 +53,7 @@ @@ -53,7 +53,7 @@
ceph osd out 0 ceph osd out 0
wait_for_clean wait_for_clean
...@@ -147,9 +147,9 @@ diff -uNr --no-dereference ceph-15.2.15/src/test/smoke.sh ceph-15.2.15-fix_tests ...@@ -147,9 +147,9 @@ diff -uNr --no-dereference ceph-15.2.15/src/test/smoke.sh ceph-15.2.15-fix_tests
wait_for_clean wait_for_clean
ceph osd in 0 ceph osd in 0
diff -uNr --no-dereference ceph-15.2.15/src/test/test_ipaddr.cc ceph-15.2.15-fix_tests/src/test/test_ipaddr.cc diff -uNr ceph-15.2.17/src/test/test_ipaddr.cc ceph-15.2.17-fix_tests/src/test/test_ipaddr.cc
--- ceph-15.2.15/src/test/test_ipaddr.cc 2021-10-21 00:49:57.000000000 +1030 --- ceph-15.2.17/src/test/test_ipaddr.cc 2022-08-10 02:37:01.000000000 +0930
+++ ceph-15.2.15-fix_tests/src/test/test_ipaddr.cc 2023-02-03 23:15:37.501879546 +1030 +++ ceph-15.2.17-fix_tests/src/test/test_ipaddr.cc 2023-02-09 16:39:02.457326852 +1030
@@ -186,6 +186,7 @@ @@ -186,6 +186,7 @@
struct sockaddr_in a_three; struct sockaddr_in a_three;
......
ceph-15.2.15-fix_v2_frame.patch → ceph-15.2.17-fix_v2_frame.patch
View file @ d40e5970
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 diff -uNr ceph-15.2.17/src/msg/async/frames_v2.h ceph-15.2.17-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.17/src/msg/async/frames_v2.h 2022-08-10 02:37:01.000000000 +0930
+++ ceph-15.2.15-fix_v2_frame/src/msg/async/frames_v2.h 2022-01-19 16:50:18.478348557 +1030 +++ ceph-15.2.17-fix_v2_frame/src/msg/async/frames_v2.h 2023-02-09 16:54:21.975120094 +1030
@@ -63,7 +63,7 @@ @@ -63,7 +63,7 @@
// We need them because of the rx_buffers zero-copy optimization. // We need them because of the rx_buffers zero-copy optimization.
static constexpr __u16 PAGE_SIZE_ALIGNMENT = 4096; static constexpr __u16 PAGE_SIZE_ALIGNMENT = 4096;
......
ceph-15.2.15-no_git.patch → ceph-15.2.17-no_git.patch
View file @ d40e5970
diff -uNr ceph-15.2.15/do_cmake.sh ceph-15.2.15-no_git/do_cmake.sh diff -uNr ceph-15.2.17/do_cmake.sh ceph-15.2.17-no_git/do_cmake.sh
--- ceph-15.2.15/do_cmake.sh 2021-10-21 00:49:57.000000000 +1030 --- ceph-15.2.17/do_cmake.sh 2022-08-10 02:37:01.000000000 +0930
+++ ceph-15.2.15-no_git/do_cmake.sh 2022-01-19 16:52:23.781718316 +1030 +++ ceph-15.2.17-no_git/do_cmake.sh 2023-02-09 16:58:21.280846524 +1030
@@ -1,7 +1,9 @@ @@ -1,7 +1,9 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -ex set -ex
......
ceph-15.2.15-skip_promtool_tests.patch → ceph-15.2.17-skip_promtool_tests.patch
View file @ d40e5970
diff -uNr ceph-15.2.15/src/test/CMakeLists.txt ceph-15.2.15-skip_promtool_tests/src/test/CMakeLists.txt diff -uNr ceph-15.2.17/src/test/CMakeLists.txt ceph-15.2.17-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.17/src/test/CMakeLists.txt 2022-08-10 02:37:01.000000000 +0930
+++ ceph-15.2.15-skip_promtool_tests/src/test/CMakeLists.txt 2022-02-07 20:05:41.506213691 +1030 +++ ceph-15.2.17-skip_promtool_tests/src/test/CMakeLists.txt 2023-02-09 17:00:53.027307163 +1030
@@ -531,24 +531,6 @@ @@ -531,24 +531,6 @@
add_ceph_test(smoke.sh ${CMAKE_CURRENT_SOURCE_DIR}/smoke.sh) add_ceph_test(smoke.sh ${CMAKE_CURRENT_SOURCE_DIR}/smoke.sh)
......
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