Skip to content

GitLab

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

Increased timeout of unittest_bdev to 2 hours to allow it to pass on slow backing store

parent 53f4704c
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 12 deletions
ceph-15.2.4-fix_tests.patch
View file @ eb8d7c70
diff -uNr ceph-15.2.4/src/pybind/mgr/dashboard/requirements-lint.txt ceph-15.2.4-fix_tests/src/pybind/mgr/dashboard/requirements-lint.txt
--- ceph-15.2.4/src/pybind/mgr/dashboard/requirements-lint.txt 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-fix_tests/src/pybind/mgr/dashboard/requirements-lint.txt 2021-07-10 14:51:40.217564019 +0930
+++ ceph-15.2.4-fix_tests/src/pybind/mgr/dashboard/requirements-lint.txt 2022-01-23 12:16:55.331322609 +1030
@@ -1,4 +1,5 @@
pylint==2.3.1; python_version >= '3'
+astroid==2.5.8; python_version >= '3'
......@@ -9,7 +9,7 @@ diff -uNr ceph-15.2.4/src/pybind/mgr/dashboard/requirements-lint.txt ceph-15.2.4
#TODO: Fix docstring issues: https://tracker.ceph.com/issues/41224
diff -uNr ceph-15.2.4/src/pybind/mgr/insights/tox.ini ceph-15.2.4-fix_tests/src/pybind/mgr/insights/tox.ini
--- ceph-15.2.4/src/pybind/mgr/insights/tox.ini 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-fix_tests/src/pybind/mgr/insights/tox.ini 2021-07-10 14:51:07.139460072 +0930
+++ ceph-15.2.4-fix_tests/src/pybind/mgr/insights/tox.ini 2022-01-23 12:16:55.370322731 +1030
@@ -8,6 +8,7 @@
deps =
pytest
......@@ -20,7 +20,7 @@ diff -uNr ceph-15.2.4/src/pybind/mgr/insights/tox.ini ceph-15.2.4-fix_tests/src/
py3: PYTHONPATH = {toxinidir}/../../../../build/lib/cython_modules/lib.3
diff -uNr ceph-15.2.4/src/test/cli/ceph-conf/env-vs-args.t ceph-15.2.4-fix_tests/src/test/cli/ceph-conf/env-vs-args.t
--- ceph-15.2.4/src/test/cli/ceph-conf/env-vs-args.t 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-fix_tests/src/test/cli/ceph-conf/env-vs-args.t 2021-07-10 14:51:07.616461571 +0930
+++ ceph-15.2.4-fix_tests/src/test/cli/ceph-conf/env-vs-args.t 2022-01-23 12:16:55.371322734 +1030
@@ -2,9 +2,9 @@
$ env CEPH_CONF=from-env ceph-conf -s foo bar
did not load config file, using default settings.
......@@ -35,7 +35,7 @@ diff -uNr ceph-15.2.4/src/test/cli/ceph-conf/env-vs-args.t ceph-15.2.4-fix_tests
# command-line arguments should override environment
diff -uNr ceph-15.2.4/src/test/CMakeLists.txt ceph-15.2.4-fix_tests/src/test/CMakeLists.txt
--- ceph-15.2.4/src/test/CMakeLists.txt 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-fix_tests/src/test/CMakeLists.txt 2021-07-10 14:51:07.707461857 +0930
+++ ceph-15.2.4-fix_tests/src/test/CMakeLists.txt 2022-01-23 12:16:55.371322734 +1030
@@ -528,11 +528,17 @@
# Run rbd-unit-tests separate so they an run in parallel
# For values see: src/include/rbd/features.h
......@@ -64,7 +64,7 @@ diff -uNr ceph-15.2.4/src/test/CMakeLists.txt ceph-15.2.4-fix_tests/src/test/CMa
TEST ${tox_tests}
diff -uNr ceph-15.2.4/src/test/common/test_lockdep.cc ceph-15.2.4-fix_tests/src/test/common/test_lockdep.cc
--- ceph-15.2.4/src/test/common/test_lockdep.cc 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-fix_tests/src/test/common/test_lockdep.cc 2021-07-10 14:51:07.730461929 +0930
+++ ceph-15.2.4-fix_tests/src/test/common/test_lockdep.cc 2022-01-23 12:16:55.371322734 +1030
@@ -16,7 +16,7 @@
{
protected:
......@@ -76,7 +76,7 @@ diff -uNr ceph-15.2.4/src/test/common/test_lockdep.cc ceph-15.2.4-fix_tests/src/
CephInitParameters params(CEPH_ENTITY_TYPE_CLIENT);
diff -uNr ceph-15.2.4/src/test/common/Throttle.cc ceph-15.2.4-fix_tests/src/test/common/Throttle.cc
--- ceph-15.2.4/src/test/common/Throttle.cc 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-fix_tests/src/test/common/Throttle.cc 2021-07-10 14:51:07.730461929 +0930
+++ ceph-15.2.4-fix_tests/src/test/common/Throttle.cc 2022-01-23 12:16:55.371322734 +1030
@@ -332,7 +332,7 @@
3,
6);
......@@ -88,7 +88,7 @@ diff -uNr ceph-15.2.4/src/test/common/Throttle.cc ceph-15.2.4-fix_tests/src/test
}
diff -uNr ceph-15.2.4/src/test/encoding/CMakeLists.txt ceph-15.2.4-fix_tests/src/test/encoding/CMakeLists.txt
--- ceph-15.2.4/src/test/encoding/CMakeLists.txt 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-fix_tests/src/test/encoding/CMakeLists.txt 2021-07-10 14:51:07.841462278 +0930
+++ ceph-15.2.4-fix_tests/src/test/encoding/CMakeLists.txt 2022-01-23 12:16:55.371322734 +1030
@@ -1,3 +1,5 @@
# scripts
add_ceph_test(check-generated.sh ${CMAKE_CURRENT_SOURCE_DIR}/check-generated.sh)
......@@ -97,7 +97,7 @@ diff -uNr ceph-15.2.4/src/test/encoding/CMakeLists.txt ceph-15.2.4-fix_tests/src
+set_tests_properties(readable.sh PROPERTIES TIMEOUT 36000)
diff -uNr ceph-15.2.4/src/test/mgr/CMakeLists.txt ceph-15.2.4-fix_tests/src/test/mgr/CMakeLists.txt
--- ceph-15.2.4/src/test/mgr/CMakeLists.txt 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-fix_tests/src/test/mgr/CMakeLists.txt 2021-07-10 14:51:07.858462332 +0930
+++ ceph-15.2.4-fix_tests/src/test/mgr/CMakeLists.txt 2022-01-23 12:16:55.371322734 +1030
@@ -9,6 +9,7 @@
if(WITH_MGR_DASHBOARD_FRONTEND)
if(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64|arm|ARM")
......@@ -108,7 +108,7 @@ diff -uNr ceph-15.2.4/src/test/mgr/CMakeLists.txt ceph-15.2.4-fix_tests/src/test
add_ceph_test(mgr-dashboard-smoke.sh ${CMAKE_CURRENT_SOURCE_DIR}/mgr-dashboard-smoke.sh)
diff -uNr ceph-15.2.4/src/test/objectstore/CMakeLists.txt ceph-15.2.4-fix_tests/src/test/objectstore/CMakeLists.txt
--- ceph-15.2.4/src/test/objectstore/CMakeLists.txt 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-fix_tests/src/test/objectstore/CMakeLists.txt 2021-07-10 14:51:07.890462432 +0930
+++ ceph-15.2.4-fix_tests/src/test/objectstore/CMakeLists.txt 2022-01-23 12:20:34.429010487 +1030
@@ -131,6 +131,7 @@
test_bluefs.cc
)
......@@ -117,9 +117,17 @@ diff -uNr ceph-15.2.4/src/test/objectstore/CMakeLists.txt ceph-15.2.4-fix_tests/
target_link_libraries(unittest_bluefs os global)
# unittest_bluestore_types
@@ -145,6 +146,7 @@
test_bdev.cc
)
add_ceph_unittest(unittest_bdev)
+ set_tests_properties(unittest_bdev PROPERTIES TIMEOUT 7200)
target_link_libraries(unittest_bdev os global)
endif(WITH_BLUESTORE)
diff -uNr ceph-15.2.4/src/test/osd/CMakeLists.txt ceph-15.2.4-fix_tests/src/test/osd/CMakeLists.txt
--- ceph-15.2.4/src/test/osd/CMakeLists.txt 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-fix_tests/src/test/osd/CMakeLists.txt 2021-07-10 14:51:07.890462432 +0930
+++ ceph-15.2.4-fix_tests/src/test/osd/CMakeLists.txt 2022-01-23 12:16:55.371322734 +1030
@@ -35,6 +35,7 @@
# scripts
......@@ -130,7 +138,7 @@ diff -uNr ceph-15.2.4/src/test/osd/CMakeLists.txt ceph-15.2.4-fix_tests/src/test
add_executable(unittest_osdmap
diff -uNr ceph-15.2.4/src/test/osd/TestOSDScrub.cc ceph-15.2.4-fix_tests/src/test/osd/TestOSDScrub.cc
--- ceph-15.2.4/src/test/osd/TestOSDScrub.cc 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-fix_tests/src/test/osd/TestOSDScrub.cc 2021-07-10 14:51:08.522464418 +0930
+++ ceph-15.2.4-fix_tests/src/test/osd/TestOSDScrub.cc 2022-01-23 12:16:55.371322734 +1030
@@ -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");
......@@ -142,7 +150,7 @@ diff -uNr ceph-15.2.4/src/test/osd/TestOSDScrub.cc ceph-15.2.4-fix_tests/src/tes
utime_t now = utime_t(mktime(&tm), 0);
diff -uNr ceph-15.2.4/src/test/smoke.sh ceph-15.2.4-fix_tests/src/test/smoke.sh
--- ceph-15.2.4/src/test/smoke.sh 2020-07-01 01:10:51.000000000 +0930
+++ ceph-15.2.4-fix_tests/src/test/smoke.sh 2021-07-10 14:51:08.547464497 +0930
+++ ceph-15.2.4-fix_tests/src/test/smoke.sh 2022-01-23 12:16:55.372322737 +1030
@@ -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