From 2487d86c720f868832a842dc6b80d0bab37539b7 Mon Sep 17 00:00:00 2001 From: 3hhh Date: Wed, 29 Jul 2020 17:30:47 +0200 Subject: [PATCH] storage/callback: add the config ID as callback argument --- qubes/storage/callback.py | 4 ++-- qubes/tests/storage_callback.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qubes/storage/callback.py b/qubes/storage/callback.py index 2390d24d..71f85288 100644 --- a/qubes/storage/callback.py +++ b/qubes/storage/callback.py @@ -279,7 +279,7 @@ class CallbackPool(qubes.storage.Pool): if cb_args is None: cb_args = [] cmd = self._cb_conf.get('cmd') - args = [self.name, self._cb_conf['bdriver'], cb, self._cb_cmd_arg, *cb_args] + args = [self.name, self._cb_conf['bdriver'], cb, self._cb_conf_id, self._cb_cmd_arg, *cb_args] if cmd and cmd != '-': args = ' '.join(quote(str(a)) for a in args) cmd = ' '.join(filter(None, [cmd, args])) @@ -295,7 +295,7 @@ class CallbackPool(qubes.storage.Pool): self._cb_log.debug('callback driver stdout (%s, %s %s): %s', self._cb_conf_id, cb, cb_args, stdout) self._cb_log.debug('callback driver stderr (%s, %s %s): %s', self._cb_conf_id, cb, cb_args, stderr) if self._cb_conf.get('signal_back', False) is True: - yield from self._process_signals(stdout) + yield from self._process_signals(stdout) @asyncio.coroutine def _process_signals(self, out): diff --git a/qubes/tests/storage_callback.py b/qubes/tests/storage_callback.py index d1bcf10d..73137a89 100644 --- a/qubes/tests/storage_callback.py +++ b/qubes/tests/storage_callback.py @@ -302,10 +302,10 @@ class TC_91_CallbackPool(LoggingCallbackBase, qubes.tests.storage_lvm.ThinPoolBa {0: '', 1: '', 2: '', - 3: '1: {0}\n2: {1}\n3: pre_sinit\n4: {2}\n1: {0}\n2: {1}\n3: pre_volume_create\n4: {2}\n5: {3}\n6: {4}\n7: None\n1: {0}\n2: {1}\n3: post_volume_create\n4: {2}\n5: {3}\n6: {4}\n7: None'.format(name, bdriver, ctor_params, vname, vid), - 4: '1: {0}\n2: {1}\n3: pre_volume_import_data\n4: {2}\n5: {3}\n6: {4}\n7: None\n8: {5}'.format(name, bdriver, ctor_params, vname, vid, vsize), - 5: '1: {0}\n2: {1}\n3: post_volume_import_data_end\n4: {2}\n5: {3}\n6: {4}\n7: None\n8: {5}'.format(name, bdriver, ctor_params, vname, vid, True), - 6: '1: {0}\n2: {1}\n3: post_volume_remove\n4: {2}\n5: {3}\n6: {4}\n7: None'.format(name, bdriver, ctor_params, vname, vid), + 3: '1: {0}\n2: {1}\n3: pre_sinit\n4: {2}\n5: {3}\n1: {0}\n2: {1}\n3: pre_volume_create\n4: {2}\n5: {3}\n6: {4}\n7: {5}\n8: None\n1: {0}\n2: {1}\n3: post_volume_create\n4: {2}\n5: {3}\n6: {4}\n7: {5}\n8: None'.format(name, bdriver, conf_id, ctor_params, vname, vid), + 4: '1: {0}\n2: {1}\n3: pre_volume_import_data\n4: {2}\n5: {3}\n6: {4}\n7: {5}\n8: None\n9: {6}'.format(name, bdriver, conf_id, ctor_params, vname, vid, vsize), + 5: '1: {0}\n2: {1}\n3: post_volume_import_data_end\n4: {2}\n5: {3}\n6: {4}\n7: {5}\n8: None\n9: {6}'.format(name, bdriver, conf_id, ctor_params, vname, vid, True), + 6: '1: {0}\n2: {1}\n3: post_volume_remove\n4: {2}\n5: {3}\n6: {4}\n7: {5}\n8: None'.format(name, bdriver, conf_id, ctor_params, vname, vid), } } super().setUpClass(conf_id=conf_id, log_expected=log_expected)