]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #21968 from ceph/backport-21605
authorYuri Weinstein <yweinste@redhat.com>
Fri, 8 Jun 2018 14:34:13 +0000 (07:34 -0700)
committerGitHub <noreply@github.com>
Fri, 8 Jun 2018 14:34:13 +0000 (07:34 -0700)
luminous: mon: High MON cpu usage when cluster is changing

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/mon/OSDMonitor.cc
src/osd/OSD.cc
src/osd/OSDMap.cc
src/osd/osd_types.cc

Simple merge
diff --cc src/osd/OSD.cc
Simple merge
Simple merge
Simple merge