You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
80 lines
4.8 KiB
80 lines
4.8 KiB
diff -Naur ceph-13.2.6/work/ceph-13.2.6/src/CMakeLists.txt ceph-13.2.6-success/work/ceph-13.2.6/src/CMakeLists.txt
|
|
--- ceph-13.2.6/work/ceph-13.2.6/src/CMakeLists.txt 2019-06-03 17:18:57.000000000 +0200
|
|
+++ ceph-13.2.6-success/work/ceph-13.2.6/src/CMakeLists.txt 2019-07-14 18:46:05.524767854 +0200
|
|
@@ -24,6 +24,7 @@
|
|
add_definitions("-DCEPH_PKGLIBDIR=\"${CMAKE_INSTALL_FULL_PKGLIBDIR}\"")
|
|
add_definitions("-DHAVE_CONFIG_H -D__CEPH__ -D_REENTRANT -D_THREAD_SAFE -D__STDC_FORMAT_MACROS")
|
|
add_definitions("-D_FILE_OFFSET_BITS=64")
|
|
+add_definitions("-DBOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT")
|
|
if(LINUX)
|
|
add_definitions("-D_GNU_SOURCE")
|
|
endif()
|
|
diff -Naur ceph-13.2.6/work/ceph-13.2.6/src/common/ceph_context.h ceph-13.2.6-success/work/ceph-13.2.6/src/common/ceph_context.h
|
|
--- ceph-13.2.6/work/ceph-13.2.6/src/common/ceph_context.h 2019-06-03 17:18:57.000000000 +0200
|
|
+++ ceph-13.2.6-success/work/ceph-13.2.6/src/common/ceph_context.h 2019-07-14 08:58:01.950546863 +0200
|
|
@@ -144,7 +144,7 @@
|
|
void do_command(std::string_view command, const cmdmap_t& cmdmap,
|
|
std::string_view format, ceph::bufferlist *out);
|
|
|
|
- static constexpr std::size_t largest_singleton = sizeof(void*) * 72;
|
|
+ static constexpr std::size_t largest_singleton = sizeof(void*) * 144;
|
|
|
|
template<typename T, typename... Args>
|
|
T& lookup_or_create_singleton_object(std::string_view name,
|
|
diff -Naur ceph-13.2.6/work/ceph-13.2.6/src/mon/OSDMonitor.cc ceph-13.2.6-success/work/ceph-13.2.6/src/mon/OSDMonitor.cc
|
|
--- ceph-13.2.6/work/ceph-13.2.6/src/mon/OSDMonitor.cc 2019-06-03 17:18:57.000000000 +0200
|
|
+++ ceph-13.2.6-success/work/ceph-13.2.6/src/mon/OSDMonitor.cc 2019-07-14 15:00:30.032429503 +0200
|
|
@@ -821,7 +821,7 @@
|
|
<< " modified " << p->second.modified
|
|
<< " [" << p->second.start << "-" << p->second.end << ")"
|
|
<< dendl;
|
|
- int n = std::min(max - pending_creatings.pgs.size(),
|
|
+ int n = std::min((uint64_t)(max - pending_creatings.pgs.size()),
|
|
p->second.end - p->second.start);
|
|
ps_t first = p->second.start;
|
|
ps_t end = first + n;
|
|
diff -Naur ceph-13.2.6/work/ceph-13.2.6/src/os/bluestore/BlueStore.cc ceph-13.2.6-success/work/ceph-13.2.6/src/os/bluestore/BlueStore.cc
|
|
--- ceph-13.2.6/work/ceph-13.2.6/src/os/bluestore/BlueStore.cc 2019-06-03 17:18:57.000000000 +0200
|
|
+++ ceph-13.2.6-success/work/ceph-13.2.6/src/os/bluestore/BlueStore.cc 2019-07-15 06:08:24.938166321 +0200
|
|
@@ -12569,7 +12569,7 @@
|
|
if (e.second == 0) {
|
|
continue;
|
|
}
|
|
- size_t pos = max(e.first / granularity, prev_pos);
|
|
+ size_t pos = max(e.first / granularity, (long long unsigned int&)prev_pos);
|
|
size_t end_pos = 1 + (e.first + e.second - 1) / granularity;
|
|
while (pos != npos && pos < end_pos) {
|
|
ceph_assert( collections_bfs[pos].element_count() ==
|
|
diff -Naur ceph-13.2.6/work/ceph-13.2.6/src/osd/PrimaryLogPG.cc ceph-13.2.6-success/work/ceph-13.2.6/src/osd/PrimaryLogPG.cc
|
|
--- ceph-13.2.6/work/ceph-13.2.6/src/osd/PrimaryLogPG.cc 2019-06-03 17:18:57.000000000 +0200
|
|
+++ ceph-13.2.6-success/work/ceph-13.2.6/src/osd/PrimaryLogPG.cc 2019-07-14 16:24:48.346295044 +0200
|
|
@@ -1626,7 +1626,7 @@
|
|
if (limit != eversion_t() &&
|
|
limit != pg_trim_to &&
|
|
pg_log.get_log().approx_size() > target) {
|
|
- size_t num_to_trim = std::min(pg_log.get_log().approx_size() - target,
|
|
+ size_t num_to_trim = std::min((uint64_t)(pg_log.get_log().approx_size() - target),
|
|
cct->_conf->osd_pg_log_trim_max);
|
|
if (num_to_trim < cct->_conf->osd_pg_log_trim_min &&
|
|
cct->_conf->osd_pg_log_trim_max >= cct->_conf->osd_pg_log_trim_min) {
|
|
@@ -1672,7 +1672,7 @@
|
|
pg_log.get_log().approx_size() > target) {
|
|
dout(10) << __func__ << " approx pg log length = "
|
|
<< pg_log.get_log().approx_size() << dendl;
|
|
- size_t num_to_trim = std::min(pg_log.get_log().approx_size() - target,
|
|
+ size_t num_to_trim = std::min((uint64_t)(pg_log.get_log().approx_size() - target),
|
|
cct->_conf->osd_pg_log_trim_max);
|
|
dout(10) << __func__ << " num_to_trim = " << num_to_trim << dendl;
|
|
if (num_to_trim < cct->_conf->osd_pg_log_trim_min &&
|
|
diff -Naur ceph-13.2.6/work/ceph-13.2.6/src/rgw/rgw_sync_log_trim.cc ceph-13.2.6-success/work/ceph-13.2.6/src/rgw/rgw_sync_log_trim.cc
|
|
--- ceph-13.2.6/work/ceph-13.2.6/src/rgw/rgw_sync_log_trim.cc 2019-06-03 17:18:57.000000000 +0200
|
|
+++ ceph-13.2.6-success/work/ceph-13.2.6/src/rgw/rgw_sync_log_trim.cc 2019-07-15 16:34:38.795259035 +0200
|
|
@@ -351,7 +351,7 @@
|
|
status->clear();
|
|
// The initialisation below is required to silence a false positive
|
|
// -Wmaybe-uninitialized warning
|
|
- boost::optional<size_t> num_shards = boost::make_optional(false, 0UL);
|
|
+ boost::optional<size_t> num_shards = boost::make_optional(false, 0U);
|
|
for (auto peer = first; peer != last; ++peer) {
|
|
const size_t peer_shards = peer->size();
|
|
if (!num_shards) {
|