diff options
| author | Zuul <zuul@review.opendev.org> | 2020-01-29 09:42:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-01-29 09:42:11 +0000 |
| commit | b710f816666416e05954e78682d35f5cba315285 (patch) | |
| tree | 8a261e1e229676b0bccf14d68e10b0e4db1638f8 /docker/base | |
| parent | 3e5f39be2d9ad051d600f9670d4f5fd5208a29c0 (diff) | |
| parent | 2207afc9b9306c19785238f8f02642187f807785 (diff) | |
| download | kolla-b710f816666416e05954e78682d35f5cba315285.tar.gz kolla-b710f816666416e05954e78682d35f5cba315285.zip | |
Merge "Add error message when merge fails"
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/set_configs.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/docker/base/set_configs.py b/docker/base/set_configs.py index 9176a510d..93a758f1d 100644 --- a/docker/base/set_configs.py +++ b/docker/base/set_configs.py @@ -147,7 +147,15 @@ class ConfigFile(object): if not self.merge: self._delete_path(dest) self._create_parent_dirs(dest) - self._merge_directories(source, dest) + try: + self._merge_directories(source, dest) + except OSError: + # If a source is tried to merge with a read-only mount, it + # may throw an OSError. Because we don't print the source or + # dest anywhere, let's catch the exception and log a better + # message to help with tracking down the issue. + LOG.error('Unable to merge %s with %s', source, dest) + raise def _cmp_file(self, source, dest): # check exsit |