summaryrefslogtreecommitdiffstats
path: root/nova/utils.py
diff options
context:
space:
mode:
authorEugene Kirpichov <ekirpichov@gmail.com>2012-07-21 23:17:55 +0000
committerEugene Kirpichov <ekirpichov@gmail.com>2012-07-23 18:11:29 +0000
commit974417b75f5f839ce4daaf080147ad154d727f10 (patch)
treea036a5baae0eb042692884bb57b14c3d24ec77d6 /nova/utils.py
parent563ed09b9a35e50e24ca10c9a588df119e9a7725 (diff)
Fix wrong regex in cleanup_file_locks.
The sentinel filename actually has form hostname-threadid.pid, not hostname.threadid-pid. Launchpad bug 1018586. Change-Id: I09c01e0e63ee704b1485c196dc0b396ee03b2e5c
Diffstat (limited to 'nova/utils.py')
-rw-r--r--nova/utils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/utils.py b/nova/utils.py
index 9cfb6d06d..7b49fb5fc 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -720,7 +720,7 @@ def cleanup_file_locks():
return
hostname = socket.gethostname()
- sentinel_re = hostname + r'\..*-(\d+$)'
+ sentinel_re = hostname + r'-.*\.(\d+$)'
lockfile_re = r'nova-.*\.lock'
files = os.listdir(FLAGS.lock_path)