Skip to content

GitLab

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

Updated ceph to 14.2.4

parent 30cc7919
Show whitespace changes
Inline Side-by-side
Showing with 21 additions and 38 deletions
Makefile
View file @ 71f9a52a
...@@ -30,13 +30,13 @@ all: ceph-config ...@@ -30,13 +30,13 @@ all: ceph-config
mount --bind tmp /tmp mount --bind tmp /tmp
ln -s /lib /lib64 ln -s /lib /lib64
tar xf ceph-14.2.2.tar.gz tar xf ceph-14.2.4.tar.gz
patch -Np1 -d ceph-14.2.2 < ceph-14.2.2-fix_tests.patch patch -Np1 -d ceph-14.2.4 < ceph-14.2.4-fix_tests.patch
cd ceph-14.2.2 && ./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 cd ceph-14.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
$(MAKE) -C ceph-14.2.2/build npm_config_cache=/build/.npm $(MAKE) -C ceph-14.2.4/build npm_config_cache=/build/.npm
hostname localhost hostname localhost
cd ceph-14.2.2 && tar xf ../ceph-object-corpus.tar.xz cd ceph-14.2.4 && tar xf ../ceph-object-corpus.tar.xz
cd ceph-14.2.2/build && CTEST_OUTPUT_ON_FAILURE=1 make check cd ceph-14.2.4/build && CTEST_OUTPUT_ON_FAILURE=1 make check
rm -rf /lib64 rm -rf /lib64
umount /tmp umount /tmp
...@@ -44,7 +44,7 @@ all: ceph-config ...@@ -44,7 +44,7 @@ all: ceph-config
swapoff swap swapoff swap
rm -rf swap rm -rf swap
$(MAKE) -C ceph-14.2.2/build install $(MAKE) -C ceph-14.2.4/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 '{}' ';'
...@@ -78,7 +78,7 @@ all: ceph-config ...@@ -78,7 +78,7 @@ all: ceph-config
systemctl enable ceph-osd.target systemctl enable ceph-osd.target
systemctl enable ceph-radosgw.target systemctl enable ceph-radosgw.target
rm -rf ceph-14.2.2 rm -rf ceph-14.2.4
ceph-config: ceph-config:
define CEPH_CONFIG define CEPH_CONFIG
......
ceph-14.2.2-fix_tests.patch → ceph-14.2.4-fix_tests.patch
View file @ 71f9a52a
diff -uNr ceph-14.2.2/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.spec.ts ceph-14.2.2-fix_tests/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.spec.ts diff -uNr ceph-14.2.4/src/pybind/mgr/dashboard/tests/test_task.py ceph-14.2.4-fix_tests/src/pybind/mgr/dashboard/tests/test_task.py
--- ceph-14.2.2/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.spec.ts 2019-07-18 00:42:36.000000000 +0930 --- ceph-14.2.4/src/pybind/mgr/dashboard/tests/test_task.py 2019-09-14 03:37:41.000000000 +0930
+++ ceph-14.2.2-fix_tests/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.spec.ts 2019-09-23 21:09:51.817960850 +0930 +++ ceph-14.2.4-fix_tests/src/pybind/mgr/dashboard/tests/test_task.py 2019-09-26 14:11:15.877987836 +0930
@@ -87,13 +87,6 @@
expect(component.userConfig.limit).toBe(1);
});
- it('should prevent propagation of mouseenter event', (done) => {
- fixture.detectChanges();
- const mouseEvent = new MouseEvent('mouseenter');
- mouseEvent.stopPropagation = () => done();
- fixture.debugElement.nativeElement.dispatchEvent(mouseEvent);
- });
-
it('should force an identifier', () => {
clearLocalStorage();
component.identifier = 'x';
diff -uNr ceph-14.2.2/src/pybind/mgr/dashboard/tests/test_task.py ceph-14.2.2-fix_tests/src/pybind/mgr/dashboard/tests/test_task.py
--- ceph-14.2.2/src/pybind/mgr/dashboard/tests/test_task.py 2019-07-18 00:42:36.000000000 +0930
+++ ceph-14.2.2-fix_tests/src/pybind/mgr/dashboard/tests/test_task.py 2019-09-23 21:09:51.818960852 +0930
@@ -177,57 +177,6 @@ @@ -177,57 +177,6 @@
self.assertEqual(str(fn_t[0].exception), "Task Unexpected Exception") self.assertEqual(str(fn_t[0].exception), "Task Unexpected Exception")
self.assertEqual(fn_t[0].progress, 70) self.assertEqual(fn_t[0].progress, 70)
...@@ -123,10 +106,10 @@ diff -uNr ceph-14.2.2/src/pybind/mgr/dashboard/tests/test_task.py ceph-14.2.2-fi ...@@ -123,10 +106,10 @@ diff -uNr ceph-14.2.2/src/pybind/mgr/dashboard/tests/test_task.py ceph-14.2.2-fi
def test_fast_async_task(self): def test_fast_async_task(self):
task1 = MyTask(1, is_async=True) task1 = MyTask(1, is_async=True)
state, result = task1.run('test9/task1') state, result = task1.run('test9/task1')
diff -uNr ceph-14.2.2/src/test/CMakeLists.txt ceph-14.2.2-fix_tests/src/test/CMakeLists.txt diff -uNr ceph-14.2.4/src/test/CMakeLists.txt ceph-14.2.4-fix_tests/src/test/CMakeLists.txt
--- ceph-14.2.2/src/test/CMakeLists.txt 2019-07-18 00:42:36.000000000 +0930 --- ceph-14.2.4/src/test/CMakeLists.txt 2019-09-14 03:37:41.000000000 +0930
+++ ceph-14.2.2-fix_tests/src/test/CMakeLists.txt 2019-09-23 21:09:51.818960852 +0930 +++ ceph-14.2.4-fix_tests/src/test/CMakeLists.txt 2019-09-26 14:11:15.878987839 +0930
@@ -528,6 +528,7 @@ @@ -529,6 +529,7 @@
if(WITH_RBD) if(WITH_RBD)
add_ceph_test(run-rbd-unit-tests.sh ${CMAKE_CURRENT_SOURCE_DIR}/run-rbd-unit-tests.sh) add_ceph_test(run-rbd-unit-tests.sh ${CMAKE_CURRENT_SOURCE_DIR}/run-rbd-unit-tests.sh)
...@@ -134,9 +117,9 @@ diff -uNr ceph-14.2.2/src/test/CMakeLists.txt ceph-14.2.2-fix_tests/src/test/CMa ...@@ -134,9 +117,9 @@ diff -uNr ceph-14.2.2/src/test/CMakeLists.txt ceph-14.2.2-fix_tests/src/test/CMa
if(FREEBSD) if(FREEBSD)
add_ceph_test(rbd-ggate.sh ${CMAKE_CURRENT_SOURCE_DIR}/rbd-ggate.sh) add_ceph_test(rbd-ggate.sh ${CMAKE_CURRENT_SOURCE_DIR}/rbd-ggate.sh)
endif(FREEBSD) endif(FREEBSD)
diff -uNr ceph-14.2.2/src/test/mgr/CMakeLists.txt ceph-14.2.2-fix_tests/src/test/mgr/CMakeLists.txt diff -uNr ceph-14.2.4/src/test/mgr/CMakeLists.txt ceph-14.2.4-fix_tests/src/test/mgr/CMakeLists.txt
--- ceph-14.2.2/src/test/mgr/CMakeLists.txt 2019-07-18 00:42:36.000000000 +0930 --- ceph-14.2.4/src/test/mgr/CMakeLists.txt 2019-09-14 03:37:41.000000000 +0930
+++ ceph-14.2.2-fix_tests/src/test/mgr/CMakeLists.txt 2019-09-23 21:09:51.818960852 +0930 +++ ceph-14.2.4-fix_tests/src/test/mgr/CMakeLists.txt 2019-09-26 14:11:15.878987839 +0930
@@ -2,6 +2,7 @@ @@ -2,6 +2,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")
...@@ -145,9 +128,9 @@ diff -uNr ceph-14.2.2/src/test/mgr/CMakeLists.txt ceph-14.2.2-fix_tests/src/test ...@@ -145,9 +128,9 @@ diff -uNr ceph-14.2.2/src/test/mgr/CMakeLists.txt ceph-14.2.2-fix_tests/src/test
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 ceph-14.2.2/src/test/osd/TestOSDScrub.cc ceph-14.2.2-fix_tests/src/test/osd/TestOSDScrub.cc diff -uNr ceph-14.2.4/src/test/osd/TestOSDScrub.cc ceph-14.2.4-fix_tests/src/test/osd/TestOSDScrub.cc
--- ceph-14.2.2/src/test/osd/TestOSDScrub.cc 2019-07-18 00:42:36.000000000 +0930 --- ceph-14.2.4/src/test/osd/TestOSDScrub.cc 2019-09-14 03:37:41.000000000 +0930
+++ ceph-14.2.2-fix_tests/src/test/osd/TestOSDScrub.cc 2019-09-23 21:10:28.452044891 +0930 +++ ceph-14.2.4-fix_tests/src/test/osd/TestOSDScrub.cc 2019-09-26 14:11:44.365070039 +0930
@@ -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");
......
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