From 2924236945c17b180d26968f30acebc72e1cfd43 Mon Sep 17 00:00:00 2001 From: Duncan Bellamy Date: Sat, 8 May 2021 11:52:35 +0100 Subject: [PATCH] mds: PurgeQueue.cc fix for 32bit compilation files_high_water is defined as uint64_t but when compiling on 32bit these max functions fail as they are both not considered uint64_t by gcc 10 even though they are files_high_water = std::max(files_high_water, static_cast(in_flight.size())); Fixes: https://tracker.ceph.com/issues/50707 Signed-off-by: Duncan Bellamy (cherry picked from commit 0b7f69252c7701f70d38cc6221d393cbd5a507a4) Conflicts: src/mds/PurgeQueue.cc Cherry-pick notes: - Octopus did not previously have static_cast to uint64 --- src/mds/PurgeQueue.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/mds/PurgeQueue.cc b/src/mds/PurgeQueue.cc index c47a43ec4a1..c13a61f856d 100644 --- a/src/mds/PurgeQueue.cc +++ b/src/mds/PurgeQueue.cc @@ -503,7 +503,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, + in_flight.size()); logger->set(l_pq_executing_high_water, files_high_water); auto ops = _calculate_ops(item); ops_in_flight += ops; @@ -581,7 +582,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, + in_flight.size()); logger->set(l_pq_executing_high_water, files_high_water); return; } @@ -659,7 +661,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, + in_flight.size()); logger->set(l_pq_executing_high_water, files_high_water); dout(10) << "in_flight.size() now " << in_flight.size() << dendl; -- 2.47.3