From 974417b75f5f839ce4daaf080147ad154d727f10 Mon Sep 17 00:00:00 2001 From: Eugene Kirpichov Date: Sat, 21 Jul 2012 23:17:55 +0000 Subject: 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 --- nova/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nova/utils.py') 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) -- cgit