]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #26856 into master
authorSage Weil <sage@redhat.com>
Mon, 11 Mar 2019 20:01:15 +0000 (15:01 -0500)
committerSage Weil <sage@redhat.com>
Mon, 11 Mar 2019 20:01:15 +0000 (15:01 -0500)
* refs/pull/26856/head:
os/bluestore: make osd_memory_limit default to .8x the cgroup limit
os/bluestore: observe osd_memory_target config options
common/config: set osd_memory_target based on POD_MEMORY_REQUEST
common/util: include group limit in daemon metadata
common/util: get_cgroup_memory_limit() helper
common/config: pass entity_type down into parse_env()

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Sébastien Han <seb@redhat.com>
1  2 
src/os/bluestore/BlueStore.cc

Simple merge