Skip to content

GitLab

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

Fixed patches

parent 6315acaf
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 755 deletions
ceph-15.2.15-arm32_fix_tests.patch
View file @ 35e71378
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 2023-01-25 14:24:54.990418287 +1030
+++ ceph-15.2.15-arm32_fix_tests/src/test/librados_test_stub/TestIoCtxImpl.h 2023-01-29 19:37:45.275166620 +1030
@@ -197,6 +197,9 @@
};
......@@ -13,7 +13,7 @@ diff -uNr ceph-15.2.15/src/test/librados_test_stub/TestIoCtxImpl.h ceph-15.2.15-
std::string m_namespace_name;
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 2023-01-25 18:48:17.206236731 +1030
+++ ceph-15.2.15-arm32_fix_tests/src/test/librbd/CMakeLists.txt 2023-01-29 19:37:45.275166620 +1030
@@ -15,6 +15,10 @@
test_DeepCopy.cc
test_Groups.cc
......@@ -27,7 +27,7 @@ diff -uNr ceph-15.2.15/src/test/librbd/CMakeLists.txt ceph-15.2.15-arm32_fix_tes
test_Operations.cc
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 2023-01-25 14:24:54.991418290 +1030
+++ ceph-15.2.15-arm32_fix_tests/src/test/librbd/test_DeepCopy.cc 2023-01-29 19:37:45.275166620 +1030
@@ -362,14 +362,14 @@
size = initial_size = m_src_ictx->get_image_size(CEPH_NOSNAP);
}
......@@ -47,7 +47,7 @@ diff -uNr ceph-15.2.15/src/test/librbd/test_DeepCopy.cc ceph-15.2.15-arm32_fix_t
std::stringstream ss(c);
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 2023-01-25 14:24:54.991418290 +1030
+++ ceph-15.2.15-arm32_fix_tests/src/test/librbd/test_main.cc 2023-01-29 19:37:45.275166620 +1030
@@ -18,6 +18,7 @@
extern void register_test_journal_entries();
extern void register_test_journal_replay();
......@@ -66,7 +66,7 @@ diff -uNr ceph-15.2.15/src/test/librbd/test_main.cc ceph-15.2.15-arm32_fix_tests
register_test_object_map();
diff -uNr ceph-15.2.15/src/test/librbd/test_MigrationAbort.cc ceph-15.2.15-arm32_fix_tests/src/test/librbd/test_MigrationAbort.cc
--- ceph-15.2.15/src/test/librbd/test_MigrationAbort.cc 1970-01-01 09:30:00.000000000 +0930
+++ ceph-15.2.15-arm32_fix_tests/src/test/librbd/test_MigrationAbort.cc 2023-01-25 14:35:54.107146312 +1030
+++ ceph-15.2.15-arm32_fix_tests/src/test/librbd/test_MigrationAbort.cc 2023-01-29 19:37:45.276166623 +1030
@@ -0,0 +1,472 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
......@@ -542,7 +542,7 @@ diff -uNr ceph-15.2.15/src/test/librbd/test_MigrationAbort.cc ceph-15.2.15-arm32
+}
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 2023-01-25 18:46:31.518954521 +1030
+++ ceph-15.2.15-arm32_fix_tests/src/test/librbd/test_Migration.cc 2023-01-29 19:37:45.276166623 +1030
@@ -427,94 +427,6 @@
close_image(child_ictx);
}
......@@ -1043,7 +1043,7 @@ diff -uNr ceph-15.2.15/src/test/librbd/test_Migration.cc ceph-15.2.15-arm32_fix_
-}
diff -uNr ceph-15.2.15/src/test/librbd/test_MigrationClone.cc ceph-15.2.15-arm32_fix_tests/src/test/librbd/test_MigrationClone.cc
--- ceph-15.2.15/src/test/librbd/test_MigrationClone.cc 1970-01-01 09:30:00.000000000 +0930
+++ ceph-15.2.15-arm32_fix_tests/src/test/librbd/test_MigrationClone.cc 2023-01-25 14:59:39.768928363 +1030
+++ ceph-15.2.15-arm32_fix_tests/src/test/librbd/test_MigrationClone.cc 2023-01-29 19:37:45.276166623 +1030
@@ -0,0 +1,635 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
......@@ -1682,7 +1682,7 @@ diff -uNr ceph-15.2.15/src/test/librbd/test_MigrationClone.cc ceph-15.2.15-arm32
+}
diff -uNr ceph-15.2.15/src/test/librbd/test_MigrationSnaps.cc ceph-15.2.15-arm32_fix_tests/src/test/librbd/test_MigrationSnaps.cc
--- ceph-15.2.15/src/test/librbd/test_MigrationSnaps.cc 1970-01-01 09:30:00.000000000 +0930
+++ ceph-15.2.15-arm32_fix_tests/src/test/librbd/test_MigrationSnaps.cc 2023-01-25 18:47:57.635184472 +1030
+++ ceph-15.2.15-arm32_fix_tests/src/test/librbd/test_MigrationSnaps.cc 2023-01-29 19:37:45.276166623 +1030
@@ -0,0 +1,584 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
......@@ -2270,7 +2270,7 @@ diff -uNr ceph-15.2.15/src/test/librbd/test_MigrationSnaps.cc ceph-15.2.15-arm32
+}
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 2023-01-25 14:24:54.991418290 +1030
+++ ceph-15.2.15-arm32_fix_tests/src/test/librbd/test_MigrationStress.cc 2023-01-29 19:37:45.277166625 +1030
@@ -0,0 +1,456 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
......@@ -2730,7 +2730,7 @@ diff -uNr ceph-15.2.15/src/test/librbd/test_MigrationStress.cc ceph-15.2.15-arm3
+}
diff -uNr ceph-15.2.15/src/test/objectstore/Allocator_test.cc ceph-15.2.15-arm32_fix_tests/src/test/objectstore/Allocator_test.cc
--- ceph-15.2.15/src/test/objectstore/Allocator_test.cc 2021-10-21 00:49:57.000000000 +1030
+++ ceph-15.2.15-arm32_fix_tests/src/test/objectstore/Allocator_test.cc 2023-01-26 00:23:10.562677288 +1030
+++ ceph-15.2.15-arm32_fix_tests/src/test/objectstore/Allocator_test.cc 2023-01-29 19:37:45.277166625 +1030
@@ -543,7 +543,7 @@
init_alloc(size, block);
......@@ -2742,7 +2742,7 @@ diff -uNr ceph-15.2.15/src/test/objectstore/Allocator_test.cc ceph-15.2.15-arm32
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 2023-01-25 22:43:12.070916570 +1030
+++ ceph-15.2.15-arm32_fix_tests/src/test/objectstore/test_bdev.cc 2023-01-29 19:37:45.277166625 +1030
@@ -54,8 +54,8 @@
BlockDevice::create(g_ceph_context, bdev.path, NULL, NULL,
[](void* handle, void* aio) {}, NULL));
......@@ -2755,8 +2755,8 @@ diff -uNr ceph-15.2.15/src/test/objectstore/test_bdev.cc ceph-15.2.15-arm32_fix_
bl.append(s);
}
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 2023-01-26 00:27:04.688305206 +1030
--- ceph-15.2.15/src/test/objectstore/test_bluefs.cc 2023-01-29 19:40:48.944658003 +1030
+++ ceph-15.2.15-arm32_fix_tests/src/test/objectstore/test_bluefs.cc 2023-01-29 19:39:27.042438884 +1030
@@ -237,8 +237,8 @@
}
......@@ -2776,13 +2776,13 @@ diff -uNr ceph-15.2.15/src/test/objectstore/test_bluefs.cc ceph-15.2.15-arm32_fi
+ for (unsigned i = 0; i < 1*512*1048576ull / sizeof(buf); ++i) {
h->append(buf, sizeof(buf));
total_written += sizeof(buf);
fs.fsync(h);
}
fs.fsync(h);
- for (unsigned i = 0; i < 2*1024*1048576ull / sizeof(buf); ++i) {
+ for (unsigned i = 0; i < 1*256*1048576ull / sizeof(buf); ++i) {
h->append(buf, sizeof(buf));
total_written += sizeof(buf);
}
fs.fsync(h);
@@ -278,7 +278,7 @@
bufferlist bl;
BlueFS::FileReaderBuffer readbuf(10485760);
......@@ -2816,7 +2816,7 @@ diff -uNr ceph-15.2.15/src/test/objectstore/test_bluefs.cc ceph-15.2.15-arm32_fi
diff -uNr ceph-15.2.15/src/test/rgw/CMakeLists.txt ceph-15.2.15-arm32_fix_tests/src/test/rgw/CMakeLists.txt
--- ceph-15.2.15/src/test/rgw/CMakeLists.txt 2021-10-21 00:49:57.000000000 +1030
+++ ceph-15.2.15-arm32_fix_tests/src/test/rgw/CMakeLists.txt 2023-01-25 23:35:42.840260592 +1030
+++ ceph-15.2.15-arm32_fix_tests/src/test/rgw/CMakeLists.txt 2023-01-29 19:37:45.277166625 +1030
@@ -27,6 +27,7 @@
test_rgw_compression.cc
$<TARGET_OBJECTS:unit-main>)
......@@ -2827,7 +2827,7 @@ diff -uNr ceph-15.2.15/src/test/rgw/CMakeLists.txt ceph-15.2.15-arm32_fix_tests/
# unitttest_http_manager
diff -uNr ceph-15.2.15/src/test/test_mempool.cc ceph-15.2.15-arm32_fix_tests/src/test/test_mempool.cc
--- ceph-15.2.15/src/test/test_mempool.cc 2021-10-21 00:49:57.000000000 +1030
+++ ceph-15.2.15-arm32_fix_tests/src/test/test_mempool.cc 2023-01-26 00:05:47.183905764 +1030
+++ ceph-15.2.15-arm32_fix_tests/src/test/test_mempool.cc 2023-01-29 19:37:45.277166625 +1030
@@ -405,7 +405,7 @@
TEST(mempool, check_shard_select)
......
ceph-15.2.15-fix_librbd_duplicate.patch
View file @ 35e71378
This diff is collapsed.
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