Project

General

Profile

Bug #24606 ยป fix-build-32-bit.patch

Alexey Shabalin, 09/12/2018 04:50 PM

View differences:

src/common/ceph_context.h
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*) * 128;
template<typename T, typename... Args>
T& lookup_or_create_singleton_object(std::string_view name,
src/mon/OSDMonitor.cc
<< " modified " << p->second.modified
<< " [" << p->second.start << "-" << p->second.end << ")"
<< dendl;
int n = std::min(max - pending_creatings.pgs.size(),
int n = std::min<int64_t>(max - pending_creatings.pgs.size(),
p->second.end - p->second.start);
ps_t first = p->second.start;
ps_t end = first + n;
src/os/bluestore/BlueStore.cc
if (e.second == 0) {
continue;
}
size_t pos = max(e.first / granularity, prev_pos);
size_t pos = max<size_t>(e.first / granularity, prev_pos);
size_t end_pos = 1 + (e.first + e.second - 1) / granularity;
while (pos != npos && pos < end_pos) {
assert( collections_bfs[pos].element_count() ==
src/osd/PrimaryLogPG.cc
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<size_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) {
src/rgw/rgw_op.h
* as ObjectStore::get_max_attr_name_length() can set the limit even
* lower than the "osd_max_attr_name_len" configurable. */
const size_t max_attr_name_len = \
cct->_conf->get_val<size_t>("rgw_max_attr_name_len");
cct->_conf->get_val<Option::size_t>("rgw_max_attr_name_len");
if (max_attr_name_len && attr_name.length() > max_attr_name_len) {
return -ENAMETOOLONG;
}
......
/* Swift allows administrators to limit the number of metadats items
* send _in a single request_. */
const auto rgw_max_attrs_num_in_req = \
cct->_conf->get_val<size_t>("rgw_max_attrs_num_in_req");
cct->_conf->get_val<Option::size_t>("rgw_max_attrs_num_in_req");
if (rgw_max_attrs_num_in_req &&
++valid_meta_count > rgw_max_attrs_num_in_req) {
return -E2BIG;
src/rgw/rgw_rest_swift.cc
} else if (op_ret == -E2BIG) {
const auto error_message = boost::str(
boost::format("Too many metadata items; max %lld")
% s->cct->_conf->get_val<size_t>("rgw_max_attrs_num_in_req"));
% s->cct->_conf->get_val<Option::size_t>("rgw_max_attrs_num_in_req"));
set_req_state_err(s, EINVAL, error_message);
return -EINVAL;
}
......
formatter.dump_string("version", ceph_version);
const size_t max_attr_name_len = \
g_conf->get_val<size_t>("rgw_max_attr_name_len");
g_conf->get_val<Option::size_t>("rgw_max_attr_name_len");
if (max_attr_name_len) {
const size_t meta_name_limit = \
max_attr_name_len - strlen(RGW_ATTR_PREFIX RGW_AMZ_META_PREFIX);
......
}
const size_t meta_num_limit = \
g_conf->get_val<size_t>("rgw_max_attrs_num_in_req");
g_conf->get_val<Option::size_t>("rgw_max_attrs_num_in_req");
if (meta_num_limit) {
formatter.dump_int("max_meta_count", meta_num_limit);
}
src/rgw/rgw_sync_log_trim.cc
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::none;
for (auto peer = first; peer != last; ++peer) {
const size_t peer_shards = peer->size();
if (!num_shards) {
if (num_shards == boost::none) {
num_shards = peer_shards;
status->resize(*num_shards);
} else if (*num_shards != peer_shards) {
    (1-1/1)