diff options
| author | Julia Kreger <juliaashleykreger@gmail.com> | 2020-12-16 09:54:26 -0800 |
|---|---|---|
| committer | Julia Kreger <juliaashleykreger@gmail.com> | 2020-12-16 09:54:26 -0800 |
| commit | 9a858ad4ff092e371d6a1113b03b6099eac7397e (patch) | |
| tree | d4b44d3629ba1d703982f23211c94309340787e8 | |
| parent | a58b88c737a1626af3c98de0f42f9a114fcc6104 (diff) | |
| download | ironic-9a858ad4ff092e371d6a1113b03b6099eac7397e.tar.gz | |
Remove detect_vendor decorator
And move a lock creation to vendor storage, which... should be
okay.
mgoddard reported issues in one of his projects where ironic was
reporting that there were errors on the power sync process,
ultimately due to the decorator from the very first iteration of
the detect vendor code.
Change-Id: Icd0dc3fe59a3815d6f78d881eb280f406e7d0c69
| -rw-r--r-- | ironic/drivers/modules/ipmitool.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ironic/drivers/modules/ipmitool.py b/ironic/drivers/modules/ipmitool.py index c3b5600e3..13391ef4e 100644 --- a/ironic/drivers/modules/ipmitool.py +++ b/ironic/drivers/modules/ipmitool.py @@ -950,6 +950,7 @@ class IPMIPower(base.PowerInterface): # call to store it. vendor = task.driver.management.detect_vendor(task) if vendor: + task.upgrade_lock() props = task.node.properties props['vendor'] = vendor task.node.properties = props @@ -1241,7 +1242,6 @@ class IPMIManagement(base.ManagementInterface): response['persistent'] = 'Options apply to all future boots' in out return response - @task_manager.require_exclusive_lock @METRICS.timer('IPMIManagement.detect_vendor') def detect_vendor(self, task): """Detects, stores, and returns the hardware vendor. |