Attachment 202332 Details for Bug 236004 – diff to upgrade to ceph12 v12.2.11

[patch] diff to upgrade to ceph12 v12.2.11

ceph12-2-11.diff (text/plain), 6.96 KB, created by Willem Jan Withagen on 2019-02-24 17:57:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Willem Jan Withagen

Created: 2019-02-24 17:57:40 UTC

Size: 6.96 KB

patch

obsolete

>Index: net/ceph12/Makefile
>===================================================================
>--- net/ceph12/Makefile	(revision 493684)
>+++ net/ceph12/Makefile	(working copy)
>@@ -3,9 +3,9 @@
> 
> PORTNAME=	ceph
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	12.2.7
>-PORTREVISION=	3
>+DISTVERSION=	12.2.11
> CATEGORIES=	net
>+PKGNAMESUFFIX=	12
> 
> MAINTAINER=	wjw@digiware.nl
> COMMENT=	Ceph delivers object, block, and file storage in a unified system
>Index: net/ceph12/distinfo
>===================================================================
>--- net/ceph12/distinfo	(revision 493684)
>+++ net/ceph12/distinfo	(working copy)
>@@ -1,6 +1,6 @@
>-TIMESTAMP = 1535200366
>-SHA256 (ceph-ceph-v12.2.7_GH0.tar.gz) = 742dd402686b6c48824687be9bff951ede7608d41736cbcd55b130f7bd94f086
>-SIZE (ceph-ceph-v12.2.7_GH0.tar.gz) = 12236446
>+TIMESTAMP = 1550935963
>+SHA256 (ceph-ceph-v12.2.11_GH0.tar.gz) = 67a2afe2de2087279e5a6bfab9c2b2a391093fb73723b629aaaeb204044be499
>+SIZE (ceph-ceph-v12.2.11_GH0.tar.gz) = 12451786
> SHA256 (ceph-ceph-erasure-code-corpus-2d7d78b_GH0.tar.gz) = 8ab8f36f3e0a720c882b8bb4abb3f2e26bd6b025cc263119207f7d2eb3b1e490
> SIZE (ceph-ceph-erasure-code-corpus-2d7d78b_GH0.tar.gz) = 3685656
> SHA256 (ceph-ceph-object-corpus-e32bf8c_GH0.tar.gz) = 79ff0d1b9f959c9f5264a0dff193105d71885615deaa9c8469902400fd82d214
>Index: net/ceph12/files/ceph.in
>===================================================================
>Index: net/ceph12/files/file-git_version
>===================================================================
>--- net/ceph12/files/file-git_version	(revision 493684)
>+++ net/ceph12/files/file-git_version	(working copy)
>@@ -1,2 +1,2 @@
>-3ec878d1e53e1aeb47a9f619c49d9e7c0aa384d5
>-v12.2.7
>+26dc3775efc7bb286a1d6d66faee0ba30ea23eee
>+v12.2.11
>Index: net/ceph12/files/patch-boost-1.67
>===================================================================
>Index: net/ceph12/files/patch-src_objectstore_store_test.cc
>===================================================================
>--- net/ceph12/files/patch-src_objectstore_store_test.cc	(nonexistent)
>+++ net/ceph12/files/patch-src_objectstore_store_test.cc	(working copy)
>@@ -0,0 +1,39 @@
>+diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc
>+old mode 100644
>+new mode 100755
>+index 326c9785d0..8d39249360
>+--- src/test/objectstore/store_test.cc
>++++ src/test/objectstore/store_test.cc
>+@@ -4313,7 +4313,7 @@ TEST_P(StoreTest, Synthetic) {
>+   doSyntheticTest(store, 10000, 400*1024, 40*1024, 0);
>+ }
>+ 
>+-
>++#if defined(WITH_BLUESTORE)
>+ TEST_P(StoreTestSpecificAUSize, SyntheticMatrixSharding) {
>+   if (string(GetParam()) != "bluestore")
>+     return;
>+@@ -4485,6 +4485,7 @@ TEST_P(StoreTestSpecificAUSize, SyntheticMatrixPreferDeferred) {
>+   };
>+   do_matrix(m, store, doSyntheticTest);
>+ }
>++#endif // #if defined(WITH_BLUESTORE)
>+ 
>+ TEST_P(StoreTest, AttrSynthetic) {
>+   ObjectStore::Sequencer osr("test");
>+@@ -6855,6 +6856,7 @@ TEST_P(StoreTestSpecificAUSize, fsckOnUnalignedDevice2) {
>+   g_conf->apply_changes(NULL);
>+ }
>+ 
>++#if defined(WITH_BLUESTORE)
>+ TEST_P(StoreTest, SpuriousReadErrorTest) {
>+   if (string(GetParam()) != "bluestore")
>+     return;
>+@@ -6921,6 +6923,7 @@ TEST_P(StoreTest, SpuriousReadErrorTest) {
>+   g_conf->set_val("bluestore_debug_inject_csum_err_probability", "0");
>+   g_ceph_context->_conf->apply_changes(nullptr);
>+ }
>++#endif // #if defined(WITH_BLUESTORE)
>+ 
>+ int main(int argc, char **argv) {
>+   vector<const char*> args;
>
>Property changes on: net/ceph12/files/patch-src_objectstore_store_test.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: net/ceph12/files/patch-src_rgw_CMakeLists.txt
>===================================================================
>--- net/ceph12/files/patch-src_rgw_CMakeLists.txt	(nonexistent)
>+++ net/ceph12/files/patch-src_rgw_CMakeLists.txt	(working copy)
>@@ -0,0 +1,13 @@
>+diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt
>+index 57cb2a5b94..57a9ceb78b 100644
>+--- src/rgw/CMakeLists.txt
>++++ src/rgw/CMakeLists.txt
>+@@ -182,7 +182,7 @@ if (WITH_RADOSGW_BEAST_FRONTEND AND WITH_RADOSGW_BEAST_OPENSSL)
>+ endif()
>+ 
>+ add_executable(radosgw rgw_main.cc)
>+-target_link_libraries(radosgw radosgw_a librados
>++target_link_libraries(radosgw radosgw_a rgw_a librados
>+   cls_rgw_client cls_lock_client cls_refcount_client
>+   cls_log_client cls_statelog_client cls_timeindex_client
>+   cls_version_client cls_replica_log_client cls_user_client
>
>Property changes on: net/ceph12/files/patch-src_rgw_CMakeLists.txt
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: net/ceph12/files/patch-src_rgw_rgw_sync_module_es.cc
>===================================================================
>--- net/ceph12/files/patch-src_rgw_rgw_sync_module_es.cc	(nonexistent)
>+++ net/ceph12/files/patch-src_rgw_rgw_sync_module_es.cc	(working copy)
>@@ -0,0 +1,13 @@
>+diff --git a/src/rgw/rgw_sync_module_es.cc b/src/rgw/rgw_sync_module_es.cc
>+index aa58219b5a..de4200d75e 100644
>+--- src/rgw/rgw_sync_module_es.cc
>++++ src/rgw/rgw_sync_module_es.cc
>+@@ -244,7 +244,7 @@ struct es_index_config {
>+ };
>+ 
>+ static bool is_sys_attr(const std::string& attr_name){
>+-  static constexpr std::initializer_list<const char*> rgw_sys_attrs = {RGW_ATTR_PG_VER,
>++  static const std::initializer_list<const char*> rgw_sys_attrs = {RGW_ATTR_PG_VER,
>+                                                                        RGW_ATTR_SOURCE_ZONE,
>+                                                                        RGW_ATTR_ID_TAG,
>+                                                                        RGW_ATTR_TEMPURL_KEY1,
>
>Property changes on: net/ceph12/files/patch-src_rgw_rgw_sync_module_es.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: net/ceph12/files/patch-src_tools_ceph__kvstore__tool.cc
>===================================================================
>Index: net/ceph12/pkg-descr
>===================================================================
>Index: net/ceph12/pkg-plist
>===================================================================
>--- net/ceph12/pkg-plist	(revision 493684)
>+++ net/ceph12/pkg-plist	(working copy)
>@@ -104,6 +104,7 @@
> lib/ceph/mgr/dashboard/base.html
> lib/ceph/mgr/dashboard/cephfs_clients.py
> lib/ceph/mgr/dashboard/clients.html
>+lib/ceph/mgr/dashboard/config_options.html
> lib/ceph/mgr/dashboard/filesystem.html
> lib/ceph/mgr/dashboard/health.html
> lib/ceph/mgr/dashboard/module.py

Actions: View | Diff

Attachments on bug 236004: 202332 | 202333