Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Differentiate between partitions and devices using sysfs #1312

Closed
wants to merge 1 commit into from
Closed

Differentiate between partitions and devices using sysfs #1312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 37 additions & 17 deletions psutil/_pslinux.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,12 +252,33 @@ def file_flags_to_mode(flags):
return mode


def get_partition_device(partition):
"""given a partition, return the device that the partition is a part of.
If "parition" is already a name of a device, return None
"""
# https://unix.stackexchange.com/questions/226420
# /sys/class/block/sda1 ->
# ../../devices/pci0000:00/0000:00:10.0/host2/target2:0:0/
# 2:0:0:0/block/sda/sda1
# for NVMe:
# /sys/class/block/nvme0n1p1 ->
# ../../devices/pci0000:00/0000:00:17.0/0000:13:00.0/
# nvme/nvme0/nvme0n1/nvme0n1p1
device_path = os.readlink("/sys/class/block/" + partition)
parent = device_path.split(os.sep)[-2]
# "/sys/block" doesn't contain partitions, but does contain devices
if os.path.exists("/sys/block/" + parent):
return parent
return None


def get_sector_size(partition):
"""Return the sector size of a partition.
"""Return the sector size of a device or partition.
Used by disk_io_counters().
"""
device = get_partition_device(partition) or partition
try:
with open("/sys/block/%s/queue/hw_sector_size" % partition, "rt") as f:
with open("/sys/block/%s/queue/hw_sector_size" % device, "rt") as f:
return int(f.read())
except (IOError, ValueError):
# man iostat states that sectors are equivalent with blocks and
Expand Down Expand Up @@ -1036,20 +1057,19 @@ def disk_io_counters():
def get_partitions():
partitions = []
with open_text("%s/partitions" % get_procfs_path()) as f:
lines = f.readlines()[2:]
for line in reversed(lines):
_, _, _, name = line.split()
if name[-1].isdigit():
# we're dealing with a partition (e.g. 'sda1'); 'sda' will
# also be around but we want to omit it
for line in f.readlines()[2:]:
_, _, _, name = line.split()
partitions.append(name)
else:
if not partitions or not partitions[-1].startswith(name):
# we're dealing with a disk entity for which no
# partitions have been defined (e.g. 'sda' but
# 'sda1' was not around), see:
# https://github.com/giampaolo/psutil/issues/338
partitions.append(name)
# when we sum all disk counters, we need to ignore devices
# that have partitions, to avoid multiple counting.
# e.g. if we have "sda" and "sda1", we don't want "sda"
# note that a "partition in partitions" can be a name of a device -
# "get_partition_device" will return None for these names, and they
# will not be in "parent_devices" if they don't have partitions
parent_devices = set(get_partition_device(partition)
for partition in partitions)
partitions = [partition for partition in partitions if
partition not in parent_devices]
return partitions

retdict = {}
Expand Down Expand Up @@ -1079,12 +1099,12 @@ def get_partitions():
(reads_merged, rbytes, rtime, writes, writes_merged,
wbytes, wtime, _, busy_time, _) = map(int, fields[4:14])
elif fields_len == 14:
# Linux 2.6+, line referring to a disk
# Linux 2.6+, line referring to a disk or partition
name = fields[2]
(reads, reads_merged, rbytes, rtime, writes, writes_merged,
wbytes, wtime, _, busy_time, _) = map(int, fields[3:14])
elif fields_len == 7:
# Linux 2.6+, line referring to a partition
# Linux >=2.6, <2.6.25, line referring to a partition
name = fields[2]
reads, rbytes, writes, wbytes = map(int, fields[3:])
rtime = wtime = reads_merged = writes_merged = busy_time = 0
Expand Down
68 changes: 37 additions & 31 deletions psutil/tests/test_linux.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -995,16 +995,18 @@ def test_disk_io_counters_kernel_2_4_mocked(self):
with mock_open_content(
'/proc/diskstats',
" 3 0 1 hda 2 3 4 5 6 7 8 9 10 11 12"):
ret = psutil.disk_io_counters(nowrap=False)
self.assertEqual(ret.read_count, 1)
self.assertEqual(ret.read_merged_count, 2)
self.assertEqual(ret.read_bytes, 3 * SECTOR_SIZE)
self.assertEqual(ret.read_time, 4)
self.assertEqual(ret.write_count, 5)
self.assertEqual(ret.write_merged_count, 6)
self.assertEqual(ret.write_bytes, 7 * SECTOR_SIZE)
self.assertEqual(ret.write_time, 8)
self.assertEqual(ret.busy_time, 10)
with mock.patch('psutil._pslinux.os.readlink',
return_value='block/hda'):
ret = psutil.disk_io_counters(nowrap=False)
self.assertEqual(ret.read_count, 1)
self.assertEqual(ret.read_merged_count, 2)
self.assertEqual(ret.read_bytes, 3 * SECTOR_SIZE)
self.assertEqual(ret.read_time, 4)
self.assertEqual(ret.write_count, 5)
self.assertEqual(ret.write_merged_count, 6)
self.assertEqual(ret.write_bytes, 7 * SECTOR_SIZE)
self.assertEqual(ret.write_time, 8)
self.assertEqual(ret.busy_time, 10)

def test_disk_io_counters_kernel_2_6_full_mocked(self):
# Tests /proc/diskstats parsing format for 2.6 kernels,
Expand All @@ -1020,16 +1022,18 @@ def test_disk_io_counters_kernel_2_6_full_mocked(self):
with mock_open_content(
'/proc/diskstats',
" 3 0 hda 1 2 3 4 5 6 7 8 9 10 11"):
ret = psutil.disk_io_counters(nowrap=False)
self.assertEqual(ret.read_count, 1)
self.assertEqual(ret.read_merged_count, 2)
self.assertEqual(ret.read_bytes, 3 * SECTOR_SIZE)
self.assertEqual(ret.read_time, 4)
self.assertEqual(ret.write_count, 5)
self.assertEqual(ret.write_merged_count, 6)
self.assertEqual(ret.write_bytes, 7 * SECTOR_SIZE)
self.assertEqual(ret.write_time, 8)
self.assertEqual(ret.busy_time, 10)
with mock.patch('psutil._pslinux.os.readlink',
return_value='block/hda'):
ret = psutil.disk_io_counters(nowrap=False)
self.assertEqual(ret.read_count, 1)
self.assertEqual(ret.read_merged_count, 2)
self.assertEqual(ret.read_bytes, 3 * SECTOR_SIZE)
self.assertEqual(ret.read_time, 4)
self.assertEqual(ret.write_count, 5)
self.assertEqual(ret.write_merged_count, 6)
self.assertEqual(ret.write_bytes, 7 * SECTOR_SIZE)
self.assertEqual(ret.write_time, 8)
self.assertEqual(ret.busy_time, 10)

def test_disk_io_counters_kernel_2_6_limited_mocked(self):
# Tests /proc/diskstats parsing format for 2.6 kernels,
Expand All @@ -1047,17 +1051,19 @@ def test_disk_io_counters_kernel_2_6_limited_mocked(self):
with mock_open_content(
'/proc/diskstats',
" 3 1 hda 1 2 3 4"):
ret = psutil.disk_io_counters(nowrap=False)
self.assertEqual(ret.read_count, 1)
self.assertEqual(ret.read_bytes, 2 * SECTOR_SIZE)
self.assertEqual(ret.write_count, 3)
self.assertEqual(ret.write_bytes, 4 * SECTOR_SIZE)

self.assertEqual(ret.read_merged_count, 0)
self.assertEqual(ret.read_time, 0)
self.assertEqual(ret.write_merged_count, 0)
self.assertEqual(ret.write_time, 0)
self.assertEqual(ret.busy_time, 0)
with mock.patch('psutil._pslinux.os.readlink',
return_value='block/hda'):
ret = psutil.disk_io_counters(nowrap=False)
self.assertEqual(ret.read_count, 1)
self.assertEqual(ret.read_bytes, 2 * SECTOR_SIZE)
self.assertEqual(ret.write_count, 3)
self.assertEqual(ret.write_bytes, 4 * SECTOR_SIZE)

self.assertEqual(ret.read_merged_count, 0)
self.assertEqual(ret.read_time, 0)
self.assertEqual(ret.write_merged_count, 0)
self.assertEqual(ret.write_time, 0)
self.assertEqual(ret.busy_time, 0)


# =====================================================================
Expand Down