pybind/mgr/balancer: fix pool-deletion vs auto-optimization race #20706
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
xiexingguo
force-pushed
the
wip-balancer-03
branch
from
eefd365
to
861cbee
Compare
xiexingguo
changed the title
jcsp
reviewed
Mar 5, 2018
src/pybind/mgr/balancer/module.py
Outdated
| self.poolids = [p['pool'] for p in self.osdmap_dump.get('pools', [])] | ||
| osd_poolids = [p['pool'] for p in self.osdmap_dump.get('pools', [])] | ||
| pg_poolids = [p['poolid'] for p in pg_dump.get('pool_stats', [])] | ||
| self.poolids = [p for p in osd_poolids if p in pg_poolids] |
There was a problem hiding this comment.
Would be a bit neater (and perhaps more efficient) to do a set(osd_poolids) & set(pg_poolids)
There was a problem hiding this comment.
This is still a work-in-progress and I have some other bugs to hunt 😂
Will fix in next version \o/
This patch fixes the error below:
```
File "/usr/lib/ceph/mgr/balancer/module.py", line 722, in optimize
return self.do_crush_compat(plan)
File "/usr/lib/ceph/mgr/balancer/module.py", line 781, in do_crush_compat
pe = self.calc_eval(ms, plan.pools)
File "/usr/lib/ceph/mgr/balancer/module.py", line 570, in calc_eval
objects_by_osd[osd] += ms.pg_stat[pgid]['num_objects']
KeyError: ('5.1b',)
```
The root cause is that balancer is basically collecting cluster
information from two separate maps (OSDMap and PGMap), and hence
there is a small window/chance that the pool statistics might
become divergent. E.g.:
1) auto-optimization begin
2) get osdmap
3) a pool is gone (deleted by admin); pg_dump refreshed
4) get pg_dump (balancer is now with both the newest pg_dump
and an obsolute osdmap in hand)
5) execute optimization; balancer complains some PGs are missing
in the pg_dump map..
Fix the above problem by tracing pools existing in both maps only.
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
xiexingguo
force-pushed
the
wip-balancer-03
branch
from
861cbee
to
a57b803
Compare
xiexingguo
changed the title
|
@liewegas I hit another balancer issue. Mind taking a look at this one too? Thanks! |
liewegas
approved these changes
Mar 7, 2018
|
|
Thanks @tchaikov ! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This patch fixes the error below:
The root cause is that balancer is basically collecting cluster
information from two separate maps (OSDMap and PGMap), and hence
there is a small window/chance that the pool statistics might
become divergent. E.g.:
and an obsolute osdmap in hand)
in the pg_dump map..
Fix the above problem by tracing pools existing in both maps only.
Signed-off-by: xie xingguo xie.xingguo@zte.com.cn