diff options
| author | Tony Asleson <tasleson@redhat.com> | 2023-03-09 11:21:27 -0600 |
|---|---|---|
| committer | Tony Asleson <tasleson@redhat.com> | 2023-03-10 12:51:53 -0600 |
| commit | 1949afa24b10991408cff362084cdc881f499535 (patch) | |
| tree | 5f07a476891eb8dbb044a8262bdcb71a2eed6427 /daemons | |
| parent | 3d854b39bd8c3740eae087c4d46e5f685b368f5e (diff) | |
| download | lvm2-1949afa24b10991408cff362084cdc881f499535.tar.gz | |
lvmdbusd: Handle missing key in get_key
When we sort the LVs, we can stumble on a missing key, protect against
this as well.
Seen in error injection testing:
Traceback (most recent call last):
File "/home/tasleson/projects/lvm2/daemons/lvmdbusd/fetch.py", line 198, in update_thread
num_changes = load(*_load_args(queued_requests))
File "/home/tasleson/projects/lvm2/daemons/lvmdbusd/fetch.py", line 83, in load
rc = MThreadRunner(_main_thread_load, refresh, emit_signal).done()
File "/home/tasleson/projects/lvm2/daemons/lvmdbusd/utils.py", line 726, in done
raise self.exception
File "/home/tasleson/projects/lvm2/daemons/lvmdbusd/utils.py", line 732, in _run
self.rc = self.f(*self.args)
File "/home/tasleson/projects/lvm2/daemons/lvmdbusd/fetch.py", line 40, in _main_thread_load
(lv_changes, remove) = load_lvs(
File "/home/tasleson/projects/lvm2/daemons/lvmdbusd/lv.py", line 148, in load_lvs
return common(
File "/home/tasleson/projects/lvm2/daemons/lvmdbusd/loader.py", line 37, in common
objects = retrieve(search_keys, cache_refresh=False)
File "/home/tasleson/projects/lvm2/daemons/lvmdbusd/lv.py", line 72, in lvs_state_retrieve
lvs = sorted(cfg.db.fetch_lvs(selection), key=get_key)
File "/home/tasleson/projects/lvm2/daemons/lvmdbusd/lv.py", line 35, in get_key
pool = i['pool_lv']
KeyError: 'pool_lv'
Diffstat (limited to 'daemons')
| -rw-r--r-- | daemons/lvmdbusd/lv.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/daemons/lvmdbusd/lv.py b/daemons/lvmdbusd/lv.py index 6a4161ad8..caee23379 100644 --- a/daemons/lvmdbusd/lv.py +++ b/daemons/lvmdbusd/lv.py @@ -65,13 +65,13 @@ def lvs_state_retrieve(selection, cache_refresh=True): if cache_refresh: cfg.db.refresh() - # When building up the model, it's best to process LVs with the least - # dependencies to those that are dependant upon other LVs. Otherwise, when - # we are trying to gather information we could be in a position where we - # don't have information available yet. - lvs = sorted(cfg.db.fetch_lvs(selection), key=get_key) - try: + # When building up the model, it's best to process LVs with the least + # dependencies to those that are dependant upon other LVs. Otherwise, when + # we are trying to gather information we could be in a position where we + # don't have information available yet. + lvs = sorted(cfg.db.fetch_lvs(selection), key=get_key) + for l in lvs: if cfg.vdo_support: rc.append(LvStateVdo( |