From 13e6270b367b6e7d721a20450a941a80c8f8257c Mon Sep 17 00:00:00 2001 From: Orlando Moreno Date: Thu, 19 Oct 2017 11:34:21 -0700 Subject: [PATCH 1/2] Add to sed command to filter for NVMe devices --- cluster/ceph.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/ceph.py b/cluster/ceph.py index 9e988224..470184b8 100644 --- a/cluster/ceph.py +++ b/cluster/ceph.py @@ -463,7 +463,7 @@ def dump_historic_ops(self, run_dir): common.pdsh(settings.getnodes('osds'), 'find "/var/run/ceph/ceph-osd*.asok" -maxdepth 1 -exec sudo %s --admin-daemon {} dump_historic_ops \; > %s/historic_ops.out' % (self.ceph_cmd, run_dir)).communicate() def set_osd_param(self, param, value): - common.pdsh(settings.getnodes('osds'), 'find /dev/disk/by-partlabel/osd-device-*data -exec readlink {} \; | cut -d"/" -f 3 | sed "s/[0-9]$//" | xargs -I{} sudo sh -c "echo %s > /sys/block/\'{}\'/queue/%s"' % (value, param)) + common.pdsh(settings.getnodes('osds'), 'find /dev/disk/by-partlabel/osd-device-*data -exec readlink {} \; | cut -d"/" -f 3 | sed "s/[0-9]$//;s/p[0-9]*//" | xargs -I{} sudo sh -c "echo %s > /sys/block/\'{}\'/queue/%s"' % (value, param)) def __str__(self): From dee02e0ac370aace85329f62376f3a124fc78a04 Mon Sep 17 00:00:00 2001 From: Orlando Moreno Date: Thu, 19 Oct 2017 11:39:28 -0700 Subject: [PATCH 2/2] Add bluestore block to find command --- cluster/ceph.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/ceph.py b/cluster/ceph.py index 470184b8..671b0482 100644 --- a/cluster/ceph.py +++ b/cluster/ceph.py @@ -463,7 +463,7 @@ def dump_historic_ops(self, run_dir): common.pdsh(settings.getnodes('osds'), 'find "/var/run/ceph/ceph-osd*.asok" -maxdepth 1 -exec sudo %s --admin-daemon {} dump_historic_ops \; > %s/historic_ops.out' % (self.ceph_cmd, run_dir)).communicate() def set_osd_param(self, param, value): - common.pdsh(settings.getnodes('osds'), 'find /dev/disk/by-partlabel/osd-device-*data -exec readlink {} \; | cut -d"/" -f 3 | sed "s/[0-9]$//;s/p[0-9]*//" | xargs -I{} sudo sh -c "echo %s > /sys/block/\'{}\'/queue/%s"' % (value, param)) + common.pdsh(settings.getnodes('osds'), 'find /dev/disk/by-partlabel/osd-device-*{data,block} -exec readlink {} \; | cut -d"/" -f 3 | sed "s/[0-9]$//;s/p[0-9]*//" | xargs -I{} sudo sh -c "echo %s > /sys/block/\'{}\'/queue/%s"' % (value, param)) def __str__(self):