]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Revert "ceph_osd: remove client message cap limit" 35738/head
authorJosh Durgin <jdurgin@redhat.com>
Sat, 25 Jan 2020 00:36:56 +0000 (19:36 -0500)
committerNeha Ojha <nojha@redhat.com>
Wed, 24 Jun 2020 01:33:19 +0000 (01:33 +0000)
commit0d62fe99caba0a224cd84147b62d15789733f26d
tree3e432410029cddd41dff562d42d138710cb4dbb0
parenteabb01366894d9cc2c577af687ca3fad634d2eea
Revert "ceph_osd: remove client message cap limit"

This reverts commit 45d5ac3ea040d6a7213b63d1c582e3a1bbaae8d4.

Without a msg throttler, we can't change osd_client_message_cap cap.
The throttler is designed to work with 0 as a max, so change the
default to 0 to disable it by default instead.

This doesn't affect the default behavior, it only lets us use this
option again.

Fixes: https://tracker.ceph.com/issues/46143
Conflicts:
src/ceph_osd.cc - new style of gconf() access

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit 9087e3b751a78211011b39377394ceb297078f76)
src/ceph_osd.cc
src/common/options.cc