nikon/tuned
1
0
Fork 0
Code Activity Actions

plugin_disk: try to workaround embedded '/' in device names

Browse source 
It seems that some drivers return udev names with embedded slashes '/', e.g.:
sfdsk/gdssys34

When kernel creates sysfs nodes for them it replaces '/' by '!' not to cause
ambiguity in path, i.e. the device from previous example will become:
sfdsk!gdssys34

This commit add support for such cases. It checks whether there is embedded
'/' in the device name, if yes, it tries to construct sysfs path with '!'.
It checks whether the resulting sysfs path exists, if not, it tries the
version with embedded '/'. This is safety fallback not to cause regression
in some weird cases and it may be dropped in the future.

Related: rhbz#1353142

Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
This commit is contained in:
Jaroslav Škarvada 2016-07-12 11:57:11 +02:00
parent 1d57d7229b
commit fd40ca7c67
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tuned/plugins/plugin_disk.py
View file

@ -198,8 +198,15 @@ class DiskPlugin(hotplug.Plugin):
def _instance_unapply_dynamic(self, instance, device):
pass
def _sysfs_path(self, device, suffix, prefix = "/sys/block/"):
if "/" in device:
dev = os.path.join(prefix, device.replace("/", "!"), suffix)
if os.path.exists(dev):
return dev
return os.path.join(prefix, device, suffix)
def _elevator_file(self, device):
return os.path.join("/sys/block/", device, "queue/scheduler")
return self._sysfs_path(device, "queue/scheduler")
@command_set("elevator", per_device=True)
def _set_elevator(self, value, device, sim):
@ -261,7 +268,7 @@ class DiskPlugin(hotplug.Plugin):
return 253
def _readahead_file(self, device):
return os.path.join("/sys/block/", device, "queue/read_ahead_kb")
return self._sysfs_path(device, "queue/read_ahead_kb")
def _parse_ra(self, value):
val = str(value).split(None, 1)
@ -307,7 +314,7 @@ class DiskPlugin(hotplug.Plugin):
self._storage.unset(storage_key)
def _scheduler_quantum_file(self, device):
return os.path.join("/sys/block/", device, "queue/iosched/quantum")
return self._sysfs_path(device, "queue/iosched/quantum")
@command_set("scheduler_quantum", per_device=True)
def _set_scheduler_quantum(self, value, device, sim):