]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #25792 into master
authorSage Weil <sage@redhat.com>
Thu, 10 Jan 2019 22:50:38 +0000 (16:50 -0600)
committerSage Weil <sage@redhat.com>
Thu, 10 Jan 2019 22:50:38 +0000 (16:50 -0600)
* refs/pull/25792/head:
common/numa: remove unused _mask variants
osd: support osd_numa_node, osd_numa_auto_affinity, osd_numa_prefer_iface
mon/OSDMonitor: add 'osd numa-status' command
osd: report numa node for network interface(s)
common/pick_address: get numa node info for a interface
os/bluestore: report numa node info for storage
os/bluestore/KernelDevice: report numa info for each device
os/bluestore: allow get_devices() to run without bluestore started
common/blkdev: query numa info
common/numa: cpu_set helpers and numa helpers
common/blkdev: drop debug statements

Reviewed-by: Mark Nelson <mnelson@redhat.com>
1  2 
src/common/blkdev.cc
src/common/options.cc
src/mon/MonCommands.h
src/mon/OSDMonitor.cc
src/os/bluestore/BlueStore.cc
src/os/bluestore/BlueStore.h
src/osd/OSD.cc

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