[Pkg-ceph-commits] [ceph] 18/59: Refresh patchs, tidy changelog
James Downing Page
jamespage at moszumanska.debian.org
Thu Feb 1 15:27:51 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 df84af93701855973363183990b7055ac5d7ca15
Author: James Page <james.page at ubuntu.com>
Date: Fri Jun 16 12:29:36 2017 +0000
Refresh patchs, tidy changelog
---
debian/changelog | 3 +-
debian/patches/0001-CoreLocalArray-class.patch | 20 ++---
.../0002-core-local-array-type-conversions.patch | 7 +-
debian/patches/0003-Core-local-statistics.patch | 57 ++++++-------
debian/patches/TestMockImageReplayer-cleanup.patch | 4 +-
debian/patches/i386-build-fixes.patch | 96 +++++++++++++++++++---
.../rgw-migrate-atomic_t-to-std_atomic.patch | 14 +---
7 files changed, 118 insertions(+), 83 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0afe1ae..d41ce4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,7 +17,6 @@ ceph (12.0.3-0ubuntu1) UNRELEASED; urgency=medium
- d/*: wrap-and-sort.
- d/p/*: Drop existing patches, either upstream or obsolete due
to switch to cmake build.
- - d/control: Use yasm on i386.
- d/control,rules: Drop use of dh-autoreconf.
* Use distro provided boost libraries:
- d/p/disable-boost_container-check.patch: Cherry pick fix from
@@ -32,7 +31,7 @@ ceph (12.0.3-0ubuntu1) UNRELEASED; urgency=medium
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 to i386, inline
+ 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,
diff --git a/debian/patches/0001-CoreLocalArray-class.patch b/debian/patches/0001-CoreLocalArray-class.patch
index 4695a88..e2b9648 100644
--- a/debian/patches/0001-CoreLocalArray-class.patch
+++ b/debian/patches/0001-CoreLocalArray-class.patch
@@ -20,8 +20,6 @@ fbshipit-source-id: a75a7b8f7b7a42fd6273489ada405f14c6be196a
3 files changed, 103 insertions(+), 31 deletions(-)
create mode 100644 util/core_local.h
-diff --git a/src/rocksdb/util/concurrent_arena.cc b/src/rocksdb/util/concurrent_arena.cc
-index df87011..a0feb93 100644
--- a/src/rocksdb/util/concurrent_arena.cc
+++ b/src/rocksdb/util/concurrent_arena.cc
@@ -16,35 +16,24 @@
@@ -67,8 +65,6 @@ index df87011..a0feb93 100644
}
} // namespace rocksdb
-diff --git a/src/rocksdb/util/concurrent_arena.h b/src/rocksdb/util/concurrent_arena.h
-index 3a20bb6..a6db1e9 100644
--- a/src/rocksdb/util/concurrent_arena.h
+++ b/src/rocksdb/util/concurrent_arena.h
@@ -14,6 +14,7 @@
@@ -79,7 +75,7 @@ index 3a20bb6..a6db1e9 100644
#include "util/mutexlock.h"
#include "util/thread_local.h"
-@@ -63,9 +64,7 @@ class ConcurrentArena : public Allocator {
+@@ -63,9 +64,7 @@ class ConcurrentArena : public Allocator
size_t ApproximateMemoryUsage() const {
std::unique_lock<SpinMutex> lock(arena_mutex_, std::defer_lock);
@@ -90,7 +86,7 @@ index 3a20bb6..a6db1e9 100644
return arena_.ApproximateMemoryUsage() - ShardAllocatedAndUnused();
}
-@@ -95,18 +94,16 @@ class ConcurrentArena : public Allocator {
+@@ -95,18 +94,16 @@ class ConcurrentArena : public Allocator
};
#ifdef ROCKSDB_SUPPORT_THREAD_LOCAL
@@ -112,7 +108,7 @@ index 3a20bb6..a6db1e9 100644
Arena arena_;
mutable SpinMutex arena_mutex_;
-@@ -120,15 +117,16 @@ class ConcurrentArena : public Allocator {
+@@ -120,15 +117,16 @@ class ConcurrentArena : public Allocator
size_t ShardAllocatedAndUnused() const {
size_t total = 0;
@@ -132,7 +128,7 @@ index 3a20bb6..a6db1e9 100644
// Go directly to the arena if the allocation is too large, or if
// we've never needed to Repick() and the arena mutex is available
-@@ -137,7 +135,8 @@ class ConcurrentArena : public Allocator {
+@@ -137,7 +135,8 @@ class ConcurrentArena : public Allocator
std::unique_lock<SpinMutex> arena_lock(arena_mutex_, std::defer_lock);
if (bytes > shard_block_size_ / 4 || force_arena ||
((cpu = tls_cpuid) == 0 &&
@@ -142,7 +138,7 @@ index 3a20bb6..a6db1e9 100644
arena_lock.try_lock())) {
if (!arena_lock.owns_lock()) {
arena_lock.lock();
-@@ -148,7 +147,7 @@ class ConcurrentArena : public Allocator {
+@@ -148,7 +147,7 @@ class ConcurrentArena : public Allocator
}
// pick a shard from which to allocate
@@ -151,9 +147,6 @@ index 3a20bb6..a6db1e9 100644
if (!s->mutex.try_lock()) {
s = Repick();
s->mutex.lock();
-diff --git a/src/rocksdb/util/core_local.h b/src/rocksdb/util/core_local.h
-new file mode 100644
-index 0000000..806584d
--- /dev/null
+++ b/src/rocksdb/util/core_local.h
@@ -0,0 +1,84 @@
@@ -241,6 +234,3 @@ index 0000000..806584d
+}
+
+} // namespace rocksdb
---
-2.7.4
-
diff --git a/debian/patches/0002-core-local-array-type-conversions.patch b/debian/patches/0002-core-local-array-type-conversions.patch
index 7537bf1..db030ff 100644
--- a/debian/patches/0002-core-local-array-type-conversions.patch
+++ b/debian/patches/0002-core-local-array-type-conversions.patch
@@ -19,8 +19,6 @@ fbshipit-source-id: f3309e77526ac9612c632bf93a62d99757af9a29
util/core_local.h | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
-diff --git a/src/rocksdb/util/core_local.h b/src/rocksdb/util/core_local.h
-index 806584d..7515c54 100644
--- a/src/rocksdb/util/core_local.h
+++ b/src/rocksdb/util/core_local.h
@@ -38,23 +38,23 @@ class CoreLocalArray {
@@ -52,7 +50,7 @@ index 806584d..7515c54 100644
}
template<typename T>
-@@ -77,7 +77,7 @@ std::pair<T*, size_t> CoreLocalArray<T>::AccessElementAndIndex() const {
+@@ -77,7 +77,7 @@ std::pair<T*, size_t> CoreLocalArray<T>:
template<typename T>
T* CoreLocalArray<T>::AccessAtCore(size_t core_idx) const {
@@ -61,6 +59,3 @@ index 806584d..7515c54 100644
return &data_[core_idx];
}
---
-2.7.4
-
diff --git a/debian/patches/0003-Core-local-statistics.patch b/debian/patches/0003-Core-local-statistics.patch
index 80ef9a2..4c2fd18 100644
--- a/debian/patches/0003-Core-local-statistics.patch
+++ b/debian/patches/0003-Core-local-statistics.patch
@@ -20,8 +20,6 @@ fbshipit-source-id: 7d4d165b4a91d8110f0409d113d1be91f22d31a9
util/core_local.h | 21 ++++----
4 files changed, 78 insertions(+), 187 deletions(-)
-diff --git a/src/rocksdb/HISTORY.md b/src/rocksdb/HISTORY.md
-index 7b51d37..4cde9e2 100644
--- a/src/rocksdb/HISTORY.md
+++ b/src/rocksdb/HISTORY.md
@@ -1,6 +1,10 @@
@@ -35,11 +33,9 @@ index 7b51d37..4cde9e2 100644
* DB::ResetStats() to reset internal stats.
* Statistics::Reset() to reset user stats.
* ldb add option --try_load_options, which will open DB with its own option file.
-diff --git a/src/rocksdb/monitoring/statistics.cc b/src/rocksdb/monitoring/statistics.cc
-index fb5634f..3a69a13 100644
--- a/src/rocksdb/monitoring/statistics.cc
+++ b/src/rocksdb/monitoring/statistics.cc
-@@ -21,13 +21,9 @@ std::shared_ptr<Statistics> CreateDBStatistics() {
+@@ -21,13 +21,9 @@ std::shared_ptr<Statistics> CreateDBStat
return std::make_shared<StatisticsImpl>(nullptr, false);
}
@@ -56,7 +52,7 @@ index fb5634f..3a69a13 100644
StatisticsImpl::~StatisticsImpl() {}
-@@ -41,79 +37,36 @@ uint64_t StatisticsImpl::getTickerCountLocked(uint32_t tickerType) const {
+@@ -41,79 +37,36 @@ uint64_t StatisticsImpl::getTickerCountL
enable_internal_stats_ ?
tickerType < INTERNAL_TICKER_ENUM_MAX :
tickerType < TICKER_ENUM_MAX);
@@ -150,7 +146,7 @@ index fb5634f..3a69a13 100644
}
void StatisticsImpl::setTickerCount(uint32_t tickerType, uint64_t count) {
-@@ -129,14 +82,12 @@ void StatisticsImpl::setTickerCount(uint32_t tickerType, uint64_t count) {
+@@ -129,14 +82,12 @@ void StatisticsImpl::setTickerCount(uint
void StatisticsImpl::setTickerCountLocked(uint32_t tickerType, uint64_t count) {
assert(enable_internal_stats_ ? tickerType < INTERNAL_TICKER_ENUM_MAX
: tickerType < TICKER_ENUM_MAX);
@@ -171,7 +167,7 @@ index fb5634f..3a69a13 100644
}
}
-@@ -146,16 +97,10 @@ uint64_t StatisticsImpl::getAndResetTickerCount(uint32_t tickerType) {
+@@ -146,16 +97,10 @@ uint64_t StatisticsImpl::getAndResetTick
MutexLock lock(&aggregate_lock_);
assert(enable_internal_stats_ ? tickerType < INTERNAL_TICKER_ENUM_MAX
: tickerType < TICKER_ENUM_MAX);
@@ -192,7 +188,7 @@ index fb5634f..3a69a13 100644
}
}
if (stats_ && tickerType < TICKER_ENUM_MAX) {
-@@ -169,10 +114,8 @@ void StatisticsImpl::recordTick(uint32_t tickerType, uint64_t count) {
+@@ -169,10 +114,8 @@ void StatisticsImpl::recordTick(uint32_t
enable_internal_stats_ ?
tickerType < INTERNAL_TICKER_ENUM_MAX :
tickerType < TICKER_ENUM_MAX);
@@ -205,7 +201,7 @@ index fb5634f..3a69a13 100644
if (stats_ && tickerType < TICKER_ENUM_MAX) {
stats_->recordTick(tickerType, count);
}
-@@ -183,9 +126,7 @@ void StatisticsImpl::measureTime(uint32_t histogramType, uint64_t value) {
+@@ -183,9 +126,7 @@ void StatisticsImpl::measureTime(uint32_
enable_internal_stats_ ?
histogramType < INTERNAL_HISTOGRAM_ENUM_MAX :
histogramType < HISTOGRAM_ENUM_MAX);
@@ -231,7 +227,7 @@ index fb5634f..3a69a13 100644
}
return Status::OK();
}
-@@ -229,7 +168,7 @@ std::string StatisticsImpl::ToString() const {
+@@ -229,7 +168,7 @@ std::string StatisticsImpl::ToString() c
if (h.first < HISTOGRAM_ENUM_MAX || enable_internal_stats_) {
char buffer[kTmpStrBufferSize];
HistogramData hData;
@@ -240,8 +236,6 @@ index fb5634f..3a69a13 100644
snprintf(
buffer, kTmpStrBufferSize,
"%s statistics Percentiles :=> 50 : %f 95 : %f 99 : %f 100 : %f\n",
-diff --git a/src/rocksdb/monitoring/statistics.h b/src/rocksdb/monitoring/statistics.h
-index 32b7036..96b31a3 100644
--- a/src/rocksdb/monitoring/statistics.h
+++ b/src/rocksdb/monitoring/statistics.h
@@ -13,8 +13,14 @@
@@ -260,7 +254,7 @@ index 32b7036..96b31a3 100644
namespace rocksdb {
-@@ -50,97 +56,38 @@ class StatisticsImpl : public Statistics {
+@@ -50,97 +56,38 @@ class StatisticsImpl : public Statistics
virtual bool HistEnabledForType(uint32_t type) const override;
private:
@@ -284,6 +278,18 @@ index 32b7036..96b31a3 100644
- ThreadTickerInfo(uint_fast64_t _value,
- std::atomic_uint_fast64_t* _merged_sum)
- : value(_value), merged_sum(_merged_sum) {}
+- };
+-
+- // Holds data maintained by each thread for implementing histograms.
+- struct ThreadHistogramInfo {
+- HistogramImpl value;
+- // During teardown, value will be merged into *merged_hist while holding
+- // *merge_lock, which also syncs with the merges necessary for reads.
+- HistogramImpl* merged_hist;
+- port::Mutex* merge_lock;
+-
+- ThreadHistogramInfo(HistogramImpl* _merged_hist, port::Mutex* _merge_lock)
+- : value(), merged_hist(_merged_hist), merge_lock(_merge_lock) {}
+ // The ticker/histogram data are stored in this structure, which we will store
+ // per-core. It is cache-aligned, so tickers/histograms belonging to different
+ // cores can never share the same cache line.
@@ -300,19 +306,6 @@ index 32b7036..96b31a3 100644
+ CACHE_LINE_SIZE] ROCKSDB_FIELD_UNUSED;
};
-- // Holds data maintained by each thread for implementing histograms.
-- struct ThreadHistogramInfo {
-- HistogramImpl value;
-- // During teardown, value will be merged into *merged_hist while holding
-- // *merge_lock, which also syncs with the merges necessary for reads.
-- HistogramImpl* merged_hist;
-- port::Mutex* merge_lock;
-+ static_assert(sizeof(StatisticsData) % 64 == 0, "Expected 64-byte aligned");
-
-- ThreadHistogramInfo(HistogramImpl* _merged_hist, port::Mutex* _merge_lock)
-- : value(), merged_hist(_merged_hist), merge_lock(_merge_lock) {}
-- };
--
- // Holds global data for implementing tickers.
- struct TickerInfo {
- TickerInfo()
@@ -331,7 +324,8 @@ index 32b7036..96b31a3 100644
- delete info_ptr;
- }
- };
--
++ static_assert(sizeof(StatisticsData) % 64 == 0, "Expected 64-byte aligned");
+
- // Holds global data for implementing histograms.
- struct HistogramInfo {
- HistogramInfo()
@@ -380,8 +374,6 @@ index 32b7036..96b31a3 100644
};
// Utility functions
-diff --git a/src/rocksdb/util/core_local.h b/src/rocksdb/util/core_local.h
-index 7515c54..4239df6 100644
--- a/src/rocksdb/util/core_local.h
+++ b/src/rocksdb/util/core_local.h
@@ -7,19 +7,20 @@
@@ -440,7 +432,7 @@ index 7515c54..4239df6 100644
std::pair<T*, size_t> CoreLocalArray<T>::AccessElementAndIndex() const {
int cpuid = port::PhysicalCoreID();
size_t core_idx;
-@@ -75,7 +76,7 @@ std::pair<T*, size_t> CoreLocalArray<T>::AccessElementAndIndex() const {
+@@ -75,7 +76,7 @@ std::pair<T*, size_t> CoreLocalArray<T>:
return {AccessAtCore(core_idx), core_idx};
}
@@ -449,6 +441,3 @@ index 7515c54..4239df6 100644
T* CoreLocalArray<T>::AccessAtCore(size_t core_idx) const {
assert(core_idx < static_cast<size_t>(1) << size_shift_);
return &data_[core_idx];
---
-2.7.4
-
diff --git a/debian/patches/TestMockImageReplayer-cleanup.patch b/debian/patches/TestMockImageReplayer-cleanup.patch
index 6cf404e..e013bd0 100644
--- a/debian/patches/TestMockImageReplayer-cleanup.patch
+++ b/debian/patches/TestMockImageReplayer-cleanup.patch
@@ -10,8 +10,6 @@ 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(-)
-diff --git a/src/test/rbd_mirror/test_mock_ImageReplayer.cc b/src/test/rbd_mirror/test_mock_ImageReplayer.cc
-index c845faacaf54..ce153a565bbd 100644
--- a/src/test/rbd_mirror/test_mock_ImageReplayer.cc
+++ b/src/test/rbd_mirror/test_mock_ImageReplayer.cc
@@ -61,22 +61,7 @@ namespace rbd {
@@ -38,7 +36,7 @@ index c845faacaf54..ce153a565bbd 100644
};
namespace image_replayer {
-@@ -263,7 +248,6 @@ ReplayStatusFormatter<librbd::MockTestImageCtx>* ReplayStatusFormatter<librbd::M
+@@ -263,7 +248,6 @@ ReplayStatusFormatter<librbd::MockTestIm
// template definitions
#include "tools/rbd_mirror/ImageReplayer.cc"
diff --git a/debian/patches/i386-build-fixes.patch b/debian/patches/i386-build-fixes.patch
index d90ad19..e895d6f 100644
--- a/debian/patches/i386-build-fixes.patch
+++ b/debian/patches/i386-build-fixes.patch
@@ -1,18 +1,90 @@
-Description: Misc fixes for i386 builds
- Scope misc SIMD flags to x86_64 only
- Scope crypto/isa-l based on yasm/x86_64
-Author: James Page <james.page at ubuntu.com>
+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
-@@ -91,6 +91,7 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i
- if(HAVE_INTEL_SSSE3)
- set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -mssse3")
- endif()
-+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64|x86_64|AMD64")
- CHECK_C_COMPILER_FLAG(-mpclmul HAVE_INTEL_PCLMUL)
- if(HAVE_INTEL_PCLMUL)
- set(SIMD_COMPILE_FLAGS "${SIMD_COMPILE_FLAGS} -mpclmul")
+@@ -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)
diff --git a/debian/patches/rgw-migrate-atomic_t-to-std_atomic.patch b/debian/patches/rgw-migrate-atomic_t-to-std_atomic.patch
index 23f2437..5d55b65 100644
--- a/debian/patches/rgw-migrate-atomic_t-to-std_atomic.patch
+++ b/debian/patches/rgw-migrate-atomic_t-to-std_atomic.patch
@@ -11,8 +11,6 @@ Signed-off-by: Jesse Williamson <jwilliamson at suse.de>
src/rgw/rgw_request.h | 4 ++--
4 files changed, 9 insertions(+), 11 deletions(-)
-diff --git a/src/rgw/rgw_loadgen_process.cc b/src/rgw/rgw_loadgen_process.cc
-index 23e6fefca73e..fef37f805bac 100644
--- a/src/rgw/rgw_loadgen_process.cc
+++ b/src/rgw/rgw_loadgen_process.cc
@@ -39,7 +39,7 @@ void RGWLoadGenProcess::run()
@@ -24,7 +22,7 @@ index 23e6fefca73e..fef37f805bac 100644
for (i = 0; i < num_buckets; i++) {
buckets[i] = "/loadgen";
-@@ -104,7 +104,7 @@ void RGWLoadGenProcess::run()
+@@ -104,7 +104,7 @@ done:
void RGWLoadGenProcess::gen_request(const string& method,
const string& resource,
@@ -33,8 +31,6 @@ index 23e6fefca73e..fef37f805bac 100644
{
RGWLoadGenRequest* req =
new RGWLoadGenRequest(store->get_new_req_id(), method, resource,
-diff --git a/src/rgw/rgw_object_expirer_core.h b/src/rgw/rgw_object_expirer_core.h
-index 6fe8d1410bff..813eca3f939a 100644
--- a/src/rgw/rgw_object_expirer_core.h
+++ b/src/rgw/rgw_object_expirer_core.h
@@ -4,11 +4,11 @@
@@ -62,11 +58,9 @@ index 6fe8d1410bff..813eca3f939a 100644
class RGWObjectExpirer {
protected:
RGWRados *store;
-diff --git a/src/rgw/rgw_process.h b/src/rgw/rgw_process.h
-index 005f2db6fef7..3aaeaff61afb 100644
--- a/src/rgw/rgw_process.h
+++ b/src/rgw/rgw_process.h
-@@ -184,7 +184,7 @@ class RGWLoadGenProcess : public RGWProcess {
+@@ -184,7 +184,7 @@ public:
void checkpoint();
void handle_request(RGWRequest* req) override;
void gen_request(const string& method, const string& resource,
@@ -75,11 +69,9 @@ index 005f2db6fef7..3aaeaff61afb 100644
void set_access_key(RGWAccessKey& key) { access_key = key; }
};
-diff --git a/src/rgw/rgw_request.h b/src/rgw/rgw_request.h
-index 3c835f7b1c94..11345bb0d230 100644
--- a/src/rgw/rgw_request.h
+++ b/src/rgw/rgw_request.h
-@@ -59,10 +59,10 @@ struct RGWLoadGenRequest : public RGWRequest {
+@@ -59,10 +59,10 @@ struct RGWLoadGenRequest : public RGWReq
string method;
string resource;
int content_length;
--
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