Attachment #206683 for bug #239958

View | Details | Raw Unified | Return to bug 239958
Collapse All | Expand All





PORTNAME=	ceph
DISTVERSIONPREFIX=	v
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

	bash:shells/bash \
	git:devel/git \
	yasm:devel/yasm \
	${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \
	gperf:devel/gperf \
	${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops
LIB_DEPENDS=	\

USE_PYTHON=	cython
USE_OPENLDAP=	yes
USE_GITHUB=	yes
GH_ACCOUNT=	ceph:DEFAULT

CONFLICTS_INSTALL=	ceph
PORTSCOUT=	limit:^v13\.


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: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

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 \




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-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

Lines 1-2 Link Here

(-)files/file-git_version (-2 / +2 lines)
1	5533ecdc0fda920179d7ad84e0aa65a127b20d77	1	ccf13a5ae9546dd9567f280e85e0de549ca98b90
2	v13.2.1	2	v13.2.6-257-gccf13a5ae9




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)




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)
 




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 {




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





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;




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;

Lines 3-8 Link Here

(-)pkg-plist (-2 / +11 lines)
3	bin/ceph-clsinfo	3	bin/ceph-clsinfo
4	bin/ceph-conf	4	bin/ceph-conf
5	bin/ceph-coverage	5	bin/ceph-coverage
		6	bin/ceph-crash
6	bin/ceph-debugpack	7	bin/ceph-debugpack
7	bin/ceph-dencoder	8	bin/ceph-dencoder
8	bin/ceph-detect-init	9	bin/ceph-detect-init
Lines 98-103 Link Here
98	lib/ceph/mgr/CMakeLists.txt	99	lib/ceph/mgr/CMakeLists.txt
99	lib/ceph/mgr/balancer/__init__.py	100	lib/ceph/mgr/balancer/__init__.py
100	lib/ceph/mgr/balancer/module.py	101	lib/ceph/mgr/balancer/module.py
		102	lib/ceph/mgr/crash/__init__.py
		103	lib/ceph/mgr/crash/module.py
101	lib/ceph/mgr/dashboard/.coveragerc	104	lib/ceph/mgr/dashboard/.coveragerc
102	lib/ceph/mgr/dashboard/.editorconfig	105	lib/ceph/mgr/dashboard/.editorconfig
103	lib/ceph/mgr/dashboard/.pylintrc	106	lib/ceph/mgr/dashboard/.pylintrc
Lines 124-131 Link Here
124	lib/ceph/mgr/dashboard/controllers/task.py	127	lib/ceph/mgr/dashboard/controllers/task.py
125	lib/ceph/mgr/dashboard/controllers/tcmu_iscsi.py	128	lib/ceph/mgr/dashboard/controllers/tcmu_iscsi.py
126	lib/ceph/mgr/dashboard/exceptions.py	129	lib/ceph/mgr/dashboard/exceptions.py
127	lib/ceph/mgr/dashboard/frontend/.angular-cli.json
128	lib/ceph/mgr/dashboard/frontend/.editorconfig
129	lib/ceph/mgr/dashboard/frontend/e2e/cluster/monitors.e2e-spec.ts	130	lib/ceph/mgr/dashboard/frontend/e2e/cluster/monitors.e2e-spec.ts
130	lib/ceph/mgr/dashboard/frontend/e2e/cluster/monitors.po.ts	131	lib/ceph/mgr/dashboard/frontend/e2e/cluster/monitors.po.ts
131	lib/ceph/mgr/dashboard/frontend/e2e/cluster/osds.e2e-spec.ts	132	lib/ceph/mgr/dashboard/frontend/e2e/cluster/osds.e2e-spec.ts
Lines 132-139 Link Here
132	lib/ceph/mgr/dashboard/frontend/e2e/cluster/osds.po.ts	133	lib/ceph/mgr/dashboard/frontend/e2e/cluster/osds.po.ts
133	lib/ceph/mgr/dashboard/frontend/e2e/helper.po.ts	134	lib/ceph/mgr/dashboard/frontend/e2e/helper.po.ts
134	lib/ceph/mgr/dashboard/frontend/e2e/tsconfig.e2e.json	135	lib/ceph/mgr/dashboard/frontend/e2e/tsconfig.e2e.json
		136	lib/ceph/mgr/dashboard/frontend/.editorconfig
		137	lib/ceph/mgr/dashboard/frontend/angular.json
135	lib/ceph/mgr/dashboard/frontend/karma.conf.js	138	lib/ceph/mgr/dashboard/frontend/karma.conf.js
136	lib/ceph/mgr/dashboard/frontend/package.json	139	lib/ceph/mgr/dashboard/frontend/package.json
		140	lib/ceph/mgr/dashboard/frontend/package-lock.json
137	lib/ceph/mgr/dashboard/frontend/protractor.conf.js	141	lib/ceph/mgr/dashboard/frontend/protractor.conf.js
138	lib/ceph/mgr/dashboard/frontend/proxy.conf.json.sample	142	lib/ceph/mgr/dashboard/frontend/proxy.conf.json.sample
139	lib/ceph/mgr/dashboard/frontend/src/app/app-routing.module.ts	143	lib/ceph/mgr/dashboard/frontend/src/app/app-routing.module.ts
Lines 431-436 Link Here
431	lib/ceph/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.scss	435	lib/ceph/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.scss
432	lib/ceph/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.spec.ts	436	lib/ceph/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.spec.ts
433	lib/ceph/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.ts	437	lib/ceph/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.ts
		438	lib/ceph/mgr/dashboard/frontend/src/app/shared/decorators/cd-encode.spec.ts
		439	lib/ceph/mgr/dashboard/frontend/src/app/shared/decorators/cd-encode.ts
434	lib/ceph/mgr/dashboard/frontend/src/app/shared/directives/autofocus.directive.spec.ts	440	lib/ceph/mgr/dashboard/frontend/src/app/shared/directives/autofocus.directive.spec.ts
435	lib/ceph/mgr/dashboard/frontend/src/app/shared/directives/autofocus.directive.ts	441	lib/ceph/mgr/dashboard/frontend/src/app/shared/directives/autofocus.directive.ts
436	lib/ceph/mgr/dashboard/frontend/src/app/shared/directives/copy2clipboard-button.directive.spec.ts	442	lib/ceph/mgr/dashboard/frontend/src/app/shared/directives/copy2clipboard-button.directive.spec.ts
Lines 462-467 Link Here
462	lib/ceph/mgr/dashboard/frontend/src/app/shared/pipes/dimless-binary.pipe.ts	468	lib/ceph/mgr/dashboard/frontend/src/app/shared/pipes/dimless-binary.pipe.ts
463	lib/ceph/mgr/dashboard/frontend/src/app/shared/pipes/dimless.pipe.spec.ts	469	lib/ceph/mgr/dashboard/frontend/src/app/shared/pipes/dimless.pipe.spec.ts
464	lib/ceph/mgr/dashboard/frontend/src/app/shared/pipes/dimless.pipe.ts	470	lib/ceph/mgr/dashboard/frontend/src/app/shared/pipes/dimless.pipe.ts
		471	lib/ceph/mgr/dashboard/frontend/src/app/shared/pipes/encode-uri.pipe.spec.ts
		472	lib/ceph/mgr/dashboard/frontend/src/app/shared/pipes/encode-uri.pipe.ts
465	lib/ceph/mgr/dashboard/frontend/src/app/shared/pipes/filter.pipe.spec.ts	473	lib/ceph/mgr/dashboard/frontend/src/app/shared/pipes/filter.pipe.spec.ts
466	lib/ceph/mgr/dashboard/frontend/src/app/shared/pipes/filter.pipe.ts	474	lib/ceph/mgr/dashboard/frontend/src/app/shared/pipes/filter.pipe.ts
467	lib/ceph/mgr/dashboard/frontend/src/app/shared/pipes/health-color.pipe.spec.ts	475	lib/ceph/mgr/dashboard/frontend/src/app/shared/pipes/health-color.pipe.spec.ts
Lines 527-532 Link Here
527	lib/ceph/mgr/dashboard/tests/helper.py	535	lib/ceph/mgr/dashboard/tests/helper.py
528	lib/ceph/mgr/dashboard/tests/test_notification.py	536	lib/ceph/mgr/dashboard/tests/test_notification.py
529	lib/ceph/mgr/dashboard/tests/test_rbd_mirroring.py	537	lib/ceph/mgr/dashboard/tests/test_rbd_mirroring.py
		538	lib/ceph/mgr/dashboard/tests/test_rest_client.py
530	lib/ceph/mgr/dashboard/tests/test_rest_tasks.py	539	lib/ceph/mgr/dashboard/tests/test_rest_tasks.py
531	lib/ceph/mgr/dashboard/tests/test_settings.py	540	lib/ceph/mgr/dashboard/tests/test_settings.py
532	lib/ceph/mgr/dashboard/tests/test_task.py	541	lib/ceph/mgr/dashboard/tests/test_task.py

Return to bug 239958

Lines 3-12 Link Here

(-)Makefile (-9 / +5 lines)
3		3
4	PORTNAME= ceph	4	PORTNAME= ceph
5	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
6	DISTVERSION= 13.2.1	6	DISTVERSION= 13.2.6
7	PORTREVISION= 1	7	CATEGORIES= net
8	PKGNAMESUFFIX= 13	8	PKGNAMESUFFIX= 13
9	CATEGORIES= net
10		9
11	MAINTAINER= wjw@digiware.nl	10	MAINTAINER= wjw@digiware.nl
12	COMMENT= Ceph delivers object, block, and file storage in a unified system	11	COMMENT= Ceph delivers object, block, and file storage in a unified system
Lines 21-27 Link Here
21	bash:shells/bash \	20	bash:shells/bash \
22	git:devel/git \	21	git:devel/git \
23	yasm:devel/yasm \	22	yasm:devel/yasm \
24	sphinx-build:textproc/py-sphinx \	23	${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \
25	gperf:devel/gperf \	24	gperf:devel/gperf \
26	${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops	25	${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops
27	LIB_DEPENDS= \	26	LIB_DEPENDS= \
Lines 52-57 Link Here
52	USE_PYTHON= cython	51	USE_PYTHON= cython
53	USE_OPENLDAP= yes	52	USE_OPENLDAP= yes
54	USE_GITHUB= yes	53	USE_GITHUB= yes
		54	GH_ACCOUNT= ceph:DEFAULT
55		55
56	CONFLICTS_INSTALL= ceph	56	CONFLICTS_INSTALL= ceph
57	PORTSCOUT= limit:^v13\.	57	PORTSCOUT= limit:^v13\.
Lines 58-64 Link Here
58		58
59	GH_TUPLE+= ceph:ceph-erasure-code-corpus:2d7d78b:ceph_erasure_code_corpus/ceph-erasure-code-corpus	59	GH_TUPLE+= ceph:ceph-erasure-code-corpus:2d7d78b:ceph_erasure_code_corpus/ceph-erasure-code-corpus
60	GH_TUPLE+= ceph:ceph-object-corpus:e32bf8c:ceph_object_corpus/ceph-object-corpus	60	GH_TUPLE+= ceph:ceph-object-corpus:e32bf8c:ceph_object_corpus/ceph-object-corpus
61	GH_TUPLE+= ceph:civetweb:de23828:civetweb/src/civetweb	61	GH_TUPLE+= ceph:civetweb:088b813:civetweb/src/civetweb
62	GH_TUPLE+= 01org:isa-l_crypto:603529a:isa_l_crypto/src/crypto/isa-l/isa-l_crypto	62	GH_TUPLE+= 01org:isa-l_crypto:603529a:isa_l_crypto/src/crypto/isa-l/isa-l_crypto
63	GH_TUPLE+= ceph:gf-complete:7e61b44:gf_complete/src/erasure-code/jerasure/gf-complete	63	GH_TUPLE+= ceph:gf-complete:7e61b44:gf_complete/src/erasure-code/jerasure/gf-complete
64	GH_TUPLE+= ceph:jerasure:96c76b8:jerasure/src/erasure-code/jerasure/jerasure	64	GH_TUPLE+= ceph:jerasure:96c76b8:jerasure/src/erasure-code/jerasure/jerasure
Lines 70-79 Link Here
70	GH_TUPLE+= ceph:xxHash:1f40c65:xxHash/src/xxHash	70	GH_TUPLE+= ceph:xxHash:1f40c65:xxHash/src/xxHash
71	GH_TUPLE+= facebook:zstd:f4340f4:zstd/src/zstd	71	GH_TUPLE+= facebook:zstd:f4340f4:zstd/src/zstd
72		72
73	# oude hashes
74	# GH_TUPLE+= ceph:rocksdb:e15382c:rocksdb/src/rocksdb
75	# GH_TUPLE+= ceph:rocksdb:9090ae3:rocksdb/src/rocksdb
76
77	CMAKE_BUILD_TYPE= Release	73	CMAKE_BUILD_TYPE= Release
78	CMAKE_ARGS= \	74	CMAKE_ARGS= \
79	-D WITH_SYSTEM_BOOST:BOOL=ON \	75	-D WITH_SYSTEM_BOOST:BOOL=ON \

Lines 1-12 Link Here

(-)distinfo (-5 / +5 lines)
1	TIMESTAMP = 1532787265	1	TIMESTAMP = 1565948132
2	SHA256 (ceph-ceph-v13.2.1_GH0.tar.gz) = f5ac4d242d969cebaba239bded165a98c087afc5e4b1ebc3cb1635494384d8a0	2	SHA256 (ceph-ceph-v13.2.6_GH0.tar.gz) = a4ed5599cd4ea045b79e691a2bc61fceab977f51b25a6e460139cf42891de2be
3	SIZE (ceph-ceph-v13.2.1_GH0.tar.gz) = 12984612	3	SIZE (ceph-ceph-v13.2.6_GH0.tar.gz) = 13323448
4	SHA256 (ceph-ceph-erasure-code-corpus-2d7d78b_GH0.tar.gz) = 8ab8f36f3e0a720c882b8bb4abb3f2e26bd6b025cc263119207f7d2eb3b1e490	4	SHA256 (ceph-ceph-erasure-code-corpus-2d7d78b_GH0.tar.gz) = 8ab8f36f3e0a720c882b8bb4abb3f2e26bd6b025cc263119207f7d2eb3b1e490
5	SIZE (ceph-ceph-erasure-code-corpus-2d7d78b_GH0.tar.gz) = 3685656	5	SIZE (ceph-ceph-erasure-code-corpus-2d7d78b_GH0.tar.gz) = 3685656
6	SHA256 (ceph-ceph-object-corpus-e32bf8c_GH0.tar.gz) = 79ff0d1b9f959c9f5264a0dff193105d71885615deaa9c8469902400fd82d214	6	SHA256 (ceph-ceph-object-corpus-e32bf8c_GH0.tar.gz) = 79ff0d1b9f959c9f5264a0dff193105d71885615deaa9c8469902400fd82d214
7	SIZE (ceph-ceph-object-corpus-e32bf8c_GH0.tar.gz) = 1838192	7	SIZE (ceph-ceph-object-corpus-e32bf8c_GH0.tar.gz) = 1838192
8	SHA256 (ceph-civetweb-de23828_GH0.tar.gz) = a9a95dd58e9b4a696fa0c822c1401856c55ef9b67fb28cf15d97f19f1af2ecbd	8	SHA256 (ceph-civetweb-088b813_GH0.tar.gz) = 7ae109f32ee92a3d81223ce88b6d2dfcadfa6b91cf2be877743a5cee30f115e2
9	SIZE (ceph-civetweb-de23828_GH0.tar.gz) = 6850197	9	SIZE (ceph-civetweb-088b813_GH0.tar.gz) = 11349538
10	SHA256 (01org-isa-l_crypto-603529a_GH0.tar.gz) = 52708b98c832bb7e6db60c949ece261d9609c822ae55239b0f2133cec2b3d155	10	SHA256 (01org-isa-l_crypto-603529a_GH0.tar.gz) = 52708b98c832bb7e6db60c949ece261d9609c822ae55239b0f2133cec2b3d155
11	SIZE (01org-isa-l_crypto-603529a_GH0.tar.gz) = 439149	11	SIZE (01org-isa-l_crypto-603529a_GH0.tar.gz) = 439149
12	SHA256 (ceph-gf-complete-7e61b44_GH0.tar.gz) = 7b0e5c1b41399d2c7d97ed7a7547ebf40023bcd104ed9a8b2b75bdee440c1a4d	12	SHA256 (ceph-gf-complete-7e61b44_GH0.tar.gz) = 7b0e5c1b41399d2c7d97ed7a7547ebf40023bcd104ed9a8b2b75bdee440c1a4d

Line 0 Link Here

(-)files/patch-CMakeLists.txt (+68 lines)
		1	diff --git a/CMakeLists.txt b/CMakeLists.txt
		2	index d1dd93bd64..0defd394fb 100644
		3	--- CMakeLists.txt
		4	+++ CMakeLists.txt
		5	@@ -21,6 +21,9 @@ endif()
		6	if(POLICY CMP0051)
		7	cmake_policy(SET CMP0051 NEW)
		8	endif()
		9	+if(POLICY CMP0075)
		10	+ cmake_policy(SET CMP0075 NEW)
		11	+endif()
		12	list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/")
		13
		14	if(CMAKE_SYSTEM_NAME MATCHES "Linux")
		15	@@ -46,15 +49,6 @@ if(WITH_CCACHE)
		16	endif(CCACHE_FOUND)
		17	endif(WITH_CCACHE)
		18
		19	-option(WITH_MANPAGE "Build man pages." ON)
		20	-if(WITH_MANPAGE)
		21	- find_program(SPHINX_BUILD
		22	- sphinx-build)
		23	- if(NOT SPHINX_BUILD)
		24	- message(FATAL_ERROR "Can't find sphinx-build.")
		25	- endif(NOT SPHINX_BUILD)
		26	-endif(WITH_MANPAGE)
		27	-
		28	include_directories(
		29	${PROJECT_BINARY_DIR}/src/include
		30	${PROJECT_SOURCE_DIR}/src)
		31	@@ -475,9 +469,19 @@ if(WITH_MGR)
		32	set(MGR_PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE})
		33	set(MGR_PYTHON_LIBRARIES ${PYTHON_LIBRARIES})
		34	set(MGR_PYTHON_VERSION_MAJOR ${PYTHON_VERSION_MAJOR})
		35	+ set(MGR_PYTHON_VERSION_MINOR ${PYTHON_VERSION_MINOR})
		36	# Boost dependency check deferred to Boost section
		37	endif(WITH_MGR)
		38
		39	+option(WITH_MANPAGE "Build man pages." ON)
		40	+if(WITH_MANPAGE)
		41	+ find_program(SPHINX_BUILD
		42	+ sphinx-build-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
		43	+ if(NOT SPHINX_BUILD)
		44	+ message(FATAL_ERROR "Can't find sphinx-build.")
		45	+ endif(NOT SPHINX_BUILD)
		46	+endif(WITH_MANPAGE)
		47	+
		48	option(WITH_THREAD_SAFE_RES_QUERY "res_query is thread safe" OFF)
		49	if(WITH_THREAD_SAFE_RES_QUERY)
		50	set(HAVE_THREAD_SAFE_RES_QUERY 1 CACHE INTERNAL "Thread safe res_query supported.")
		51	@@ -524,6 +528,7 @@ option(ENABLE_COVERAGE "Coverage is enabled" OFF)
		52	option(PG_DEBUG_REFS "PG Ref debugging is enabled" OFF)
		53
		54	option(WITH_TESTS "enable the build of ceph-test package scripts/binaries" ON)
		55	+option(CTEST_TIMEOUT "Allow customizing the test timeout" 3600)
		56
		57	# fio
		58	option(WITH_FIO "build with fio plugin enabled" OFF)
		59	@@ -596,7 +601,8 @@ set(BOOST_COMPONENTS
		60	set(BOOST_HEADER_COMPONENTS container)
		61
		62	if(WITH_MGR)
		63	- list(APPEND BOOST_COMPONENTS python)
		64	+ list(APPEND BOOST_COMPONENTS
65	+ python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR})
66	endif()
67	if(WITH_BOOST_CONTEXT)
68	list(APPEND BOOST_COMPONENTS context coroutine)

Line 0 Link Here

(-)files/patch-src_CMakeLists.txt (+14 lines)
	1	diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
	2	index b56a5f745e..7d9bd60079 100644
	3	--- src/CMakeLists.txt
	4	+++ src/CMakeLists.txt
	5	@@ -771,7 +771,8 @@ if (WITH_MGR)
	6	$<TARGET_OBJECTS:heap_profiler_objs>)
	7	target_include_directories(ceph-mgr SYSTEM PRIVATE "${PYTHON_INCLUDE_DIRS}")
	8	target_link_libraries(ceph-mgr osdc client global-static ceph-common
	9	- Boost::python ${MGR_PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
	10	+ Boost::python${MGR_PYTHON_VERSION_MAJOR}${MGR_PYTHON_VERSION_MINOR}
	11	+ ${MGR_PYTHON_LIBRARIES} ${BLKID_LIBRARIES} ${CMAKE_DL_LIBS} ${ALLOC_LIBS})
	12	install(TARGETS ceph-mgr DESTINATION bin)
	13	endif (WITH_MGR)
	14

Line 0 Link Here

(-)files/patch-src_common_assert.cc (+30 lines)
	1	diff --git a/src/common/assert.cc b/src/common/assert.cc
	2	index 45d44d12ea..4a9625925f 100644
	3	--- src/common/assert.cc
	4	+++ src/common/assert.cc
	5	@@ -12,6 +12,7 @@
	6	*
	7	*/
	8
	9	+#include "include/compat.h"
	10	#include "common/debug.h"
	11
	12	namespace ceph {
	13	@@ -40,7 +41,7 @@ namespace ceph {
	14	g_assert_line = line;
	15	g_assert_func = func;
	16	g_assert_thread = (unsigned long long)pthread_self();
	17	- pthread_getname_np(pthread_self(), g_assert_thread_name,
	18	+ ceph_pthread_getname(pthread_self(), g_assert_thread_name,
	19	sizeof(g_assert_thread_name));
	20
	21	ostringstream tss;
	22	@@ -88,7 +89,7 @@ namespace ceph {
	23	g_assert_line = line;
	24	g_assert_func = func;
	25	g_assert_thread = (unsigned long long)pthread_self();
	26	- pthread_getname_np(pthread_self(), g_assert_thread_name,
	27	+ ceph_pthread_getname(pthread_self(), g_assert_thread_name,
	28	sizeof(g_assert_thread_name));
	29
	30	class BufAppender {

Line 0 Link Here

(-)files/patch-src_common_config.cc (+20 lines)
	1	index 24ac74c6db..dd66e3b2d2 100644
	2	--- src/common/config.cc
	3	+++ src/common/config.cc
	4	@@ -1473,13 +1473,13 @@ class assign_visitor : public boost::static_visitor<>
	5	{
	6	using T = uint64_t;
	7	auto member = const_cast<T>(&(conf->(boost::get<const T md_config_t::*>(ptr))));
	8	- *member = boost::apply_visitor(get_size_visitor<T>{}, val);
	9	+ *member = boost::apply_visitor(get_size_visitor<T>(), val);
	10	}
	11	void operator()(int64_t md_config_t::* ptr) const
	12	{
	13	using T = int64_t;
	14	auto member = const_cast<T>(&(conf->(boost::get<const T md_config_t::*>(ptr))));
	15	- *member = boost::apply_visitor(get_size_visitor<T>{}, val);
	16	+ *member = boost::apply_visitor(get_size_visitor<T>(), val);
	17	}
	18	};
	19	} // anonymous namespace
	20

Line 0 Link Here

(-)files/patch-src_tools_rbd_gate_debug.cc (+13 lines)
	1	diff --git a/src/tools/rbd_ggate/debug.cc b/src/tools/rbd_ggate/debug.cc
	2	index 8cf912c3ece8..b675ba5b3cae 100644
	3	--- src/tools/rbd_ggate/debug.cc
	4	+++ src/tools/rbd_ggate/debug.cc
	5	@@ -17,7 +17,7 @@ extern "C" void debugv(int level, const char *fmt, va_list ap) {
	6
	7	vasprintf(&msg, fmt, ap);
	8
	9	- dout(level) << msg << dendl;
	10	+ dout(ceph::dout::need_dynamic(level)) << msg << dendl;
	11
	12	free(msg);
	13	errno = saved_errno;

Lines 1-13 Link Here

(-)files/patch-srr_tools_rbd_gate_debug.cc (-13 lines)
1	diff --git a/src/tools/rbd_ggate/debug.cc b/src/tools/rbd_ggate/debug.cc
2	index 8cf912c3ece8..b675ba5b3cae 100644
3	--- src/tools/rbd_ggate/debug.cc
4	+++ src/tools/rbd_ggate/debug.cc
5	@@ -17,7 +17,7 @@ extern "C" void debugv(int level, const char *fmt, va_list ap) {
6
7	vasprintf(&msg, fmt, ap);
8
9	- dout(level) << msg << dendl;
10	+ dout(ceph::dout::need_dynamic(level)) << msg << dendl;
11
12	free(msg);
13	errno = saved_errno;