]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
mgr: store declared_types in MgrSession
authorJohn Spray <john.spray@redhat.com>
Sat, 23 Sep 2017 15:55:55 +0000 (11:55 -0400)
committerJohn Spray <john.spray@redhat.com>
Sat, 23 Sep 2017 17:10:29 +0000 (13:10 -0400)
commitdc415f1ae09a308bd448614934a4c168eb9cf07b
tree6f175d86d951a3fd529abc60fa0987c54043b2db
parentdc23bade5e4ceccbb49fb513c271ed905058f40f
mgr: store declared_types in MgrSession

Because we don't (yet) properly prevent multiple sessions
from daemons reporting the same name (e.g. rgws), storing
it in the DaemonPerfCounters meant that one daemon's report
was referring to another daemon's set of reported types.

This should always have been a property of the session.

The behaviour will still be ugly when multiple daemons
are using the same name (stomping on each other's stats/statsu)
but it shouldn't crash.

Fixes: http://tracker.ceph.com/issues/21197
Signed-off-by: John Spray <john.spray@redhat.com>
src/mgr/DaemonState.cc
src/mgr/DaemonState.h
src/mgr/MgrSession.h
src/mgr/PyModules.cc