X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=vswitchd%2Fovs-brcompatd.c;h=bf571d743a11465ff7a8b4719f8b3f3056e57a74;hb=dcdf169e831c0697f04eecbdda216959eace2ce8;hp=ad1c84403ac663ec4d63d07fdbc2292d9cb3cc16;hpb=39b78711a0ca6724347b366ea265fa569bb1937a;p=openvswitch diff --git a/vswitchd/ovs-brcompatd.c b/vswitchd/ovs-brcompatd.c index ad1c8440..bf571d74 100644 --- a/vswitchd/ovs-brcompatd.c +++ b/vswitchd/ovs-brcompatd.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2008, 2009 Nicira Networks +/* Copyright (c) 2008, 2009, 2010 Nicira Networks * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,7 +39,6 @@ #include "dirs.h" #include "dynamic-string.h" #include "fatal-signal.h" -#include "fault.h" #include "leak-checker.h" #include "netdev.h" #include "netlink.h" @@ -480,6 +479,8 @@ del_port(const struct ovsrec_bridge *br, const char *port_name) } ovsrec_bridge_set_ports(br, ports, n); free(ports); + + ovsrec_port_delete(port_rec); } } @@ -508,6 +509,9 @@ del_bridge(const struct ovsrec_open_vswitch *ovs, const char *br_name) ovsrec_open_vswitch_set_bridges(ovs, bridges, n); free(bridges); + /* Delete the bridge itself. */ + ovsrec_bridge_delete(br); + VLOG_INFO("delbr %s: success", br_name); return 0; @@ -756,8 +760,8 @@ handle_fdb_query_cmd(const struct ovsrec_open_vswitch *ovs, struct mac *mac = &local_macs[n_local_macs]; struct netdev *netdev; - error = netdev_open(iface_name, NETDEV_ETH_TYPE_NONE, &netdev); - if (netdev) { + error = netdev_open_default(iface_name, &netdev); + if (!error) { if (!netdev_get_etheraddr(netdev, mac->addr)) { n_local_macs++; } @@ -979,6 +983,14 @@ brc_recv_update(const struct ovsrec_open_vswitch *ovs) goto error; } + /* Just drop the request on the floor if a valid configuration + * doesn't exist. We don't immediately do this check, because we + * want to drain pending netlink messages. */ + if (!ovs) { + VLOG_WARN_RL(&rl, "could not find valid configuration to update"); + goto error; + } + switch (genlmsghdr->cmd) { case BRC_GENL_C_DP_ADD: handle_bridge_cmd(ovs, buffer, true); @@ -1019,10 +1031,9 @@ error: return; } -#if 0 /* Check for interface configuration changes announced through RTNL. */ static void -rtnl_recv_update(void) +rtnl_recv_update(const struct ovsrec_open_vswitch *ovs) { struct ofpbuf *buf; @@ -1064,27 +1075,21 @@ rtnl_recv_update(void) return; } - if (cfg_lock(NULL, lock_timeout)) { - /* Couldn't lock config file. */ - /* xxx this should try again and print error msg. */ - ofpbuf_delete(buf); - return; - } - if (!netdev_exists(port_name)) { /* Network device is really gone. */ - struct svec ports; + struct ovsrec_bridge *br = find_bridge(ovs, br_name); VLOG_INFO("network device %s destroyed, " "removing from bridge %s", port_name, br_name); - svec_init(&ports); - cfg_get_all_keys(&ports, "bridge.%s.port", br_name); - svec_sort(&ports); - if (svec_contains(&ports, port_name)) { - del_port(br_name, port_name); + if (!br) { + VLOG_WARN("no bridge named %s from which to remove %s", + br_name, port_name); + ofpbuf_delete(buf); + return; } - svec_destroy(&ports); + + del_port(br, port_name); } else { /* A network device by that name exists even though the kernel * told us it had disappeared. Probably, what happened was @@ -1131,12 +1136,10 @@ rtnl_recv_update(void) "a device by that name exists (XS Tools 5.0.0?)", port_name); } - cfg_unlock(); } ofpbuf_delete(buf); } } -#endif int main(int argc, char *argv[]) @@ -1144,11 +1147,10 @@ main(int argc, char *argv[]) struct unixctl_server *unixctl; const char *remote; struct ovsdb_idl *idl; - unsigned int idl_seqno; int retval; + proctitle_init(argc, argv); set_program_name(argv[0]); - register_fault_handlers(); time_init(); vlog_init(); vlog_set_levels(VLM_ANY_MODULE, VLF_CONSOLE, VLL_WARN); @@ -1157,13 +1159,14 @@ main(int argc, char *argv[]) remote = parse_options(argc, argv); signal(SIGPIPE, SIG_IGN); process_init(); + ovsrec_init(); die_if_already_running(); - daemonize(); + daemonize_start(); retval = unixctl_server_create(NULL, &unixctl); if (retval) { - ovs_fatal(retval, "could not listen for vlog connections"); + exit(EXIT_FAILURE); } if (brc_open(&brc_sock)) { @@ -1177,45 +1180,33 @@ main(int argc, char *argv[]) } } + daemonize_complete(); + idl = ovsdb_idl_create(remote, &ovsrec_idl_class); - idl_seqno = ovsdb_idl_get_seqno(idl); for (;;) { const struct ovsrec_open_vswitch *ovs; struct ovsdb_idl_txn *txn; enum ovsdb_idl_txn_status status; - unsigned int new_idl_seqno; ovsdb_idl_run(idl); - /* xxx Complete hack to get around bad ovs! */ - new_idl_seqno = ovsdb_idl_get_seqno(idl); - if (new_idl_seqno == idl_seqno) { - ovsdb_idl_wait(idl); - poll_block(); - printf("xxx trying again...\n"); - idl_seqno = new_idl_seqno; - continue; - } - - ovs = ovsrec_open_vswitch_first(idl); - if (!ovs) { - /* XXX it would be more user-friendly to create a record ourselves - * (while verifying that the table is empty before doing so). */ - ovs_fatal(0, "%s: database does not contain any Open vSwitch " - "configuration", remote); - } - txn = ovsdb_idl_txn_create(idl); unixctl_server_run(unixctl); + ovs = ovsrec_open_vswitch_first(idl); brc_recv_update(ovs); + + if (!ovs && ovsdb_idl_has_ever_connected(idl)) { + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1); + VLOG_WARN_RL(&rl, "%s: database does not contain any Open vSwitch " + "configuration", remote); + } netdev_run(); -#if 0 /* If 'prune_timeout' is non-zero, we actively prune from the - * config file any 'bridge..port' entries that are no - * longer valid. We use two methods: + * configuration of port entries that are no longer valid. We + * use two methods: * * 1) The kernel explicitly notifies us of removed ports * through the RTNL messages. @@ -1223,14 +1214,15 @@ main(int argc, char *argv[]) * 2) We periodically check all ports associated with bridges * to see if they no longer exist. */ - if (prune_timeout) { - rtnl_recv_update(); + if (ovs && prune_timeout) { + rtnl_recv_update(ovs); +#if 0 prune_ports(); +#endif nl_sock_wait(rtnl_sock, POLLIN); poll_timer_wait(prune_timeout); } -#endif while ((status = ovsdb_idl_txn_commit(txn)) == TXN_INCOMPLETE) { ovsdb_idl_run(idl); @@ -1238,7 +1230,6 @@ main(int argc, char *argv[]) ovsdb_idl_txn_wait(txn); poll_block(); } - ovsdb_idl_txn_destroy(txn); switch (status) { case TXN_INCOMPLETE: @@ -1254,16 +1245,19 @@ main(int argc, char *argv[]) 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: - /* 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(); } + ovsdb_idl_txn_destroy(txn); nl_sock_wait(brc_sock, POLLIN); ovsdb_idl_wait(idl);