RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-25 11:48:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #34167 from javacruft/32bit-fixes-march

Browse Source 
mds: resolve type mismatches on 32 bit archs

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
This commit is contained in:
Gregory Farnum 2020-03-30 23:54:30 -07:00 committed by GitHub
commit 2d62a20112
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/mds/PurgeQueue.cc
View File

@ -501,7 +501,8 @@ void PurgeQueue::_execute_item(
in_flight[expire_to] = item;
logger->set(l_pq_executing, in_flight.size());
files_high_water = std::max(files_high_water, in_flight.size());
files_high_water = std::max(files_high_water,
static_cast<uint64_t>(in_flight.size()));
logger->set(l_pq_executing_high_water, files_high_water);
auto ops = _calculate_ops(item);
ops_in_flight += ops;
@ -579,7 +580,8 @@ void PurgeQueue::_execute_item(
logger->set(l_pq_executing_ops_high_water, ops_high_water);
in_flight.erase(expire_to);
logger->set(l_pq_executing, in_flight.size());
files_high_water = std::max(files_high_water, in_flight.size());
files_high_water = std::max(files_high_water,
static_cast<uint64_t>(in_flight.size()));
logger->set(l_pq_executing_high_water, files_high_water);
return;
}
@ -651,7 +653,8 @@ void PurgeQueue::_execute_item_complete(
in_flight.erase(iter);
logger->set(l_pq_executing, in_flight.size());
files_high_water = std::max(files_high_water, in_flight.size());
files_high_water = std::max(files_high_water,
static_cast<uint64_t>(in_flight.size()));
logger->set(l_pq_executing_high_water, files_high_water);
dout(10) << "in_flight.size() now " << in_flight.size() << dendl;