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.
45 lines
2.5 KiB
45 lines
2.5 KiB
diff -Naur ceph-13.2.5-orig/src/mon/OSDMonitor.cc ceph-13.2.5/src/mon/OSDMonitor.cc
|
|
--- ceph-13.2.5-orig/src/mon/OSDMonitor.cc 2019-03-12 17:48:03.000000000 +0100
|
|
+++ ceph-13.2.5/src/mon/OSDMonitor.cc 2019-04-18 22:46:05.000000000 +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.5-orig/src/os/bluestore/BlueStore.cc ceph-13.2.5/src/os/bluestore/BlueStore.cc
|
|
--- ceph-13.2.5-orig/src/os/bluestore/BlueStore.cc 2019-03-12 17:48:03.000000000 +0100
|
|
+++ ceph-13.2.5/src/os/bluestore/BlueStore.cc 2019-04-18 22:44:28.000000000 +0200
|
|
@@ -12577,7 +12577,7 @@
|
|
if (e.second == 0) {
|
|
continue;
|
|
}
|
|
- size_t pos = max(e.first / granularity, prev_pos);
|
|
+ size_t pos = max<uint64_t>(e.first / granularity, 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.5-orig/src/osd/PrimaryLogPG.cc ceph-13.2.5/src/osd/PrimaryLogPG.cc
|
|
--- ceph-13.2.5-orig/src/osd/PrimaryLogPG.cc 2019-03-12 17:48:03.000000000 +0100
|
|
+++ ceph-13.2.5/src/osd/PrimaryLogPG.cc 2019-04-18 22:46:05.000000000 +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 &&
|