RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-22 18:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #38447 into master

Browse Source 
* refs/pull/38447/head:
	ceph-volume: disable cache for blkid calls

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: Rishabh Dave <ridave@redhat.com>
This commit is contained in:
Jan Fajerski 2020-12-17 16:31:40 +01:00
commit c8fb9535f6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ceph-volume/ceph_volume/util/disk.py
View File

@ -24,7 +24,7 @@ def get_partuuid(device):
device
"""
out, err, rc = process.call(
['blkid', '-s', 'PARTUUID', '-o', 'value', device]
['blkid', '-c', '/dev/null', '-s', 'PARTUUID', '-o', 'value', device]
)
return ' '.join(out).strip()
@ -98,7 +98,7 @@ def blkid(device):
PART_ENTRY_UUID PARTUUID
"""
out, err, rc = process.call(
['blkid', '-p', device]
['blkid', '-c', '/dev/null', '-p', device]
)
return _blkid_parser(' '.join(out))
@ -110,7 +110,7 @@ def get_part_entry_type(device):
used for udev rules, but it is useful in this case as it is the only
consistent way to retrieve the GUID used by ceph-disk to identify devices.
"""
out, err, rc = process.call(['blkid', '-p', '-o', 'udev', device])
out, err, rc = process.call(['blkid', '-c', '/dev/null', '-p', '-o', 'udev', device])
for line in out:
if 'ID_PART_ENTRY_TYPE=' in line:
return line.split('=')[-1].strip()
@ -123,7 +123,7 @@ def get_device_from_partuuid(partuuid):
device is
"""
out, err, rc = process.call(
['blkid', '-t', 'PARTUUID="%s"' % partuuid, '-o', 'device']
['blkid', '-c', '/dev/null', '-t', 'PARTUUID="%s"' % partuuid, '-o', 'device']
)
return ' '.join(out).strip()