[Pkg-ceph-commits] [ceph] 20/59: New release candidate for next stable release.
James Downing Page
jamespage at moszumanska.debian.org
Thu Feb 1 15:27:52 UTC 2018
This is an automated email from the git hooks/post-receive script.
jamespage pushed a commit to branch ubuntu/artful
in repository ceph.
commit 74123c2911e107a7d063d4848fd29df7329001b8
Author: James Page <james.page at ubuntu.com>
Date: Mon Jun 26 15:26:21 2017 +0000
New release candidate for next stable release.
---
debian/changelog | 18 +---
debian/patches/TestMockImageReplayer-cleanup.patch | 46 ----------
debian/patches/conditional-rgw-beast.patch | 43 ---------
debian/patches/disable-boost_container-check.patch | 35 -------
debian/patches/i386-build-fixes.patch | 101 ---------------------
debian/patches/radosgw-boost-linking.patch | 21 -----
.../rgw-migrate-atomic_t-to-std_atomic.patch | 86 ------------------
debian/patches/series | 10 --
8 files changed, 3 insertions(+), 357 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d41ce4d..f1625c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-ceph (12.0.3-0ubuntu1) UNRELEASED; urgency=medium
+ceph (12.1.0-0ubuntu1) UNRELEASED; urgency=medium
- * New development preview for next stable release.
+ * New release candidate for next stable release.
* Sync packaging changes with upstream:
- d/control,python3-*,rules: Add Python 3 support
- d/control,python-rgw.*: Add Python rgw module.
@@ -19,31 +19,19 @@ ceph (12.0.3-0ubuntu1) UNRELEASED; urgency=medium
to switch to cmake build.
- d/control,rules: Drop use of dh-autoreconf.
* Use distro provided boost libraries:
- - d/p/disable-boost_container-check.patch: Cherry pick fix from
- upstream VCS to check for Boost.Container headers only.
- d/rules: Enable use of system boost instead of vendored copy.
- d/control: Add required boost dependencies >= 1.61.
* Support build on s390x:
- - d/p/*: Cherry pick misc patches to allow conditional
- compilation of RGW Beast frontend.
- d/rules: Disable RGW Beast frontend on s390x architecture.
- d/control: Scope libboost-{context,coroutine}-dev to exclude
s390x.
* Support build on i386:
- - d/p/i386-build-fixes.patch: Misc patches to ensure that only
- a minimal set of SIMD instructions are used for i386, inline
- with previous autotools configuration.
- d/p/0001-CoreLocalArray-class.patch,
d/p/0002-core-local-array-type-conversions.patch,
d/p/0003-Core-local-statistics.patch: Cherry pick rocksdb commits
to resolve compatibility with gcc-6 on i386.
- - d/p/rgw-migrate-atomic_t-to-std_atomic.patch: Cherry pick fix
- for 32 bit casting issues in RGW.
- * Support build on armhf:
- - d/p/TestMockImageReplayer-cleanup.patch: Cherry pick cleanup work
- to avoid link failure due to direct inclusion of .cc files.
- -- James Page <james.page at ubuntu.com> Fri, 26 May 2017 09:42:42 +0000
+ -- James Page <james.page at ubuntu.com> Mon, 26 Jun 2017 15:24:40 +0000
ceph (10.2.7-0ubuntu1) artful; urgency=medium
diff --git a/debian/patches/TestMockImageReplayer-cleanup.patch b/debian/patches/TestMockImageReplayer-cleanup.patch
deleted file mode 100644
index e013bd0..0000000
--- a/debian/patches/TestMockImageReplayer-cleanup.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From b07426092222cecb4e7b87363b132e7332e79cc6 Mon Sep 17 00:00:00 2001
-From: Mykola Golub <mgolub at mirantis.com>
-Date: Sat, 22 Apr 2017 12:26:16 +0200
-Subject: [PATCH] test/rbd_mirror: TestMockImageReplayer cleanup
-
-Remove unnecessary ImageSyncThrottler dependency.
-
-Signed-off-by: Mykola Golub <mgolub at mirantis.com>
----
- src/test/rbd_mirror/test_mock_ImageReplayer.cc | 18 +-----------------
- 1 file changed, 1 insertion(+), 17 deletions(-)
-
---- a/src/test/rbd_mirror/test_mock_ImageReplayer.cc
-+++ b/src/test/rbd_mirror/test_mock_ImageReplayer.cc
-@@ -61,22 +61,7 @@ namespace rbd {
- namespace mirror {
-
- template<>
--class ImageSync<librbd::MockTestImageCtx> {
--public:
-- static ImageSync* create(librbd::MockTestImageCtx *local_image_ctx,
-- librbd::MockTestImageCtx *remote_image_ctx,
-- SafeTimer *timer, Mutex *timer_lock,
-- const std::string &mirror_uuid,
-- journal::MockJournaler *journaler,
-- librbd::journal::MirrorPeerClientMeta *client_meta,
-- ContextWQ *work_queue, Context *on_finish,
-- ProgressContext *progress_ctx = nullptr) {
-- assert(0 == "unexpected call");
-- return nullptr;
-- }
--
-- void send() {
-- }
-+class ImageSyncThrottler<librbd::MockTestImageCtx> {
- };
-
- namespace image_replayer {
-@@ -263,7 +248,6 @@ ReplayStatusFormatter<librbd::MockTestIm
-
- // template definitions
- #include "tools/rbd_mirror/ImageReplayer.cc"
--#include "tools/rbd_mirror/ImageSyncThrottler.cc"
-
- namespace rbd {
- namespace mirror {
diff --git a/debian/patches/conditional-rgw-beast.patch b/debian/patches/conditional-rgw-beast.patch
deleted file mode 100644
index d2c8601..0000000
--- a/debian/patches/conditional-rgw-beast.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From b22cde8e88cf2bc0ac8e94ef160553c20971012b Mon Sep 17 00:00:00 2001
-From: Nathan Cutler <ncutler at suse.com>
-Date: Tue, 23 May 2017 09:44:45 +0200
-Subject: [PATCH] cmake: build boost::context and coroutine only with rgw Beast
- frontend
-
-boost::context is currently (1.63) unsupported for s390x and anyway
-it makes sense to conditionalize Boost components so they are only
-built with the Ceph components that need them (like is already being
-done for mgr).
-
-Fixes: http://tracker.ceph.com/issues/20048
-Signed-off-by: Nathan Cutler <ncutler at suse.com>
-Signed-off-by: Tim Serong <tserong at suse.com>
-Signed-off-by: Casey Bodley <cbodley at redhat.com>
-Signed-off-by: Kefu Chai <kchai at redhat.com>
----
- CMakeLists.txt | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -513,14 +513,19 @@ endif()
- # Boost
- option(WITH_SYSTEM_BOOST "require and build with system Boost" OFF)
-
-+# Boost::thread depends on Boost::atomic, so list it explicitly.
- set(BOOST_COMPONENTS
-- thread system regex random program_options date_time iostreams coroutine context)
-+ atomic thread system regex random program_options date_time iostreams)
- set(BOOST_HEADER_COMPONENTS container)
-
- if(WITH_MGR)
- list(APPEND BOOST_COMPONENTS python)
- endif()
-
-+if(WITH_RADOSGW_BEAST_FRONTEND)
-+ list(APPEND BOOST_COMPONENTS coroutine context)
-+endif()
-+
- if (WITH_SYSTEM_BOOST)
- if(ENABLE_SHARED)
- set(Boost_USE_STATIC_LIBS OFF)
diff --git a/debian/patches/disable-boost_container-check.patch b/debian/patches/disable-boost_container-check.patch
deleted file mode 100644
index b1086ad..0000000
--- a/debian/patches/disable-boost_container-check.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 23b073237e6e321f7deaba65a810b187a84be0a0 Mon Sep 17 00:00:00 2001
-From: Bassam Tabbara <bassam.tabbara at quantum.com>
-Date: Thu, 18 May 2017 00:32:59 -0700
-Subject: [PATCH] cmake: fix boost components for WITH_SYSTEM_BOOST
-
-when using WITH_SYSTEM_BOOST dont set header-only packages
-for BOOST_COMPONENTS. On some distros these packages dont
-exist.
-
-Signed-off-by: Bassam Tabbara <bassam.tabbara at quantum.com>
----
- CMakeLists.txt | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -514,7 +514,9 @@ endif()
- option(WITH_SYSTEM_BOOST "require and build with system Boost" OFF)
-
- set(BOOST_COMPONENTS
-- container thread system regex random program_options date_time iostreams coroutine context)
-+ thread system regex random program_options date_time iostreams coroutine context)
-+set(BOOST_HEADER_COMPONENTS container)
-+
- if(WITH_MGR)
- list(APPEND BOOST_COMPONENTS python)
- endif()
-@@ -534,6 +536,7 @@ else()
- set(BOOST_SOURCE_DIR "${PROJECT_SOURCE_DIR}/src/boost")
- set(BOOST_PREFIX "${PROJECT_BINARY_DIR}/boost")
- set(BOOST_BUILD "${PROJECT_BINARY_DIR}/boost-build")
-+ list(APPEND BOOST_COMPONENTS ${BOOST_HEADER_COMPONENTS})
- string(REPLACE ";" "," BOOST_WITH_LIBS "${BOOST_COMPONENTS}")
- execute_process(COMMAND "./bootstrap.sh"
- "--prefix=${BOOST_PREFIX}"
diff --git a/debian/patches/i386-build-fixes.patch b/debian/patches/i386-build-fixes.patch
deleted file mode 100644
index e895d6f..0000000
--- a/debian/patches/i386-build-fixes.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 5d92c79b8e9a2d10ae23e022c1aff7de9e87ed16 Mon Sep 17 00:00:00 2001
-From: James Page <james.page at ubuntu.com>
-Date: Tue, 6 Jun 2017 15:01:40 +0100
-Subject: [PATCH] build: misc fixes for cmake build on i386
-
-Scope SIMD CPU flag detection base on target architecture,
-resolving build failures in gf-complete on i386; this is
-inline with the previous autotools based feature detection.
-
-Only compile crypto/isa-l if yasm 64 bit complier is found,
-effectively limiting scope to x86_64.
-
-Signed-off-by: James Page <james.page at ubuntu.com>
----
- cmake/modules/SIMDExt.cmake | 60 ++++++++++++++++++++++++---------------------
- src/CMakeLists.txt | 4 +--
- 2 files changed, 34 insertions(+), 30 deletions(-)
-
---- a/cmake/modules/SIMDExt.cmake
-+++ b/cmake/modules/SIMDExt.cmake
-@@ -75,34 +75,38 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "a
-
- elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i386|i686|amd64|x86_64|AMD64")
- set(HAVE_INTEL 1)
-- CHECK_C_COMPILER_FLAG(-msse HAVE_INTEL_SSE)
-- if(HAVE_INTEL_SSE)
-- set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse")
-- endif()
-- CHECK_C_COMPILER_FLAG(-msse2 HAVE_INTEL_SSE2)
-- if(HAVE_INTEL_SSE2)
-- set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse2")
-- endif()
-- CHECK_C_COMPILER_FLAG(-msse3 HAVE_INTEL_SSE3)
-- if(HAVE_INTEL_SSE3)
-- set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse3")
-- endif()
-- CHECK_C_COMPILER_FLAG(-mssse3 HAVE_INTEL_SSSE3)
-- if(HAVE_INTEL_SSSE3)
-- set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -mssse3")
-- endif()
-- CHECK_C_COMPILER_FLAG(-mpclmul HAVE_INTEL_PCLMUL)
-- if(HAVE_INTEL_PCLMUL)
-- set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -mpclmul")
-- endif()
-- CHECK_C_COMPILER_FLAG(-msse4.1 HAVE_INTEL_SSE4_1)
-- if(HAVE_INTEL_SSE4_1)
-- set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse4.1")
-- endif()
-- CHECK_C_COMPILER_FLAG(-msse4.2 HAVE_INTEL_SSE4_2)
-- if(HAVE_INTEL_SSE4_2)
-- set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse4.2")
-- endif()
-+ if(CMAKE_SYSTEM_PROCESSOR MATCHES "i686|amd64|x86_64|AMD64")
-+ CHECK_C_COMPILER_FLAG(-msse HAVE_INTEL_SSE)
-+ if(HAVE_INTEL_SSE)
-+ set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse")
-+ endif()
-+ if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64|x86_64|AMD64")
-+ CHECK_C_COMPILER_FLAG(-msse2 HAVE_INTEL_SSE2)
-+ if(HAVE_INTEL_SSE2)
-+ set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse2")
-+ endif()
-+ CHECK_C_COMPILER_FLAG(-msse3 HAVE_INTEL_SSE3)
-+ if(HAVE_INTEL_SSE3)
-+ set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse3")
-+ endif()
-+ CHECK_C_COMPILER_FLAG(-mssse3 HAVE_INTEL_SSSE3)
-+ if(HAVE_INTEL_SSSE3)
-+ set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -mssse3")
-+ endif()
-+ CHECK_C_COMPILER_FLAG(-mpclmul HAVE_INTEL_PCLMUL)
-+ if(HAVE_INTEL_PCLMUL)
-+ set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -mpclmul")
-+ endif()
-+ CHECK_C_COMPILER_FLAG(-msse4.1 HAVE_INTEL_SSE4_1)
-+ if(HAVE_INTEL_SSE4_1)
-+ set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse4.1")
-+ endif()
-+ CHECK_C_COMPILER_FLAG(-msse4.2 HAVE_INTEL_SSE4_2)
-+ if(HAVE_INTEL_SSE4_2)
-+ set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -msse4.2")
-+ endif()
-+ endif(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64|x86_64|AMD64")
-+ endif(CMAKE_SYSTEM_PROCESSOR MATCHES "i686|amd64|x86_64|AMD64")
- elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(powerpc|ppc)64le")
- set(HAVE_PPC64LE 1)
- message(STATUS " we are ppc64le")
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -883,9 +883,9 @@ if(WITH_TESTS)
- DESTINATION bin)
- endif(WITH_TESTS)
-
--if(HAVE_INTEL)
-+if(HAVE_INTEL AND HAVE_BETTER_YASM_ELF64)
- add_subdirectory(crypto/isa-l)
--endif(HAVE_INTEL)
-+endif(HAVE_INTEL AND HAVE_BETTER_YASM_ELF64)
-
- if(WITH_TESTS)
-
diff --git a/debian/patches/radosgw-boost-linking.patch b/debian/patches/radosgw-boost-linking.patch
deleted file mode 100644
index 42a0f48..0000000
--- a/debian/patches/radosgw-boost-linking.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 3dfffa59961856d2b220601964e2816c7cd52678 Mon Sep 17 00:00:00 2001
-From: Nathan Cutler <ncutler at suse.com>
-Date: Tue, 30 May 2017 00:37:00 +0200
-Subject: [PATCH] cmake: link radosgw with boost libraries
-
-Signed-off-by: Nathan Cutler <ncutler at suse.com>
----
- src/rgw/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/src/rgw/CMakeLists.txt
-+++ b/src/rgw/CMakeLists.txt
-@@ -151,7 +151,7 @@ target_link_libraries(radosgw radosgw_a
- cls_log_client cls_statelog_client cls_timeindex_client
- cls_version_client cls_replica_log_client cls_user_client
- global ${FCGI_LIBRARY} ${LIB_RESOLV}
-- ${CURL_LIBRARIES} ${EXPAT_LIBRARIES} ${BLKID_LIBRARIES}
-+ ${CURL_LIBRARIES} ${Boost_LIBRARIES} ${EXPAT_LIBRARIES} ${BLKID_LIBRARIES}
- ${ALLOC_LIBS})
- # radosgw depends on cls libraries at runtime, but not as link dependencies
- add_dependencies(radosgw cls_rgw cls_lock cls_refcount
diff --git a/debian/patches/rgw-migrate-atomic_t-to-std_atomic.patch b/debian/patches/rgw-migrate-atomic_t-to-std_atomic.patch
deleted file mode 100644
index 5d55b65..0000000
--- a/debian/patches/rgw-migrate-atomic_t-to-std_atomic.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From ec4f4c8a64202827c968128fcb83591e959854cf Mon Sep 17 00:00:00 2001
-From: Jesse Williamson <jwilliamson at suse.de>
-Date: Wed, 26 Apr 2017 05:26:38 -0700
-Subject: [PATCH] rgw: migrate atomic_t to std::atomic<>
-
-Signed-off-by: Jesse Williamson <jwilliamson at suse.de>
----
- src/rgw/rgw_loadgen_process.cc | 4 ++--
- src/rgw/rgw_object_expirer_core.h | 10 ++++------
- src/rgw/rgw_process.h | 2 +-
- src/rgw/rgw_request.h | 4 ++--
- 4 files changed, 9 insertions(+), 11 deletions(-)
-
---- a/src/rgw/rgw_loadgen_process.cc
-+++ b/src/rgw/rgw_loadgen_process.cc
-@@ -39,7 +39,7 @@ void RGWLoadGenProcess::run()
-
- vector<string> buckets(num_buckets);
-
-- std::atomic<long int> failed = { 0 };
-+ std::atomic<bool> failed = { false };
-
- for (i = 0; i < num_buckets; i++) {
- buckets[i] = "/loadgen";
-@@ -104,7 +104,7 @@ done:
-
- void RGWLoadGenProcess::gen_request(const string& method,
- const string& resource,
-- int content_length, std::atomic<long int>* fail_flag)
-+ int content_length, std::atomic<bool>* fail_flag)
- {
- RGWLoadGenRequest* req =
- new RGWLoadGenRequest(store->get_new_req_id(), method, resource,
---- a/src/rgw/rgw_object_expirer_core.h
-+++ b/src/rgw/rgw_object_expirer_core.h
-@@ -4,11 +4,11 @@
- #ifndef CEPH_OBJEXP_H
- #define CEPH_OBJEXP_H
-
--#include <errno.h>
--#include <iostream>
--#include <sstream>
--#include <string>
- #include <atomic>
-+#include <string>
-+#include <cerrno>
-+#include <sstream>
-+#include <iostream>
-
- #include "auth/Crypto.h"
-
-@@ -38,8 +38,6 @@
- #include "rgw_usage.h"
- #include "rgw_replica_log.h"
-
--#include <atomic>
--
- class RGWObjectExpirer {
- protected:
- RGWRados *store;
---- a/src/rgw/rgw_process.h
-+++ b/src/rgw/rgw_process.h
-@@ -184,7 +184,7 @@ public:
- void checkpoint();
- void handle_request(RGWRequest* req) override;
- void gen_request(const string& method, const string& resource,
-- int content_length, std::atomic<int64_t>* fail_flag);
-+ int content_length, std::atomic<bool>* fail_flag);
-
- void set_access_key(RGWAccessKey& key) { access_key = key; }
- };
---- a/src/rgw/rgw_request.h
-+++ b/src/rgw/rgw_request.h
-@@ -59,10 +59,10 @@ struct RGWLoadGenRequest : public RGWReq
- string method;
- string resource;
- int content_length;
-- std::atomic<int64_t>* fail_flag = nullptr;
-+ std::atomic<bool>* fail_flag = nullptr;
-
- RGWLoadGenRequest(uint64_t req_id, const string& _m, const string& _r, int _cl,
-- std::atomic<int64_t> *ff)
-+ std::atomic<bool> *ff)
- : RGWRequest(req_id), method(_m), resource(_r), content_length(_cl),
- fail_flag(ff) {}
- };
diff --git a/debian/patches/series b/debian/patches/series
index 3b04cab..189db34 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,14 +1,4 @@
-# Ubuntu: Misc fixes for Boost integration
-disable-boost_container-check.patch
-radosgw-boost-linking.patch
-conditional-rgw-beast.patch
-
# Ubuntu: i386 build failure
-i386-build-fixes.patch
0001-CoreLocalArray-class.patch
0002-core-local-array-type-conversions.patch
0003-Core-local-statistics.patch
-rgw-migrate-atomic_t-to-std_atomic.patch
-
-# Ubuntu: armhf link failure
-TestMockImageReplayer-cleanup.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git
More information about the Pkg-ceph-commits
mailing list