]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
mon/OSDMonitor: limit MOSDMap message size by bytes 28640/head
authorSage Weil <sage@redhat.com>
Fri, 8 Feb 2019 13:22:28 +0000 (07:22 -0600)
committerKefu Chai <kchai@redhat.com>
Wed, 19 Jun 2019 03:51:05 +0000 (11:51 +0800)
commit5bd7cb5fe975b5b87c14b997e6e8dd61a1fa9fbb
treecca9862559ced2b5600226acc6dd33f616cb03c7
parent09a3cf5e0f933fe5854ea97f10a50d1118d3751d
mon/OSDMonitor: limit MOSDMap message size by bytes

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit dcf1cd00cc6e2595c283b4a73a4de9df50e7330a)

Conflicts:
src/mon/OSDMonitor.cc:
1. replace g_conf() with g_conf, g_conf was replaced
with g_conf() to prepare for the crimson project. and that change was
not backported to luminous. so restore all `g_conf()` to `g_conf` in
this backport.
2. replace std::min() and std::max() with MIN() and
MAX() macros, as we modernize it in an unrelated change. and that
change was not backported to luminous. so let's be conservative, and
restore to the old style macros.
src/mon/OSDMonitor.cc