]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
os/bluestore: do not set osd_memory_target default from cgroup limit 29745/head
authorSage Weil <sage@redhat.com>
Fri, 9 Aug 2019 17:25:59 +0000 (12:25 -0500)
committerSage Weil <sage@redhat.com>
Mon, 19 Aug 2019 17:08:11 +0000 (12:08 -0500)
commit6fbf23ecf10d9e61a9895d54616aca9bfd23517d
tree92c582e752c79bf9bf6ca511d98129031377f47d
parentb28c939e4a2cf0ef5101dd7dfc04100ebabf9b7c
os/bluestore: do not set osd_memory_target default from cgroup limit

On the aarch64 box I'm testing, this gives us a value of
7378697629483768832, which is not what we want.

I think we are better off relying on this limit being explicitly set via
environment variables (POD_* by kuberentes/rook) or via the command line.

This partially reverts 5c6b533697814af8acfd9e731a2599b2294687ef, but not
all of it, since we wan to keep the option itself, as it is now used by
common/config.cc when dealing with the POD_MEMORY_LIMIT env var.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 9346d3c3bcde7d0a68e21a554eb7fc836df78ba9)
src/os/bluestore/BlueStore.cc