mgr: dashboard code cleanup #15577
mgr: dashboard code cleanup #15577
Conversation
jcsp
force-pushed
the
wip-dashboard-cleanup
branch
from
e9fae12
to
2940471
Compare
| // into "1.2.3-g9asdasd" | ||
| return /ceph version (.+) \(.+\)$/.exec(version)[1]; | ||
| // Expect "ceph version 1.2.3-g9asdasd (as98d7a0s8d7)" | ||
| result = /ceph version (.+) \(.+\)/.exec(version); |
There was a problem hiding this comment.
Nit: you should use /ceph version ([^ ]+) \(.+\)/
There was a problem hiding this comment.
can we make a structured ceph version thing? i was considering changing the format of this string a couple weeks ago and didn't out of fear of things like this. but we have 2 new fields added at the end now (release name, e.g. 'luminous') and release type ('dev', 'rc', 'stable').
There was a problem hiding this comment.
(that can come later, doesn't need to hold up this pr)
There was a problem hiding this comment.
The places we pass it around (e.g. daemon metadata) we only have a string.
We could improve the format of the string though -- prefixing with "ceph version" seems redundant. Once that's removed we could guide people to take everything up to the first space as the short version and treat everything else as detail, perhaps.
@dillaman regex updated
src/pybind/mgr/dashboard/module.py
Outdated
| @@ -577,6 +577,9 @@ def servers(self): | |||
| ) | |||
|
|
|||
| def _servers(self): | |||
| log.info("Listing servers...") | |||
...so that classes that need one aren't creating their own all the time. Signed-off-by: John Spray <john.spray@redhat.com>
Signed-off-by: John Spray <john.spray@redhat.com>
Signed-off-by: John Spray <john.spray@redhat.com>
This was a hangover from when these wrapper classes were borrowed from Calamari, which used these versions/equality functions to work out when to go fetch data from the ceph cluster. Signed-off-by: John Spray <john.spray@redhat.com>
jcsp
force-pushed
the
wip-dashboard-cleanup
branch
from
2940471
to
b48011d
Compare
No description provided.