diff options
| -rw-r--r-- | docker/base/set_configs.py | 4 | ||||
| -rw-r--r-- | releasenotes/notes/fixes-container-restart-conditions-57d36b13b0aa964b.yaml | 6 | ||||
| -rw-r--r-- | tests/test_set_config.py | 71 |
3 files changed, 80 insertions, 1 deletions
diff --git a/docker/base/set_configs.py b/docker/base/set_configs.py index 559f1c0f3..40c3e5162 100644 --- a/docker/base/set_configs.py +++ b/docker/base/set_configs.py @@ -162,9 +162,11 @@ class ConfigFile(object): def _cmp_file(self, source, dest): # check exsit if (os.path.exists(source) and - not self.optional and not os.path.exists(dest)): return False + if (os.path.exists(dest) and + not os.path.exists(source)): + return False # check content with open(source, 'rb') as f1, open(dest, 'rb') as f2: if f1.read() != f2.read(): diff --git a/releasenotes/notes/fixes-container-restart-conditions-57d36b13b0aa964b.yaml b/releasenotes/notes/fixes-container-restart-conditions-57d36b13b0aa964b.yaml new file mode 100644 index 000000000..bf6ae3474 --- /dev/null +++ b/releasenotes/notes/fixes-container-restart-conditions-57d36b13b0aa964b.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Fix container restart conditions to be tolerant of missing optional source + and/or destination files. For more details, see the following `bug report + <https://bugs.launchpad.net/kolla/+bug/1997984>`_ diff --git a/tests/test_set_config.py b/tests/test_set_config.py index e74376c60..a5e09084e 100644 --- a/tests/test_set_config.py +++ b/tests/test_set_config.py @@ -344,3 +344,74 @@ class ConfigFileTest(base.BaseTestCase): self.assertEqual([mock.call('/fake/file1', 'rb'), mock.call('/fake/file2', 'rb')], mock_open.call_args_list) + + @mock.patch('glob.glob') + def test_check_non_optional_src_file_not_exists(self, + mock_glob): + config_file = set_configs.ConfigFile( + '/var/lib/kolla/config_files/bar', '/foo', 'user1', '0644') + + mock_glob.return_value = [] + + self.assertRaises(set_configs.MissingRequiredSource, + config_file.check) + + @mock.patch('glob.glob') + def test_check_optional_src_file_not_exists(self, + mock_glob): + config_file = set_configs.ConfigFile( + '/var/lib/kolla/config_files/bar', '/foo', 'user1', '0644', + optional=True) + mock_glob.return_value = [] + + self.assertIsNone(config_file.check()) + + @mock.patch('glob.glob') + @mock.patch('os.path.isdir') + @mock.patch.object(set_configs.ConfigFile, '_cmp_file') + def test_check_raises_config_bad_state(self, + mock_cmp_file, + mock_isdir, + mock_glob): + config_file = set_configs.ConfigFile( + '/var/lib/kolla/config_files/bar', '/foo', 'user1', '0644', + optional=True) + mock_cmp_file.return_value = False + mock_isdir.return_value = False + mock_glob.return_value = ['/var/lib/kolla/config_files/bar'] + + self.assertRaises(set_configs.ConfigFileBadState, config_file.check) + + @mock.patch('os.path.exists', autospec=True) + def test_cmp_file_optional_src_exists_dest_no_exists(self, mock_os_exists): + config_file = set_configs.ConfigFile( + '/var/lib/kolla/config_files/bar', '/foo', 'user1', '0644', + optional=True) + + def fake_exists(path): + if path == '/var/lib/kolla/config_files/bar': + return True + return False + + mock_os_exists.side_effect = fake_exists + + self.assertIs(False, + config_file._cmp_file('/var/lib/kolla/config_files/bar', + '/foo')) + + @mock.patch('os.path.exists', autospec=True) + def test_cmp_file_optional_src_no_exists_dest_exists(self, mock_os_exists): + config_file = set_configs.ConfigFile( + '/var/lib/kolla/config_files/bar', '/foo', 'user1', '0644', + optional=True) + + def fake_exists(path): + if path == '/var/lib/kolla/config_files/bar': + return False + return True + + mock_os_exists.side_effect = fake_exists + + self.assertIs(False, + config_file._cmp_file('/var/lib/kolla/config_files/bar', + '/foo')) |