projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "master" into "next".
[openvswitch]
/
vswitchd
/
ovs-brcompatd.c
diff --git
a/vswitchd/ovs-brcompatd.c
b/vswitchd/ovs-brcompatd.c
index 04ee2c061b55fa3489cfc37996309e5547b4bc1a..faf1bee37cf7804d624abf1637aa46e372e48cd9 100644
(file)
--- a/
vswitchd/ovs-brcompatd.c
+++ b/
vswitchd/ovs-brcompatd.c
@@
-756,7
+756,7
@@
handle_fdb_query_cmd(const struct ovsrec_open_vswitch *ovs,
struct netdev *netdev;
error = netdev_open_default(iface_name, &netdev);
struct netdev *netdev;
error = netdev_open_default(iface_name, &netdev);
- if (
netdev
) {
+ if (
!error
) {
if (!netdev_get_etheraddr(netdev, mac->addr)) {
n_local_macs++;
}
if (!netdev_get_etheraddr(netdev, mac->addr)) {
n_local_macs++;
}
@@
-1144,6
+1144,7
@@
main(int argc, char *argv[])
struct ovsdb_idl *idl;
int retval;
struct ovsdb_idl *idl;
int retval;
+ proctitle_init(argc, argv);
set_program_name(argv[0]);
time_init();
vlog_init();
set_program_name(argv[0]);
time_init();
vlog_init();
@@
-1153,6
+1154,7
@@
main(int argc, char *argv[])
remote = parse_options(argc, argv);
signal(SIGPIPE, SIG_IGN);
process_init();
remote = parse_options(argc, argv);
signal(SIGPIPE, SIG_IGN);
process_init();
+ ovsrec_init();
die_if_already_running();
daemonize_start();
die_if_already_running();
daemonize_start();
@@
-1223,7
+1225,6
@@
main(int argc, char *argv[])
ovsdb_idl_txn_wait(txn);
poll_block();
}
ovsdb_idl_txn_wait(txn);
poll_block();
}
- ovsdb_idl_txn_destroy(txn);
switch (status) {
case TXN_INCOMPLETE:
switch (status) {
case TXN_INCOMPLETE:
@@
-1239,16
+1240,19
@@
main(int argc, char *argv[])
case TXN_TRY_AGAIN:
/* xxx Handle this better! */
case TXN_TRY_AGAIN:
/* xxx Handle this better! */
-
printf("xxx We need to try again!\n
");
+
VLOG_ERR("OVSDB transaction needs retry
");
break;
case TXN_ERROR:
break;
case TXN_ERROR:
- /* xxx Is this what we want to do? */
- ovs_fatal(0, "transaction error");
-
+ /* xxx Handle this better! */
+ VLOG_ERR("OVSDB transaction failed: %s",
+ ovsdb_idl_txn_get_error(txn));
+ break;
+
default:
NOT_REACHED();
}
default:
NOT_REACHED();
}
+ ovsdb_idl_txn_destroy(txn);
nl_sock_wait(brc_sock, POLLIN);
ovsdb_idl_wait(idl);
nl_sock_wait(brc_sock, POLLIN);
ovsdb_idl_wait(idl);