illustris/pvemon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 5xx until cache expiry when migrating VM disks

Browse Source
This commit is contained in:
illustris 2023-12-10 01:11:15 +05:30
parent 173369ff8e
commit ffcdcff16e
Signed by: illustris
GPG Key ID: 56C8FC0B899FEFA3
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/pvecommon/__init__.py
View File

@ -30,11 +30,20 @@ def ttl_cache_with_randomness(max_ttl, randomness_factor):
result = func(*args, **kwargs) result = func(*args, **kwargs)
cache[key] = (result, time.time()) cache[key] = (result, time.time())
return result return result
def invalidate_cache(*args, **kwargs):
key = str(args) + str(kwargs)
if key in cache:
del cache[key]
# Attach the invalidation function to the wrapper
wrapper.invalidate_cache = invalidate_cache
return wrapper return wrapper
return decorator return decorator
@ttl_cache_with_randomness(qm_max_ttl, qm_rand) @ttl_cache_with_randomness(qm_max_ttl, qm_rand)
def qm_term_cmd(vm_id, cmd, timeout=global_qm_timeout): def qm_term_cmd(vm_id, cmd, timeout=global_qm_timeout): # TODO: ignore cmd timeout in cache key
global deferred_closing global deferred_closing
child = pexpect.spawn(f'qm monitor {vm_id}') child = pexpect.spawn(f'qm monitor {vm_id}')
try: try:

9
src/qmblock/__init__.py
View File

@ -5,6 +5,8 @@ import json
import pvecommon import pvecommon
extract_disk_info_max_retries = 1
def get_device(disk_path): def get_device(disk_path):
try: try:
return os.readlink(disk_path).split('/')[-1] return os.readlink(disk_path).split('/')[-1]
@ -26,7 +28,7 @@ def handle_json_path(path):
raise ValueError('No host_device driver found or filename is missing') raise ValueError('No host_device driver found or filename is missing')
return filename return filename
def extract_disk_info_from_monitor(vm_id): def extract_disk_info_from_monitor(vm_id, retries = 0):
raw_output = pvecommon.qm_term_cmd(vm_id, 'info block') raw_output = pvecommon.qm_term_cmd(vm_id, 'info block')
disks_map = {} disks_map = {}
disks = [x.strip() for x in raw_output.split("drive-")[1:]] disks = [x.strip() for x in raw_output.split("drive-")[1:]]
@ -73,6 +75,11 @@ def extract_disk_info_from_monitor(vm_id):
disks_map[disk_name]["vg_name"] = vg_name disks_map[disk_name]["vg_name"] = vg_name
disks_map[disk_name]["vol_name"] = vol_name disks_map[disk_name]["vol_name"] = vol_name
disks_map[disk_name]["device"] = get_device(disk_path) disks_map[disk_name]["device"] = get_device(disk_path)
# At this point, if disks_map[disk_name]["device"] exists and is None, the cache might be stale
# Flush the cache for this VMID and try again
if "device" in disks_map[disk_name] and disks_map[disk_name]["device"] == None and retries < extract_disk_info_max_retries:
pvecommon.qm_term_cmd.invalidate_cache(vm_id, 'info block')
return extract_disk_info_from_monitor(vm_id, retries+1)
for line in data[1:-1]: for line in data[1:-1]:
if "Attached to" in line: if "Attached to" in line:
attached_to = line.split(":")[-1].strip() attached_to = line.split(":")[-1].strip()