Merge pull request #897 from stackhpc/upstream/2026.1-2026-07-07

Synchronise 2026.1 with upstream

Author: Alex-Welsh

ansible/module_utils/kolla_podman_worker.py

@@ -538,8 +538,12 @@ def compare_config(self):
         if rc == 0:
             return False
         elif rc == 1:
-            self._config_diff = (raw_output.decode('utf-8') if
-                                 isinstance(raw_output, bytes) else raw_output)
+            try:
+                self._config_diff = (raw_output.decode('utf-8') if
+                                     isinstance(raw_output, bytes) else
+                                     raw_output)
+            except UnicodeDecodeError:
+                self._config_diff = 'container changed during config check'
             return True
         else:
             raise Exception('Failed to compare container configuration: '

ansible/roles/glance/tasks/config.yml

@@ -53,6 +53,7 @@
     project_services: "{{ glance_services }}"
     service: "{{ glance_services['glance-api'] }}"
     service_name: "glance-api"
+    service_uwsgi_config_chunked_input_limit: "{{ '64M' | human_to_bytes }}"
     service_uwsgi_config_http_port: "{{ glance_api_listen_port }}"
     service_uwsgi_config_log_file_chmod: "644"
     service_uwsgi_config_module: "{{ service.wsgi }}"

ansible/roles/service-uwsgi-config/templates/uwsgi.ini.j2

@@ -1,6 +1,9 @@
 [uwsgi]
 add-header = Connection: close
 buffer-size = 65535
+{% if service_uwsgi_config_chunked_input_limit is defined %}
+chunked-input-limit = {{ service_uwsgi_config_chunked_input_limit }}
+{% endif %}
 die-on-term = true
 enable-threads = true
 exit-on-reload = false

releasenotes/notes/bug-2158974-8a585c20e4dbff1f.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixed instance snapshot hanging indefinitely.
+    `LP#2158974 <https://launchpad.net/bugs/2158974>`__

tests/kolla_container_tests/test_podman_worker.py

@@ -766,6 +766,24 @@ def test_compare_config_changed(self):
             user='root')
         self.assertTrue(return_data)
 
+    def test_compare_config_chenged_unicode_error(self):
+        self.fake_data['params']['name'] = 'my_container'
+        self.pw = get_PodmanWorker(self.fake_data['params'])
+        my_container = construct_container(self.fake_data['containers'][0])
+        invalid_bytes = b'\x8e\xfe\xfd'
+        my_container.exec_run = mock.Mock(return_value=(1, invalid_bytes))
+        self.pw.pc.containers.get.return_value = my_container
+
+        return_data = self.pw.compare_config()
+        self.pw.pc.containers.get.assert_called_once_with(
+            self.fake_data['params']['name'])
+        my_container.exec_run.assert_called_once_with(
+            pwm.COMPARE_CONFIG_CMD,
+            user='root')
+        self.assertTrue(return_data)
+        self.assertEqual(self.pw._config_diff,
+                         'container changed during config check')
+
     def test_compare_config_changed_container_exited(self):
         self.fake_data['params']['name'] = 'my_container'
         self.pw = get_PodmanWorker(self.fake_data['params'])