git-server-git.apps.pok.os.sepia.ceph.com Git

]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit

author	Neha Ojha <nojha@redhat.com>
	Tue, 18 Dec 2018 00:20:10 +0000 (16:20 -0800)
committer	Neha Ojha <nojha@redhat.com>
	Fri, 18 Jan 2019 19:06:13 +0000 (14:06 -0500)
commit	67dd60cedbecdff0f8c42e764a53b6b16405d9c0
tree	5926988ac9fc2cd8d45cb56ca51e58e93a55ca13	tree \| snapshot
parent	115fafdf15af4550fcafa703dd3f81c29297d3f5	commit \| diff

osd/mon: fix upgrades for pg log hard limit

Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 6ceeab6e204286148a69eb147fbc4045beddef49)

Conflicts:
src/include/rados.h
src/mon/MonCommands.h
src/mon/OSDMonitor.cc
src/osd/OSDMap.cc
          Luminous does not have CEPH_OSDMAP_NOSNAPTRIM flag.
          In nautilus, CEPH_OSDMAP_PGLOG_HARDLIMIT is set by default,
          which is not the case in luminous.

src/include/rados.h		diff \| blob \| history
src/mon/MonCommands.h		diff \| blob \| history
src/mon/OSDMonitor.cc		diff \| blob \| history
src/osd/OSDMap.cc		diff \| blob \| history
src/osd/PG.h		diff \| blob \| history
src/osd/PrimaryLogPG.cc		diff \| blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom