Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

nautilus: mon/PGMap: fix summary display of >32bit pg states #33275

Merged
merged 3 commits into from
Mar 20, 2020
Merged

nautilus: mon/PGMap: fix summary display of >32bit pg states #33275

merged 3 commits into from
Mar 20, 2020

Conversation

smithfarm
Copy link
Contributor

backport tracker: https://tracker.ceph.com/issues/44081

backport of #33137
parent tracker: https://tracker.ceph.com/issues/44052

this backport was staged using ceph-backport.sh version 15.1.0.437
find the latest version at https://github.com/ceph/ceph/blob/master/src/script/ceph-backport.sh

@smithfarm smithfarm added this to the nautilus milestone Feb 13, 2020
@smithfarm smithfarm added the core label Feb 13, 2020
@smithfarm
Copy link
Contributor Author 

In file included from /usr/include/c++/9/bits/stl_algobase.h:67,
                 from /usr/include/c++/9/bits/char_traits.h:39,
                 from /usr/include/c++/9/string:40,
                 from /opt/ceph/include/boost/algorithm/string/std/string_traits.hpp:15,
                 from /opt/ceph/include/boost/algorithm/string/std_containers_traits.hpp:19,
                 from /opt/ceph/include/boost/algorithm/string.hpp:18,
                 from /home/jenkins-build/build/workspace/ceph-pull-requests/src/mon/PGMap.cc:4:
/usr/include/c++/9/bits/stl_iterator.h: In instantiation of 'constexpr std::reverse_iterator<_Iterator>::reverse_iterator(const std::reverse_iterator<_Iter>&) [with _Iter = std::_Rb_tree_iterator<std::pair<const int, long unsigned int> >; _Iterator = std::_Rb_tree_iterator<std::pair<const int, int> >]':
/home/jenkins-build/build/workspace/ceph-pull-requests/src/mon/PGMap.cc:289:72:   required from here
/usr/include/c++/9/bits/stl_iterator.h:157:22: error: no matching function for call to 'std::_Rb_tree_iterator<std::pair<const int, int> >::_Rb_tree_iterator(std::reverse_iterator<std::_Rb_tree_iterator<std::pair<const int, long unsigned int> > >::iterator_type)'
  157 |  : current(__x.base()) { }
      |                      ^

adamemerson and others added 3 commits February 14, 2020 13:43
@adamemerson @tchaikov
mon: Update PGMap to work without using namespace
b5d9e5d 
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit b1ea0df)

Conflicts:
	src/mon/PGMap.cc
	src/mon/PGMap.h: trivial resolutions
@liewegas @tchaikov
mon/PGMap: fix compat encoding of num_pg_by_state
153a4e6 
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit b9359d0)
@liewegas @tchaikov
mon/PGMap: fix digest summary of PGs by state
b22a9ac 
This fixes the PG state summary seen in 'ceph -s' to reflect PG state bits
beyond 32 bits.

Fixes: https://tracker.ceph.com/issues/44052
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 1453154)

Conflicts:
	src/mon/PGMap.cc
- nautilus has "multimap" where master has "std::multimap"
@tchaikov
Copy link
Contributor

@smithfarm i also cherry-picked b1ea0df in hope to address the FTBFS.

@smithfarm smithfarm added the nautilus-batch-1 nautilus point releases label Feb 18, 2020
@yuriw
Copy link
Contributor

yuriw commented Mar 19, 2020

wip-yuri7-testing-2020-03-19-1610-nautilus

@yuriw yuriw merged commit 88011de into ceph:nautilus Mar 20, 2020
@smithfarm smithfarm deleted the wip-44081-nautilus branch March 25, 2020 23:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tchaikov tchaikov tchaikov approved these changes

@Yan-waller Yan-waller Awaiting requested review from Yan-waller

Assignees
No one assigned
Labels
core nautilus-batch-1 nautilus point releases needs-qa wip-yuri7-testing
Projects
None yet
Milestone
nautilus
Development

Successfully merging this pull request may close these issues.
5 participants
@smithfarm @tchaikov @yuriw @adamemerson @liewegas