Browse Source

Merge "Lower the log level for falling back to mkstemp"

changes/74/708274/1
Zuul 5 days ago
parent
commit
b515d7fc20
2 changed files with 5 additions and 1 deletions
  1. +1
    -1
      swift/obj/diskfile.py
  2. +4
    -0
      test/unit/obj/test_diskfile.py

+ 1
- 1
swift/obj/diskfile.py View File

@@ -1696,7 +1696,7 @@ class BaseDiskFileWriter(object):
msg = 'open(%s, O_TMPFILE | O_WRONLY) failed: %s \
Falling back to using mkstemp()' \
% (self._datadir, os.strerror(err.errno))
self.logger.warning(msg)
self.logger.debug(msg)
self.manager.use_linkat = False
else:
raise

+ 4
- 0
test/unit/obj/test_diskfile.py View File

@@ -5217,7 +5217,11 @@ class DiskFileMixin(BaseDiskFileTestMixin):
# Once opening file with O_TMPFILE has failed,
# failure is cached to not try again
self.assertFalse(df.manager.use_linkat)
# Now that we try to use O_TMPFILE all the time, log at debug
# instead of warning
log = df.manager.logger.get_lines_for_level('warning')
self.assertFalse(log)
log = df.manager.logger.get_lines_for_level('debug')
self.assertGreater(len(log), 0)
self.assertTrue('O_TMPFILE' in log[-1])


Loading…
Cancel
Save