Attachment 206683 Details for Bug 239958 – svn diff for upgrade

[patch] svn diff for upgrade

ceph13-13.2.6.diff (text/plain), 15.59 KB, created by Willem Jan Withagen on 2019-08-18 23:42:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Willem Jan Withagen

Created: 2019-08-18 23:42:50 UTC

Size: 15.59 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 509244)
>+++ Makefile	(working copy)
>@@ -3,10 +3,9 @@
> 
> PORTNAME=	ceph
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	13.2.1
>-PORTREVISION=	1
>+DISTVERSION=	13.2.6
>+CATEGORIES=	net
> PKGNAMESUFFIX=	13
>-CATEGORIES=	net
> 
> MAINTAINER=	wjw@digiware.nl
> COMMENT=	Ceph delivers object, block, and file storage in a unified system
>@@ -21,7 +20,7 @@
> 	bash:shells/bash \
> 	git:devel/git \
> 	yasm:devel/yasm \
>-	sphinx-build:textproc/py-sphinx \
>+	${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \
> 	gperf:devel/gperf \
> 	${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops
> LIB_DEPENDS=	\
>@@ -52,6 +51,7 @@
> USE_PYTHON=	cython
> USE_OPENLDAP=	yes
> USE_GITHUB=	yes
>+GH_ACCOUNT=	ceph:DEFAULT
> 
> CONFLICTS_INSTALL=	ceph
> PORTSCOUT=	limit:^v13\.
>@@ -58,7 +58,7 @@
> 
> GH_TUPLE+=	ceph:ceph-erasure-code-corpus:2d7d78b:ceph_erasure_code_corpus/ceph-erasure-code-corpus
> GH_TUPLE+=	ceph:ceph-object-corpus:e32bf8c:ceph_object_corpus/ceph-object-corpus
>-GH_TUPLE+=	ceph:civetweb:de23828:civetweb/src/civetweb
>+GH_TUPLE+=	ceph:civetweb:088b813:civetweb/src/civetweb
> GH_TUPLE+=	01org:isa-l_crypto:603529a:isa_l_crypto/src/crypto/isa-l/isa-l_crypto
> GH_TUPLE+=	ceph:gf-complete:7e61b44:gf_complete/src/erasure-code/jerasure/gf-complete
> GH_TUPLE+=	ceph:jerasure:96c76b8:jerasure/src/erasure-code/jerasure/jerasure
>@@ -70,10 +70,6 @@
> GH_TUPLE+=	ceph:xxHash:1f40c65:xxHash/src/xxHash
> GH_TUPLE+=	facebook:zstd:f4340f4:zstd/src/zstd
> 
>-# oude hashes
>-# GH_TUPLE+=	ceph:rocksdb:e15382c:rocksdb/src/rocksdb
>-# GH_TUPLE+=      ceph:rocksdb:9090ae3:rocksdb/src/rocksdb
>-
> CMAKE_BUILD_TYPE=	Release
> CMAKE_ARGS=	\
> 	-D WITH_SYSTEM_BOOST:BOOL=ON \
>Index: distinfo
>===================================================================
>--- distinfo	(revision 509244)
>+++ distinfo	(working copy)
>@@ -1,12 +1,12 @@
>-TIMESTAMP = 1532787265
>-SHA256 (ceph-ceph-v13.2.1_GH0.tar.gz) = f5ac4d242d969cebaba239bded165a98c087afc5e4b1ebc3cb1635494384d8a0
>-SIZE (ceph-ceph-v13.2.1_GH0.tar.gz) = 12984612
>+TIMESTAMP = 1565948132
>+SHA256 (ceph-ceph-v13.2.6_GH0.tar.gz) = a4ed5599cd4ea045b79e691a2bc61fceab977f51b25a6e460139cf42891de2be
>+SIZE (ceph-ceph-v13.2.6_GH0.tar.gz) = 13323448
> 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
> SIZE (ceph-ceph-object-corpus-e32bf8c_GH0.tar.gz) = 1838192
>-SHA256 (ceph-civetweb-de23828_GH0.tar.gz) = a9a95dd58e9b4a696fa0c822c1401856c55ef9b67fb28cf15d97f19f1af2ecbd
>-SIZE (ceph-civetweb-de23828_GH0.tar.gz) = 6850197
>+SHA256 (ceph-civetweb-088b813_GH0.tar.gz) = 7ae109f32ee92a3d81223ce88b6d2dfcadfa6b91cf2be877743a5cee30f115e2
>+SIZE (ceph-civetweb-088b813_GH0.tar.gz) = 11349538
> SHA256 (01org-isa-l_crypto-603529a_GH0.tar.gz) = 52708b98c832bb7e6db60c949ece261d9609c822ae55239b0f2133cec2b3d155
> SIZE (01org-isa-l_crypto-603529a_GH0.tar.gz) = 439149
> SHA256 (ceph-gf-complete-7e61b44_GH0.tar.gz) = 7b0e5c1b41399d2c7d97ed7a7547ebf40023bcd104ed9a8b2b75bdee440c1a4d
>Index: files/file-git_version
>===================================================================
>--- files/file-git_version	(revision 509244)
>+++ files/file-git_version	(working copy)
>@@ -1,2 +1,2 @@
>-5533ecdc0fda920179d7ad84e0aa65a127b20d77
>-v13.2.1
>+ccf13a5ae9546dd9567f280e85e0de549ca98b90
>+v13.2.6-257-gccf13a5ae9
>Index: files/patch-CMakeLists.txt
>===================================================================
>--- files/patch-CMakeLists.txt	(nonexistent)
>+++ files/patch-CMakeLists.txt	(working copy)
>@@ -0,0 +1,68 @@
>+diff --git a/CMakeLists.txt b/CMakeLists.txt
>+index d1dd93bd64..0defd394fb 100644
>+--- CMakeLists.txt
>++++ CMakeLists.txt
>+@@ -21,6 +21,9 @@ endif()
>+ if(POLICY CMP0051)
>+   cmake_policy(SET CMP0051 NEW)
>+ endif()
>++if(POLICY CMP0075)
>++  cmake_policy(SET CMP0075 NEW)
>++endif()
>+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/")
>+ 
>+ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
>+@@ -46,15 +49,6 @@ if(WITH_CCACHE)
>+   endif(CCACHE_FOUND)
>+ endif(WITH_CCACHE)
>+ 
>+-option(WITH_MANPAGE "Build man pages." ON)
>+-if(WITH_MANPAGE)
>+-  find_program(SPHINX_BUILD
>+-    sphinx-build)
>+-  if(NOT SPHINX_BUILD)
>+-    message(FATAL_ERROR "Can't find sphinx-build.")
>+-  endif(NOT SPHINX_BUILD)
>+-endif(WITH_MANPAGE)
>+-
>+ include_directories(
>+   ${PROJECT_BINARY_DIR}/src/include
>+   ${PROJECT_SOURCE_DIR}/src)
>+@@ -475,9 +469,19 @@ if(WITH_MGR)
>+   set(MGR_PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE})
>+   set(MGR_PYTHON_LIBRARIES ${PYTHON_LIBRARIES})
>+   set(MGR_PYTHON_VERSION_MAJOR ${PYTHON_VERSION_MAJOR})
>++  set(MGR_PYTHON_VERSION_MINOR ${PYTHON_VERSION_MINOR})
>+   # Boost dependency check deferred to Boost section
>+ endif(WITH_MGR)
>+ 
>++option(WITH_MANPAGE "Build man pages." ON)
>++if(WITH_MANPAGE)
>++  find_program(SPHINX_BUILD
>++    sphinx-build-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
>++  if(NOT SPHINX_BUILD)
>++    message(FATAL_ERROR "Can't find sphinx-build.")
>++  endif(NOT SPHINX_BUILD)
>++endif(WITH_MANPAGE)
>++
>+ option(WITH_THREAD_SAFE_RES_QUERY "res_query is thread safe" OFF)
>+ if(WITH_THREAD_SAFE_RES_QUERY)
>+   set(HAVE_THREAD_SAFE_RES_QUERY 1 CACHE INTERNAL "Thread safe res_query supported.")
>+@@ -524,6 +528,7 @@ option(ENABLE_COVERAGE "Coverage is enabled" OFF)
>+ option(PG_DEBUG_REFS "PG Ref debugging is enabled" OFF)
>+ 
>+ option(WITH_TESTS "enable the build of ceph-test package scripts/binaries" ON)
>++option(CTEST_TIMEOUT "Allow customizing the test timeout" 3600)
>+ 
>+ # fio
>+ option(WITH_FIO "build with fio plugin enabled" OFF)
>+@@ -596,7 +601,8 @@ set(BOOST_COMPONENTS
>+ set(BOOST_HEADER_COMPONENTS container)
>+ 
>+ if(WITH_MGR)
>+-	list(APPEND BOOST_COMPONENTS python)
>++  list(APPEND BOOST_COMPONENTS
>++    python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR})
>+ endif()
>+ if(WITH_BOOST_CONTEXT)
>+   list(APPEND BOOST_COMPONENTS context coroutine)
>
>Property changes on: files/patch-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: files/patch-src_CMakeLists.txt
>===================================================================
>--- files/patch-src_CMakeLists.txt	(nonexistent)
>+++ files/patch-src_CMakeLists.txt	(working copy)
>@@ -0,0 +1,14 @@
>+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
>+index b56a5f745e..7d9bd60079 100644
>+--- src/CMakeLists.txt
>++++ src/CMakeLists.txt
>+@@ -771,7 +771,8 @@ if (WITH_MGR)
>+                  $<TARGET_OBJECTS:heap_profiler_objs>)
>+   target_include_directories(ceph-mgr SYSTEM PRIVATE "${PYTHON_INCLUDE_DIRS}")
>+   target_link_libraries(ceph-mgr osdc client global-static ceph-common
>+-      Boost::python ${MGR_PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
>++      Boost::python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR} 
>++      ${MGR_PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
>+   install(TARGETS ceph-mgr DESTINATION bin)
>+ endif (WITH_MGR)
>+ 
>
>Property changes on: files/patch-src_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: files/patch-src_common_assert.cc
>===================================================================
>--- files/patch-src_common_assert.cc	(nonexistent)
>+++ files/patch-src_common_assert.cc	(working copy)
>@@ -0,0 +1,30 @@
>+diff --git a/src/common/assert.cc b/src/common/assert.cc
>+index 45d44d12ea..4a9625925f 100644
>+--- src/common/assert.cc
>++++ src/common/assert.cc
>+@@ -12,6 +12,7 @@
>+  *
>+  */
>+ 
>++#include "include/compat.h"
>+ #include "common/debug.h"
>+ 
>+ namespace ceph {
>+@@ -40,7 +41,7 @@ namespace ceph {
>+     g_assert_line = line;
>+     g_assert_func = func;
>+     g_assert_thread = (unsigned long long)pthread_self();
>+-    pthread_getname_np(pthread_self(), g_assert_thread_name,
>++    ceph_pthread_getname(pthread_self(), g_assert_thread_name,
>+ 		       sizeof(g_assert_thread_name));
>+ 
>+     ostringstream tss;
>+@@ -88,7 +89,7 @@ namespace ceph {
>+     g_assert_line = line;
>+     g_assert_func = func;
>+     g_assert_thread = (unsigned long long)pthread_self();
>+-    pthread_getname_np(pthread_self(), g_assert_thread_name,
>++    ceph_pthread_getname(pthread_self(), g_assert_thread_name,
>+ 		       sizeof(g_assert_thread_name));
>+ 
>+     class BufAppender {
>
>Property changes on: files/patch-src_common_assert.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: files/patch-src_common_config.cc
>===================================================================
>--- files/patch-src_common_config.cc	(nonexistent)
>+++ files/patch-src_common_config.cc	(working copy)
>@@ -0,0 +1,20 @@
>+index 24ac74c6db..dd66e3b2d2 100644
>+--- src/common/config.cc
>++++ src/common/config.cc
>+@@ -1473,13 +1473,13 @@ class assign_visitor : public boost::static_visitor<>
>+   {
>+     using T = uint64_t;
>+     auto member = const_cast<T*>(&(conf->*(boost::get<const T md_config_t::*>(ptr))));
>+-    *member = boost::apply_visitor(get_size_visitor<T>{}, val);
>++    *member = boost::apply_visitor(get_size_visitor<T>(), val);
>+   }
>+   void operator()(int64_t md_config_t::* ptr) const
>+   {
>+     using T = int64_t;
>+     auto member = const_cast<T*>(&(conf->*(boost::get<const T md_config_t::*>(ptr))));
>+-    *member = boost::apply_visitor(get_size_visitor<T>{}, val);
>++    *member = boost::apply_visitor(get_size_visitor<T>(), val);
>+   }
>+ };
>+ } // anonymous namespace
>+
>
>Property changes on: files/patch-src_common_config.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: files/patch-src_tools_rbd_gate_debug.cc
>===================================================================
>--- files/patch-src_tools_rbd_gate_debug.cc	(nonexistent)
>+++ files/patch-src_tools_rbd_gate_debug.cc	(working copy)
>@@ -0,0 +1,13 @@
>+diff --git a/src/tools/rbd_ggate/debug.cc b/src/tools/rbd_ggate/debug.cc
>+index 8cf912c3ece8..b675ba5b3cae 100644
>+--- src/tools/rbd_ggate/debug.cc
>++++ src/tools/rbd_ggate/debug.cc
>+@@ -17,7 +17,7 @@ extern "C" void debugv(int level, const char *fmt, va_list ap) {
>+ 
>+     vasprintf(&msg, fmt, ap);
>+ 
>+-    dout(level) << msg << dendl;
>++    dout(ceph::dout::need_dynamic(level)) << msg << dendl;
>+ 
>+     free(msg);
>+     errno = saved_errno;
>
>Property changes on: files/patch-src_tools_rbd_gate_debug.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: files/patch-srr_tools_rbd_gate_debug.cc
>===================================================================
>--- files/patch-srr_tools_rbd_gate_debug.cc	(revision 509244)
>+++ files/patch-srr_tools_rbd_gate_debug.cc	(nonexistent)
>@@ -1,13 +0,0 @@
>-diff --git a/src/tools/rbd_ggate/debug.cc b/src/tools/rbd_ggate/debug.cc
>-index 8cf912c3ece8..b675ba5b3cae 100644
>---- src/tools/rbd_ggate/debug.cc
>-+++ src/tools/rbd_ggate/debug.cc
>-@@ -17,7 +17,7 @@ extern "C" void debugv(int level, const char *fmt, va_list ap) {
>- 
>-     vasprintf(&msg, fmt, ap);
>- 
>--    dout(level) << msg << dendl;
>-+    dout(ceph::dout::need_dynamic(level)) << msg << dendl;
>- 
>-     free(msg);
>-     errno = saved_errno;
>
>Property changes on: files/patch-srr_tools_rbd_gate_debug.cc
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 509244)
>+++ pkg-plist	(working copy)
>@@ -3,6 +3,7 @@
> bin/ceph-clsinfo
> bin/ceph-conf
> bin/ceph-coverage
>+bin/ceph-crash
> bin/ceph-debugpack
> bin/ceph-dencoder
> bin/ceph-detect-init
>@@ -98,6 +99,8 @@
> lib/ceph/mgr/CMakeLists.txt
> lib/ceph/mgr/balancer/__init__.py
> lib/ceph/mgr/balancer/module.py
>+lib/ceph/mgr/crash/__init__.py
>+lib/ceph/mgr/crash/module.py
> lib/ceph/mgr/dashboard/.coveragerc
> lib/ceph/mgr/dashboard/.editorconfig
> lib/ceph/mgr/dashboard/.pylintrc
>@@ -124,8 +127,6 @@
> lib/ceph/mgr/dashboard/controllers/task.py
> lib/ceph/mgr/dashboard/controllers/tcmu_iscsi.py
> lib/ceph/mgr/dashboard/exceptions.py
>-lib/ceph/mgr/dashboard/frontend/.angular-cli.json
>-lib/ceph/mgr/dashboard/frontend/.editorconfig
> lib/ceph/mgr/dashboard/frontend/e2e/cluster/monitors.e2e-spec.ts
> lib/ceph/mgr/dashboard/frontend/e2e/cluster/monitors.po.ts
> lib/ceph/mgr/dashboard/frontend/e2e/cluster/osds.e2e-spec.ts
>@@ -132,8 +133,11 @@
> lib/ceph/mgr/dashboard/frontend/e2e/cluster/osds.po.ts
> lib/ceph/mgr/dashboard/frontend/e2e/helper.po.ts
> lib/ceph/mgr/dashboard/frontend/e2e/tsconfig.e2e.json
>+lib/ceph/mgr/dashboard/frontend/.editorconfig
>+lib/ceph/mgr/dashboard/frontend/angular.json
> lib/ceph/mgr/dashboard/frontend/karma.conf.js
> lib/ceph/mgr/dashboard/frontend/package.json
>+lib/ceph/mgr/dashboard/frontend/package-lock.json
> lib/ceph/mgr/dashboard/frontend/protractor.conf.js
> lib/ceph/mgr/dashboard/frontend/proxy.conf.json.sample
> lib/ceph/mgr/dashboard/frontend/src/app/app-routing.module.ts
>@@ -431,6 +435,8 @@
> lib/ceph/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.scss
> lib/ceph/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.spec.ts
> lib/ceph/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.ts
>+lib/ceph/mgr/dashboard/frontend/src/app/shared/decorators/cd-encode.spec.ts
>+lib/ceph/mgr/dashboard/frontend/src/app/shared/decorators/cd-encode.ts
> lib/ceph/mgr/dashboard/frontend/src/app/shared/directives/autofocus.directive.spec.ts
> lib/ceph/mgr/dashboard/frontend/src/app/shared/directives/autofocus.directive.ts
> lib/ceph/mgr/dashboard/frontend/src/app/shared/directives/copy2clipboard-button.directive.spec.ts
>@@ -462,6 +468,8 @@
> lib/ceph/mgr/dashboard/frontend/src/app/shared/pipes/dimless-binary.pipe.ts
> lib/ceph/mgr/dashboard/frontend/src/app/shared/pipes/dimless.pipe.spec.ts
> lib/ceph/mgr/dashboard/frontend/src/app/shared/pipes/dimless.pipe.ts
>+lib/ceph/mgr/dashboard/frontend/src/app/shared/pipes/encode-uri.pipe.spec.ts
>+lib/ceph/mgr/dashboard/frontend/src/app/shared/pipes/encode-uri.pipe.ts
> lib/ceph/mgr/dashboard/frontend/src/app/shared/pipes/filter.pipe.spec.ts
> lib/ceph/mgr/dashboard/frontend/src/app/shared/pipes/filter.pipe.ts
> lib/ceph/mgr/dashboard/frontend/src/app/shared/pipes/health-color.pipe.spec.ts
>@@ -527,6 +535,7 @@
> lib/ceph/mgr/dashboard/tests/helper.py
> lib/ceph/mgr/dashboard/tests/test_notification.py
> lib/ceph/mgr/dashboard/tests/test_rbd_mirroring.py
>+lib/ceph/mgr/dashboard/tests/test_rest_client.py
> lib/ceph/mgr/dashboard/tests/test_rest_tasks.py
> lib/ceph/mgr/dashboard/tests/test_settings.py
> lib/ceph/mgr/dashboard/tests/test_task.py

Flags:

wjw: maintainer-approval+

Actions: View | Diff

Attachments on bug 239958: 206683