summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2022-11-18 19:32:46 +0000
committerGerrit Code Review <review@openstack.org>2022-11-18 19:32:46 +0000
commit81d021cc73f49f00dabcc8ccb2c3e98d2d5b76df (patch)
tree7d9ea62e0c23ba37c48d22535a724e141e03a340
parent1437a613fc6d722206b89344e8f59187fd4101a7 (diff)
parent1f8016db221e7814053ac24a8df652d4e5908d1f (diff)
downloadcinder-81d021cc73f49f00dabcc8ccb2c3e98d2d5b76df.tar.gz
Merge "Hitachi: fix to output resource lock message correctly" into stable/yoga
-rw-r--r--cinder/volume/drivers/hitachi/hbsd_rest_api.py2
-rw-r--r--releasenotes/notes/hitachi-vsp-fix-resource-lock-msg-5a119426e6c65998.yaml6
2 files changed, 7 insertions, 1 deletions
diff --git a/cinder/volume/drivers/hitachi/hbsd_rest_api.py b/cinder/volume/drivers/hitachi/hbsd_rest_api.py
index 56c68e97c..118b9db6d 100644
--- a/cinder/volume/drivers/hitachi/hbsd_rest_api.py
+++ b/cinder/volume/drivers/hitachi/hbsd_rest_api.py
@@ -377,7 +377,7 @@ class RestApiClient():
message, errobj=errobj)
return False, rsp_body, errobj
else:
- LOG.debug("The resource group to which the operation object ",
+ LOG.debug("The resource group to which the operation object "
"belongs is being locked by other software.")
return True, rsp_body, errobj
diff --git a/releasenotes/notes/hitachi-vsp-fix-resource-lock-msg-5a119426e6c65998.yaml b/releasenotes/notes/hitachi-vsp-fix-resource-lock-msg-5a119426e6c65998.yaml
new file mode 100644
index 000000000..3f383fbbc
--- /dev/null
+++ b/releasenotes/notes/hitachi-vsp-fix-resource-lock-msg-5a119426e6c65998.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+ - |
+ Hitachi driver `bug #1989176
+ <https://bugs.launchpad.net/cinder/+bug/1989176>`_:
+ Fixed Hitachi driver to output a message for resource lock correctly.