From f90433936b399e8a00ad78ee23fdecdb8d6bb150 Mon Sep 17 00:00:00 2001 From: Justin Pettit Date: Mon, 8 Apr 2013 10:44:50 -0700 Subject: [PATCH] bridge: Report PID of yielding process when multiple instances run. Normally, the daemon code will detect when multiple instances are run and print the conflicting PID. However, if ovs-vswitchd is not run in daemon mode or the pidfile is removed, a database lock is checked. The message it prints wasn't specific enough about which process was backing off due to not getting the lock. Signed-off-by: Justin Pettit --- vswitchd/bridge.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 899fd64c2..19a8f48d7 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -2274,7 +2274,8 @@ bridge_run(void) struct bridge *br, *next_br; VLOG_ERR_RL(&rl, "another ovs-vswitchd process is running, " - "disabling this process until it goes away"); + "disabling this process (pid %ld) until it goes away", + (long int) getpid()); HMAP_FOR_EACH_SAFE (br, next_br, node, &all_bridges) { bridge_destroy(br); -- 2.47.0