Skip to content

Commit

Permalink
bridge: Do not wait for status update when there is no bridge.
Browse files Browse the repository at this point in the history
Signed-off-by: Alex Wang <alexw@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
  • Loading branch information
yew011 committed Apr 6, 2015
1 parent 5f03c98 commit 500ce35
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions vswitchd/bridge.c
Expand Up @@ -2826,12 +2826,6 @@ run_status_update(void)
static void
status_update_wait(void)
{
/* This prevents the process from constantly waking up on
* connectivity seq, when there is no connection to ovsdb. */
if (!ovsdb_idl_has_lock(idl)) {
return;
}

/* If the 'status_txn' is non-null (transaction incomplete), waits for the
* transaction to complete. If the status update to database needs to be
* run again (transaction fails), registers a timeout in
Expand Down Expand Up @@ -3019,9 +3013,9 @@ bridge_wait(void)
}

poll_timer_wait_until(stats_timer);
status_update_wait();
}

status_update_wait();
system_stats_wait();
}

Expand Down

0 comments on commit 500ce35

Please sign in to comment.