Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

storage/lvm: refresh size cache if it's older than 30sec

Browse Source 
Disk usage may change dynamically not only at VM start/stop. Refresh the
size cache before checking usage property, but no more than once every
30sec (refresh interval of disk space widget)

Fixes QubesOS/qubes-issues#4888
This commit is contained in:
Marek Marczykowski-Górecki 2019-03-17 20:43:43 +01:00
parent b6f77ebfa1
commit aa7c0b71a7
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qubes/storage/lvm.py
View File

@ -188,6 +188,7 @@ class ThinPool(qubes.storage.Pool):
@property
def usage(self):
refresh_cache()
try:
return qubes.storage.lvm.size_cache[
self.volume_group + '/' + self.thin_pool]['usage']
@ -253,6 +254,7 @@ def init_cache_coro(log=logging.getLogger('qubes.storage.lvm')):
return _parse_lvm_cache(out)
size_cache_time = 0
size_cache = init_cache()
@ -720,6 +722,7 @@ class ThinVolume(qubes.storage.Volume):
@property
def usage(self): # lvm thin usage always returns at least the same usage as
# the parent
refresh_cache()
try:
return qubes.storage.lvm.size_cache[self._vid_current]['usage']
except KeyError:
@ -816,7 +819,14 @@ def qubes_lvm_coro(cmd, log=logging.getLogger('qubes.storage.lvm')):
def reset_cache():
qubes.storage.lvm.size_cache = init_cache()
qubes.storage.lvm.size_cache_time = time.monotonic()
@asyncio.coroutine
def reset_cache_coro():
qubes.storage.lvm.size_cache = yield from init_cache_coro()
qubes.storage.lvm.size_cache_time = time.monotonic()
def refresh_cache():
'''Reset size cache, if it's older than 30sec '''
if size_cache_time+30 < time.monotonic():
reset_cache()