]> git.apps.os.sepia.ceph.com Git - ceph.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>
Wed, 1 Nov 2017 23:03:23 +0000 (23:03 +0000)
commit2fea47d9710ec1e388db044065bc42b8046dae22
treeabcd16e29b171a8a804ed02b7f63e661ba6175af
parent951d67fc9fee23f3f8f7d7df8fbfb8c29e60f82f
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>
(cherry picked from commit dc415f1ae09a308bd448614934a4c168eb9cf07b)
src/mgr/DaemonState.cc
src/mgr/DaemonState.h
src/mgr/MgrSession.h
src/mgr/PyModules.cc