]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: don't log on exit.
authorSebastian Wagner <sewagner@redhat.com>
Wed, 21 Jul 2021 09:46:16 +0000 (11:46 +0200)
committerSebastian Wagner <sewagner@redhat.com>
Tue, 10 Aug 2021 14:36:33 +0000 (16:36 +0200)
At this point, the garbage collector already colleceted the `open` function

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit 71162c6fea7aba2e30cf50d8a0f1a5a0cf3b2462)

src/cephadm/cephadm

index 1182bddd6b4716ee152d21c3f45d696a8867ca8e..12a99b5268f38ec346048da1a6d87dfde0137a76 100755 (executable)
@@ -1205,13 +1205,16 @@ class FileLock(object):
             self._lock_counter -= 1
 
             if self._lock_counter == 0 or force:
-                lock_id = id(self)
-                lock_filename = self._lock_file
+                lock_id = id(self)
+                lock_filename = self._lock_file
 
-                logger.debug('Releasing lock %s on %s', lock_id, lock_filename)
+                # Can't log in shutdown:
+                #  File "/usr/lib64/python3.9/logging/__init__.py", line 1175, in _open
+                #    NameError: name 'open' is not defined
+                # logger.debug('Releasing lock %s on %s', lock_id, lock_filename)
                 self._release()
                 self._lock_counter = 0
-                logger.debug('Lock %s released on %s', lock_id, lock_filename)
+                logger.debug('Lock %s released on %s', lock_id, lock_filename)
 
         return None