Looks good to me.
On Mon, Apr 8, 2013 at 10:51 AM, Justin Pettit <jpet...@nicira.com> wrote:
> 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 <jpet...@nicira.com>
> ---
> vswitchd/bridge.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
> index 899fd64..4a71e17 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 (%d) until it goes away",
> + getpid());
>
> HMAP_FOR_EACH_SAFE (br, next_br, node, &all_bridges) {
> bridge_destroy(br);
> --
> 1.7.5.4
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev
>
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
