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.

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

Balancer fixes without all of the calc_pg_upmaps() rewrites #31774

Merged
merged 11 commits into from Dec 2, 2019

Conversation

dzafman
Copy link
Contributor

@dzafman dzafman commented Nov 20, 2019

Checklist

  • References tracker ticket
  • Updates documentation if necessary
  • Includes tests for new functionality or reproducer for bug

Show available Jenkins commands
  • jenkins retest this please
  • jenkins test crimson perf
  • jenkins test signed
  • jenkins test make check
  • jenkins test make check arm64
  • jenkins test submodules
  • jenkins test dashboard
  • jenkins test dashboard backend
  • jenkins test docs
  • jenkins render docs
  • jenkins test ceph-volume all
  • jenkins test ceph-volume tox

Copy link
Member

@jdurgin jdurgin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these all look fine. you could also add the check for variance for bailing out early, that's a pretty small change too

@dzafman dzafman force-pushed the wip-balancer3 branch 4 times, most recently from 84f68a7 to 69754f6 Compare November 27, 2019 22:30
Signed-off-by: David Zafman <dzafman@redhat.com>
Signed-off-by: David Zafman <dzafman@redhat.com>
Signed-off-by: David Zafman <dzafman@redhat.com>
This is the backportable commit that works with older balancer module.py

Signed-off-by: David Zafman <dzafman@redhat.com>
This can be backported only to nautilus

Signed-off-by: David Zafman <dzafman@redhat.com>
…tion

Signed-off-by: David Zafman <dzafman@redhat.com>
Signed-off-by: David Zafman <dzafman@redhat.com>
Use more_underfull for finding remaps for overfull OSDs

Signed-off-by: David Zafman <dzafman@redhat.com>
Signed-off-by: David Zafman <dzafman@redhat.com>
Other test fixes to reflect changes

Signed-off-by: David Zafman <dzafman@redhat.com>
@tchaikov tchaikov merged commit 2287568 into ceph:master Dec 2, 2019
@tchaikov
Copy link
Contributor

tchaikov commented Dec 2, 2019

@dzafman @jdurgin shall we backport some of these commits to nautilus (and mimic)?

@wjwithagen
Copy link
Contributor

@tchaikov @dzafman @jdurgin
build on FreeBSD/Clang/stdlic++ complains.

from:
https://en.cppreference.com/w/cpp/algorithm/random_shuffle
template< class RandomIt > void random_shuffle( RandomIt first, RandomIt last ); | (1) | (deprecated in C++14) (removed in C++17)

/home/jenkins/workspace/ceph-master/src/tools/osdmaptool.cc:437:5: error: use of undeclared identifier 'random_shuffle'
    random_shuffle (rules.begin(), rules.end());
    ^
1 error generated.
gmake[2]: *** [src/tools/CMakeFiles/osdmaptool.dir/build.make:63: src/tools/CMakeFiles/osdmaptool.dir/osdmaptool.cc.o] Error 1
gmake[2]: Leaving directory '/home/jenkins/workspace/ceph-master/build'
gmake[1]: *** [CMakeFiles/Makefile2:5960: src/tools/CMakeFiles/osdmaptool.dir/all] Error 2

@wjwithagen
Copy link
Contributor

@tchaikov @dzafman @jdurgin
Fix for this is in: #31935

@dzafman
Copy link
Contributor Author

dzafman commented Dec 2, 2019

@tchaikov @jdurgin I wasn't expecting this to be merged yet.

@tchaikov
Copy link
Contributor

tchaikov commented Dec 2, 2019

@dzafman sorry for jumping the gun! anything missing or anything i can do to fix anything?

dzafman added a commit to dzafman/ceph that referenced this pull request Dec 2, 2019
Signed-off-by: David Zafman <dzafman@redhat.com>
@dzafman dzafman deleted the wip-balancer3 branch December 5, 2019 05:51
dzafman added a commit to dzafman/ceph that referenced this pull request Dec 5, 2019
Follow on to ceph#31774

Signed-off-by: David Zafman <dzafman@redhat.com>
dzafman added a commit to dzafman/ceph that referenced this pull request Dec 9, 2019
Follow on to ceph#31774

Signed-off-by: David Zafman <dzafman@redhat.com>
dzafman added a commit to dzafman/ceph that referenced this pull request Dec 10, 2019
Follow on to ceph#31774

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 65d03ba)
dzafman added a commit to dzafman/ceph that referenced this pull request Dec 10, 2019
Follow on to ceph#31774

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 65d03ba)
dzafman added a commit to dzafman/ceph that referenced this pull request Dec 10, 2019
Follow on to ceph#31774

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 65d03ba)
dzafman added a commit to dzafman/ceph that referenced this pull request Dec 10, 2019
Follow on to ceph#31774

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 65d03ba)
ronen-fr pushed a commit to ronen-fr/ceph that referenced this pull request Dec 29, 2019
Follow on to ceph#31774

Signed-off-by: David Zafman <dzafman@redhat.com>
dzafman added a commit to dzafman/ceph that referenced this pull request Jan 9, 2020
Follow on to ceph#31774

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 65d03ba)
dzafman added a commit to dzafman/ceph that referenced this pull request Jan 15, 2020
Follow on to ceph#31774

Fix incorrect version number for Nautilus

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 65d03ba)
tchaikov pushed a commit to ceph/ceph-ci that referenced this pull request Jun 14, 2020
Follow on to ceph/ceph#31774

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 65d03ba)
(cherry picked from commit b696b94)

Resolves: rhbz#1761839
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants