summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2023-01-27 16:01:16 +0000
committerGerrit Code Review <review@openstack.org>2023-01-27 16:01:16 +0000
commit78ebbb0f024aeefa35c8fbe76c531d21fb02b368 (patch)
tree0218605361486437bfebb8dcfb4b3771230c68ca
parent323d1d5fa52cbcae12a172b56a186b23677ec28b (diff)
parentfc7cf4a598cfe8b96d6235d7495759d54c36e697 (diff)
downloadcinder-78ebbb0f024aeefa35c8fbe76c531d21fb02b368.tar.gz
Merge "Erroneous log message args location causes a misconception" into stable/xena
-rw-r--r--cinder/scheduler/filters/capacity_filter.py9
-rw-r--r--releasenotes/notes/bug-1953168-fix-capacity-filter-message-456dea41fa8a4a1b.yaml5
2 files changed, 8 insertions, 6 deletions
diff --git a/cinder/scheduler/filters/capacity_filter.py b/cinder/scheduler/filters/capacity_filter.py
index 1661d16f4..d1eb7fb7b 100644
--- a/cinder/scheduler/filters/capacity_filter.py
+++ b/cinder/scheduler/filters/capacity_filter.py
@@ -155,16 +155,13 @@ class CapacityFilter(filters.BaseBackendFilter):
# of reserved space) which we can over-subscribe.
adjusted_free_virtual = (
free * backend_state.max_over_subscription_ratio)
+ msg_args["available"] = adjusted_free_virtual
res = adjusted_free_virtual >= requested_size
if not res:
- msg_args = {"available": adjusted_free_virtual,
- "size": requested_size,
- "grouping": grouping,
- "grouping_name": backend_state.backend_id}
LOG.warning("Insufficient free virtual space "
"(%(available)sGB) to accommodate thin "
- "provisioned %(size)sGB volume on %(grouping)s"
- " %(grouping_name)s.", msg_args)
+ "provisioned %(requested)sGB volume on "
+ "%(grouping)s %(grouping_name)s.", msg_args)
else:
LOG.debug("Space information for volume creation "
"on %(grouping)s %(grouping_name)s "
diff --git a/releasenotes/notes/bug-1953168-fix-capacity-filter-message-456dea41fa8a4a1b.yaml b/releasenotes/notes/bug-1953168-fix-capacity-filter-message-456dea41fa8a4a1b.yaml
new file mode 100644
index 000000000..fef5eaa7a
--- /dev/null
+++ b/releasenotes/notes/bug-1953168-fix-capacity-filter-message-456dea41fa8a4a1b.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+ - |
+ `Bug #1953168 <https://bugs.launchpad.net/cinder/+bug/1953168>`_: Fixed
+ missing parameter in the capacity filter log message.