-/* Copyright (c) 2015 Nicira, Inc.
+/* Copyright (c) 2015, 2016 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include <stdlib.h>
#include <string.h>
+#include "binding.h"
+#include "chassis.h"
#include "command-line.h"
#include "compiler.h"
#include "daemon.h"
#include "dirs.h"
+#include "openvswitch/dynamic-string.h"
+#include "encaps.h"
+#include "fatal-signal.h"
+#include "openvswitch/hmap.h"
+#include "lflow.h"
+#include "lib/vswitch-idl.h"
+#include "lport.h"
+#include "ofctrl.h"
#include "openvswitch/vconn.h"
#include "openvswitch/vlog.h"
+#include "ovn/lib/actions.h"
#include "ovn/lib/ovn-sb-idl.h"
+#include "ovn/lib/ovn-util.h"
+#include "patch.h"
+#include "physical.h"
+#include "pinctrl.h"
#include "poll-loop.h"
-#include "fatal-signal.h"
-#include "lib/vswitch-idl.h"
+#include "lib/bitmap.h"
+#include "lib/hash.h"
#include "smap.h"
-#include "stream.h"
+#include "sset.h"
#include "stream-ssl.h"
+#include "stream.h"
#include "unixctl.h"
#include "util.h"
-#include "ofctrl.h"
-#include "binding.h"
-#include "chassis.h"
-#include "physical.h"
-#include "pipeline.h"
-
VLOG_DEFINE_THIS_MODULE(main);
static unixctl_cb_func ovn_controller_exit;
+static unixctl_cb_func ct_zone_list;
#define DEFAULT_BRIDGE_NAME "br-int"
+#define DEFAULT_PROBE_INTERVAL_MSEC 5000
+static void update_probe_interval(struct controller_ctx *);
static void parse_options(int argc, char *argv[]);
OVS_NO_RETURN static void usage(void);
static char *ovs_remote;
-static char *ovnsb_remote;
+struct local_datapath *
+get_local_datapath(const struct hmap *local_datapaths, uint32_t tunnel_key)
+{
+ struct hmap_node *node = hmap_first_with_hash(local_datapaths, tunnel_key);
+ return (node
+ ? CONTAINER_OF(node, struct local_datapath, hmap_node)
+ : NULL);
+}
-static void
-get_initial_snapshot(struct ovsdb_idl *idl)
+struct patched_datapath *
+get_patched_datapath(const struct hmap *patched_datapaths, uint32_t tunnel_key)
{
- while (1) {
- ovsdb_idl_run(idl);
- if (ovsdb_idl_has_ever_connected(idl)) {
- return;
- }
- ovsdb_idl_wait(idl);
- poll_block();
- }
+ struct hmap_node *node = hmap_first_with_hash(patched_datapaths,
+ tunnel_key);
+ return (node
+ ? CONTAINER_OF(node, struct patched_datapath, hmap_node)
+ : NULL);
}
-static const struct ovsrec_bridge *
-get_bridge(struct controller_ctx *ctx, const char *name)
+const struct sbrec_chassis *
+get_chassis(struct ovsdb_idl *ovnsb_idl, const char *chassis_id)
{
- const struct ovsrec_bridge *br;
+ const struct sbrec_chassis *chassis_rec;
- OVSREC_BRIDGE_FOR_EACH(br, ctx->ovs_idl) {
- if (!strcmp(br->name, name)) {
- return br;
+ SBREC_CHASSIS_FOR_EACH(chassis_rec, ovnsb_idl) {
+ if (!strcmp(chassis_rec->name, chassis_id)) {
+ break;
}
}
- return NULL;
+ return chassis_rec;
}
-/* Retrieve the OVN integration bridge from the "external-ids:ovn-bridge"
- * key, the remote location from the "external-ids:ovn-remote" key, and
- * the chassis name from the "external-ids:system-id" key in the
- * Open_vSwitch table of the OVS database instance.
- *
- * xxx ovn-controller does not support changing any of these mid-run,
- * xxx but that should be addressed later. */
-static void
-get_core_config(struct controller_ctx *ctx, char **br_int_namep)
+uint32_t
+get_tunnel_type(const char *name)
{
- while (1) {
- ovsdb_idl_run(ctx->ovs_idl);
-
- const struct ovsrec_open_vswitch *cfg;
- cfg = ovsrec_open_vswitch_first(ctx->ovs_idl);
- if (!cfg) {
- VLOG_ERR("No Open_vSwitch row defined.");
- ovsdb_idl_destroy(ctx->ovs_idl);
- exit(EXIT_FAILURE);
- }
-
- const struct ovsrec_bridge *br_int;
- const char *remote, *system_id, *br_int_name;
-
- br_int_name = smap_get(&cfg->external_ids, "ovn-bridge");
- if (!br_int_name) {
- br_int_name = DEFAULT_BRIDGE_NAME;
- }
-
- br_int = get_bridge(ctx, br_int_name);
- if (!br_int) {
- VLOG_INFO("Integration bridge '%s' does not exist. Waiting...",
- br_int_name);
- goto try_again;
- }
+ if (!strcmp(name, "geneve")) {
+ return GENEVE;
+ } else if (!strcmp(name, "stt")) {
+ return STT;
+ } else if (!strcmp(name, "vxlan")) {
+ return VXLAN;
+ }
- remote = smap_get(&cfg->external_ids, "ovn-remote");
- if (!remote) {
- VLOG_INFO("OVN OVSDB remote not specified. Waiting...");
- goto try_again;
- }
+ return 0;
+}
- system_id = smap_get(&cfg->external_ids, "system-id");
- if (!system_id) {
- VLOG_INFO("system-id not specified. Waiting...");
- goto try_again;
+const struct ovsrec_bridge *
+get_bridge(struct ovsdb_idl *ovs_idl, const char *br_name)
+{
+ const struct ovsrec_bridge *br;
+ OVSREC_BRIDGE_FOR_EACH (br, ovs_idl) {
+ if (!strcmp(br->name, br_name)) {
+ return br;
}
+ }
+ return NULL;
+}
- ovnsb_remote = xstrdup(remote);
- ctx->chassis_id = xstrdup(system_id);
- *br_int_namep = xstrdup(br_int_name);
- return;
-
-try_again:
- ovsdb_idl_wait(ctx->ovs_idl);
- poll_block();
+static const struct ovsrec_bridge *
+create_br_int(struct controller_ctx *ctx,
+ const struct ovsrec_open_vswitch *cfg,
+ const char *bridge_name)
+{
+ if (!ctx->ovs_idl_txn) {
+ return NULL;
}
+ ovsdb_idl_txn_add_comment(ctx->ovs_idl_txn,
+ "ovn-controller: creating integration bridge '%s'", bridge_name);
+
+ struct ovsrec_interface *iface;
+ iface = ovsrec_interface_insert(ctx->ovs_idl_txn);
+ ovsrec_interface_set_name(iface, bridge_name);
+ ovsrec_interface_set_type(iface, "internal");
+
+ struct ovsrec_port *port;
+ port = ovsrec_port_insert(ctx->ovs_idl_txn);
+ ovsrec_port_set_name(port, bridge_name);
+ ovsrec_port_set_interfaces(port, &iface, 1);
+
+ struct ovsrec_bridge *bridge;
+ bridge = ovsrec_bridge_insert(ctx->ovs_idl_txn);
+ ovsrec_bridge_set_name(bridge, bridge_name);
+ ovsrec_bridge_set_fail_mode(bridge, "secure");
+ const struct smap oc = SMAP_CONST1(&oc, "disable-in-band", "true");
+ ovsrec_bridge_set_other_config(bridge, &oc);
+ ovsrec_bridge_set_ports(bridge, &port, 1);
+
+ struct ovsrec_bridge **bridges;
+ size_t bytes = sizeof *bridges * cfg->n_bridges;
+ bridges = xmalloc(bytes + sizeof *bridges);
+ memcpy(bridges, cfg->bridges, bytes);
+ bridges[cfg->n_bridges] = bridge;
+ ovsrec_open_vswitch_verify_bridges(cfg);
+ ovsrec_open_vswitch_set_bridges(cfg, bridges, cfg->n_bridges + 1);
+
+ return bridge;
}
-struct idl_loop {
- struct ovsdb_idl *idl;
- unsigned int skip_seqno;
-
- struct ovsdb_idl_txn *committing_txn;
- unsigned int precommit_seqno;
+static const struct ovsrec_bridge *
+get_br_int(struct controller_ctx *ctx)
+{
+ const struct ovsrec_open_vswitch *cfg;
+ cfg = ovsrec_open_vswitch_first(ctx->ovs_idl);
+ if (!cfg) {
+ return NULL;
+ }
- struct ovsdb_idl_txn *open_txn;
-};
+ const char *br_int_name = smap_get(&cfg->external_ids, "ovn-bridge");
+ if (!br_int_name) {
+ br_int_name = DEFAULT_BRIDGE_NAME;
+ }
-#define IDL_LOOP_INITIALIZER(IDL) { .idl = (IDL) }
+ const struct ovsrec_bridge *br;
+ br = get_bridge(ctx->ovs_idl, br_int_name);
+ if (!br) {
+ return create_br_int(ctx, cfg, br_int_name);
+ }
+ return br;
+}
-static void
-idl_loop_destroy(struct idl_loop *loop)
+static const char *
+get_chassis_id(const struct ovsdb_idl *ovs_idl)
{
- if (loop) {
- ovsdb_idl_destroy(loop->idl);
+ const struct ovsrec_open_vswitch *cfg = ovsrec_open_vswitch_first(ovs_idl);
+ const char *chassis_id = cfg ? smap_get(&cfg->external_ids, "system-id") : NULL;
+
+ if (!chassis_id) {
+ static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 1);
+ VLOG_WARN_RL(&rl, "'system-id' in Open_vSwitch database is missing.");
}
+
+ return chassis_id;
}
-static struct ovsdb_idl_txn *
-idl_loop_run(struct idl_loop *loop)
+/* Retrieves the OVN Southbound remote location from the
+ * "external-ids:ovn-remote" key in 'ovs_idl' and returns a copy of it.
+ *
+ * XXX ovn-controller does not support this changing mid-run, but that should
+ * be addressed later. */
+static char *
+get_ovnsb_remote(struct ovsdb_idl *ovs_idl)
{
- ovsdb_idl_run(loop->idl);
- loop->open_txn = (loop->committing_txn
- || ovsdb_idl_get_seqno(loop->idl) == loop->skip_seqno
- ? NULL
- : ovsdb_idl_txn_create(loop->idl));
- return loop->open_txn;
+ while (1) {
+ ovsdb_idl_run(ovs_idl);
+
+ const struct ovsrec_open_vswitch *cfg
+ = ovsrec_open_vswitch_first(ovs_idl);
+ if (cfg) {
+ const char *remote = smap_get(&cfg->external_ids, "ovn-remote");
+ if (remote) {
+ return xstrdup(remote);
+ }
+ }
+
+ VLOG_INFO("OVN OVSDB remote not specified. Waiting...");
+ ovsdb_idl_wait(ovs_idl);
+ poll_block();
+ }
}
static void
-idl_loop_commit_and_wait(struct idl_loop *loop)
+update_ct_zones(struct sset *lports, struct hmap *patched_datapaths,
+ struct simap *ct_zones, unsigned long *ct_zone_bitmap)
{
- if (loop->open_txn) {
- loop->committing_txn = loop->open_txn;
- loop->open_txn = NULL;
+ struct simap_node *ct_zone, *ct_zone_next;
+ int scan_start = 1;
+ struct patched_datapath *pd;
+ const char *user;
+ struct sset all_users = SSET_INITIALIZER(&all_users);
+
+ SSET_FOR_EACH(user, lports) {
+ sset_add(&all_users, user);
+ }
+
+ /* Local patched datapath (gateway routers) need zones assigned. */
+ HMAP_FOR_EACH(pd, hmap_node, patched_datapaths) {
+ if (!pd->local) {
+ continue;
+ }
- loop->precommit_seqno = ovsdb_idl_get_seqno(loop->idl);
+ char *dnat = alloc_nat_zone_key(pd->key, "dnat");
+ char *snat = alloc_nat_zone_key(pd->key, "snat");
+ sset_add(&all_users, dnat);
+ sset_add(&all_users, snat);
+ free(dnat);
+ free(snat);
}
- struct ovsdb_idl_txn *txn = loop->committing_txn;
- if (txn) {
- enum ovsdb_idl_txn_status status = ovsdb_idl_txn_commit(txn);
- switch (status) {
- case TXN_INCOMPLETE:
- break;
+ /* Delete zones that do not exist in above sset. */
+ SIMAP_FOR_EACH_SAFE(ct_zone, ct_zone_next, ct_zones) {
+ if (!sset_contains(&all_users, ct_zone->name)) {
+ bitmap_set0(ct_zone_bitmap, ct_zone->data);
+ simap_delete(ct_zones, ct_zone);
+ }
+ }
- case TXN_TRY_AGAIN:
- loop->skip_seqno = loop->precommit_seqno;
- if (ovsdb_idl_get_seqno(loop->idl) != loop->skip_seqno) {
- poll_immediate_wake();
- }
- /* Fall through. */
- case TXN_UNCHANGED:
- case TXN_ABORTED:
- case TXN_SUCCESS:
- case TXN_NOT_LOCKED:
- case TXN_ERROR:
- ovsdb_idl_txn_destroy(txn);
- loop->committing_txn = NULL;
- break;
+ /* xxx This is wasteful to assign a zone to each port--even if no
+ * xxx security policy is applied. */
- case TXN_UNCOMMITTED:
- OVS_NOT_REACHED();
+ /* Assign a unique zone id for each logical port and two zones
+ * to a gateway router. */
+ SSET_FOR_EACH(user, &all_users) {
+ size_t zone;
+ if (simap_contains(ct_zones, user)) {
+ continue;
}
+
+ /* We assume that there are 64K zones and that we own them all. */
+ zone = bitmap_scan(ct_zone_bitmap, 0, scan_start, MAX_CT_ZONES + 1);
+ if (zone == MAX_CT_ZONES + 1) {
+ static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1);
+ VLOG_WARN_RL(&rl, "exhausted all ct zones");
+ return;
+ }
+ scan_start = zone + 1;
+
+ bitmap_set1(ct_zone_bitmap, zone);
+ simap_put(ct_zones, user, zone);
+
+ /* xxx We should erase any old entries for this
+ * xxx zone, but we need a generic interface to the conntrack
+ * xxx table. */
}
- ovsdb_idl_wait(loop->idl);
+ sset_destroy(&all_users);
}
+/* Contains "struct local_datapath" nodes whose hash values are the
+ * tunnel_key of datapaths with at least one local port binding. */
+static struct hmap local_datapaths = HMAP_INITIALIZER(&local_datapaths);
+static struct hmap patched_datapaths = HMAP_INITIALIZER(&patched_datapaths);
+
+static struct lport_index lports;
+static struct mcgroup_index mcgroups;
+
int
main(int argc, char *argv[])
{
struct unixctl_server *unixctl;
- struct controller_ctx ctx = { .chassis_id = NULL };
bool exiting;
int retval;
ovs_cmdl_proctitle_init(argc, argv);
set_program_name(argv[0]);
+ service_start(&argc, &argv);
parse_options(argc, argv);
fatal_ignore_sigpipe();
- daemonize_start();
+ daemonize_start(false);
retval = unixctl_server_create(NULL, &unixctl);
if (retval) {
}
unixctl_command_register("exit", "", 0, 0, ovn_controller_exit, &exiting);
+ /* Initialize group ids for loadbalancing. */
+ struct group_table group_table;
+ group_table.group_ids = bitmap_allocate(MAX_OVN_GROUPS);
+ bitmap_set1(group_table.group_ids, 0); /* Group id 0 is invalid. */
+ hmap_init(&group_table.desired_groups);
+ hmap_init(&group_table.existing_groups);
+
daemonize_complete();
ovsrec_init();
sbrec_init();
ofctrl_init();
+ pinctrl_init();
+ lflow_init();
+
+ lport_index_init(&lports);
+ mcgroup_index_init(&mcgroups);
/* Connect to OVS OVSDB instance. We do not monitor all tables by
* default, so modules must register their interest explicitly. */
- ctx.ovs_idl = ovsdb_idl_create(ovs_remote, &ovsrec_idl_class, false, true);
-
- /* Register interest in "external_ids" column in "Open_vSwitch" table,
- * since we'll need to get the OVN OVSDB remote. */
- ovsdb_idl_add_table(ctx.ovs_idl, &ovsrec_table_open_vswitch);
- ovsdb_idl_add_column(ctx.ovs_idl, &ovsrec_open_vswitch_col_external_ids);
+ struct ovsdb_idl_loop ovs_idl_loop = OVSDB_IDL_LOOP_INITIALIZER(
+ ovsdb_idl_create(ovs_remote, &ovsrec_idl_class, false, true));
+ ovsdb_idl_add_table(ovs_idl_loop.idl, &ovsrec_table_open_vswitch);
+ ovsdb_idl_add_column(ovs_idl_loop.idl,
+ &ovsrec_open_vswitch_col_external_ids);
+ ovsdb_idl_add_column(ovs_idl_loop.idl, &ovsrec_open_vswitch_col_bridges);
+ ovsdb_idl_add_table(ovs_idl_loop.idl, &ovsrec_table_interface);
+ ovsdb_idl_add_column(ovs_idl_loop.idl, &ovsrec_interface_col_name);
+ ovsdb_idl_add_column(ovs_idl_loop.idl, &ovsrec_interface_col_type);
+ ovsdb_idl_add_column(ovs_idl_loop.idl, &ovsrec_interface_col_options);
+ ovsdb_idl_add_table(ovs_idl_loop.idl, &ovsrec_table_port);
+ ovsdb_idl_add_column(ovs_idl_loop.idl, &ovsrec_port_col_name);
+ ovsdb_idl_add_column(ovs_idl_loop.idl, &ovsrec_port_col_interfaces);
+ ovsdb_idl_add_column(ovs_idl_loop.idl, &ovsrec_port_col_external_ids);
+ ovsdb_idl_add_table(ovs_idl_loop.idl, &ovsrec_table_bridge);
+ ovsdb_idl_add_column(ovs_idl_loop.idl, &ovsrec_bridge_col_ports);
+ ovsdb_idl_add_column(ovs_idl_loop.idl, &ovsrec_bridge_col_name);
+ ovsdb_idl_add_column(ovs_idl_loop.idl, &ovsrec_bridge_col_fail_mode);
+ ovsdb_idl_add_column(ovs_idl_loop.idl, &ovsrec_bridge_col_other_config);
+ chassis_register_ovs_idl(ovs_idl_loop.idl);
+ encaps_register_ovs_idl(ovs_idl_loop.idl);
+ binding_register_ovs_idl(ovs_idl_loop.idl);
+ physical_register_ovs_idl(ovs_idl_loop.idl);
+ ovsdb_idl_get_initial_snapshot(ovs_idl_loop.idl);
+
+ /* Connect to OVN SB database. */
+ char *ovnsb_remote = get_ovnsb_remote(ovs_idl_loop.idl);
+ struct ovsdb_idl_loop ovnsb_idl_loop = OVSDB_IDL_LOOP_INITIALIZER(
+ ovsdb_idl_create(ovnsb_remote, &sbrec_idl_class, true, true));
+
+ /* Track the southbound idl. */
+ ovsdb_idl_track_add_all(ovnsb_idl_loop.idl);
+
+ ovsdb_idl_get_initial_snapshot(ovnsb_idl_loop.idl);
+
+ /* Initialize connection tracking zones. */
+ struct simap ct_zones = SIMAP_INITIALIZER(&ct_zones);
+ unsigned long ct_zone_bitmap[BITMAP_N_LONGS(MAX_CT_ZONES)];
+ memset(ct_zone_bitmap, 0, sizeof ct_zone_bitmap);
+ bitmap_set1(ct_zone_bitmap, 0); /* Zone 0 is reserved. */
+ unixctl_command_register("ct-zone-list", "", 0, 0,
+ ct_zone_list, &ct_zones);
- chassis_init(&ctx);
- binding_init(&ctx);
- physical_init(&ctx);
- pipeline_init();
+ /* Main loop. */
+ exiting = false;
+ while (!exiting) {
+ /* Check OVN SB database. */
+ char *new_ovnsb_remote = get_ovnsb_remote(ovs_idl_loop.idl);
+ if (strcmp(ovnsb_remote, new_ovnsb_remote)) {
+ free(ovnsb_remote);
+ ovnsb_remote = new_ovnsb_remote;
+ ovsdb_idl_set_remote(ovnsb_idl_loop.idl, ovnsb_remote, true);
+ binding_reset_processing();
+ lport_index_clear(&lports);
+ mcgroup_index_clear(&mcgroups);
+ } else {
+ free(new_ovnsb_remote);
+ }
- get_initial_snapshot(ctx.ovs_idl);
+ struct controller_ctx ctx = {
+ .ovs_idl = ovs_idl_loop.idl,
+ .ovs_idl_txn = ovsdb_idl_loop_run(&ovs_idl_loop),
+ .ovnsb_idl = ovnsb_idl_loop.idl,
+ .ovnsb_idl_txn = ovsdb_idl_loop_run(&ovnsb_idl_loop),
+ };
- char *br_int_name;
- get_core_config(&ctx, &br_int_name);
+ update_probe_interval(&ctx);
- ctx.ovnsb_idl = ovsdb_idl_create(ovnsb_remote, &sbrec_idl_class,
- true, true);
- get_initial_snapshot(ctx.ovnsb_idl);
+ struct sset all_lports = SSET_INITIALIZER(&all_lports);
- struct idl_loop ovnsb_idl_loop = IDL_LOOP_INITIALIZER(ctx.ovnsb_idl);
- struct idl_loop ovs_idl_loop = IDL_LOOP_INITIALIZER(ctx.ovs_idl);
+ const struct ovsrec_bridge *br_int = get_br_int(&ctx);
+ const char *chassis_id = get_chassis_id(ctx.ovs_idl);
- /* Main loop. */
- exiting = false;
- while (!exiting) {
- ctx.ovnsb_idl_txn = idl_loop_run(&ovnsb_idl_loop);
- ctx.ovs_idl_txn = idl_loop_run(&ovs_idl_loop);
-
- /* xxx If run into any surprising changes, we exit. We should
- * xxx handle this more gracefully. */
- const struct ovsrec_bridge *br_int = get_bridge(&ctx, br_int_name);
- if (!br_int) {
- VLOG_ERR("Integration bridge '%s' disappeared", br_int_name);
- retval = EXIT_FAILURE;
- goto exit;
+ if (chassis_id) {
+ chassis_run(&ctx, chassis_id);
+ encaps_run(&ctx, br_int, chassis_id);
+ binding_run(&ctx, br_int, chassis_id, &local_datapaths);
}
- chassis_run(&ctx, br_int);
- binding_run(&ctx, br_int);
+ if (br_int && chassis_id) {
+ patch_run(&ctx, br_int, chassis_id, &local_datapaths,
+ &patched_datapaths);
+
+ lport_index_fill(&lports, ctx.ovnsb_idl);
+ mcgroup_index_fill(&mcgroups, ctx.ovnsb_idl);
+
+ enum mf_field_id mff_ovn_geneve = ofctrl_run(br_int);
+
+ pinctrl_run(&ctx, &lports, br_int, chassis_id, &local_datapaths);
+ update_ct_zones(&all_lports, &patched_datapaths, &ct_zones,
+ ct_zone_bitmap);
+
+ lflow_run(&ctx, &lports, &mcgroups, &local_datapaths,
+ &patched_datapaths, &group_table, &ct_zones);
+ if (chassis_id) {
+ physical_run(&ctx, mff_ovn_geneve,
+ br_int, chassis_id, &ct_zones,
+ &local_datapaths, &patched_datapaths);
+ }
+ ofctrl_put(&group_table);
+ }
- struct hmap flow_table = HMAP_INITIALIZER(&flow_table);
- pipeline_run(&ctx, &flow_table);
- physical_run(&ctx, br_int, &flow_table);
- ofctrl_run(br_int, &flow_table);
- hmap_destroy(&flow_table);
+ sset_destroy(&all_lports);
unixctl_server_run(unixctl);
poll_immediate_wake();
}
- idl_loop_commit_and_wait(&ovnsb_idl_loop);
- idl_loop_commit_and_wait(&ovs_idl_loop);
-
- ofctrl_wait();
+ if (br_int) {
+ ofctrl_wait();
+ pinctrl_wait(&ctx);
+ }
+ ovsdb_idl_loop_commit_and_wait(&ovnsb_idl_loop);
+ ovsdb_idl_loop_commit_and_wait(&ovs_idl_loop);
+ ovsdb_idl_track_clear(ovnsb_idl_loop.idl);
poll_block();
+ if (should_service_stop()) {
+ exiting = true;
+ }
}
/* It's time to exit. Clean up the databases. */
bool done = false;
while (!done) {
- ctx.ovnsb_idl_txn = idl_loop_run(&ovnsb_idl_loop);
- ctx.ovs_idl_txn = idl_loop_run(&ovs_idl_loop);
-
- /* xxx If run into any surprising changes, we exit. We should
- * xxx handle this more gracefully. */
- const struct ovsrec_bridge *br_int = get_bridge(&ctx, br_int_name);
- if (!br_int) {
- VLOG_ERR("Integration bridge '%s' disappeared", br_int_name);
- retval = EXIT_FAILURE;
- goto exit;
- }
-
- /* Run both the binding and chassis cleanup, even if one of them
- * returns false. We're done if both return true. */
- done = binding_cleanup(&ctx);
- done = chassis_cleanup(&ctx, br_int) && done;
+ struct controller_ctx ctx = {
+ .ovs_idl = ovs_idl_loop.idl,
+ .ovs_idl_txn = ovsdb_idl_loop_run(&ovs_idl_loop),
+ .ovnsb_idl = ovnsb_idl_loop.idl,
+ .ovnsb_idl_txn = ovsdb_idl_loop_run(&ovnsb_idl_loop),
+ };
+
+ const struct ovsrec_bridge *br_int = get_br_int(&ctx);
+ const char *chassis_id = get_chassis_id(ctx.ovs_idl);
+
+ /* Run all of the cleanup functions, even if one of them returns false.
+ * We're done if all of them return true. */
+ done = binding_cleanup(&ctx, chassis_id);
+ done = chassis_cleanup(&ctx, chassis_id) && done;
+ done = encaps_cleanup(&ctx, br_int) && done;
if (done) {
poll_immediate_wake();
}
- idl_loop_commit_and_wait(&ovnsb_idl_loop);
- idl_loop_commit_and_wait(&ovs_idl_loop);
+ ovsdb_idl_loop_commit_and_wait(&ovnsb_idl_loop);
+ ovsdb_idl_loop_commit_and_wait(&ovs_idl_loop);
poll_block();
}
-exit:
unixctl_server_destroy(unixctl);
- pipeline_destroy(&ctx);
+ lflow_destroy();
ofctrl_destroy();
+ pinctrl_destroy();
+
+ simap_destroy(&ct_zones);
+
+ bitmap_free(group_table.group_ids);
+ hmap_destroy(&group_table.desired_groups);
- idl_loop_destroy(&ovs_idl_loop);
- idl_loop_destroy(&ovnsb_idl_loop);
+ struct group_info *installed, *next_group;
+ HMAP_FOR_EACH_SAFE(installed, next_group, hmap_node,
+ &group_table.existing_groups) {
+ hmap_remove(&group_table.existing_groups, &installed->hmap_node);
+ ds_destroy(&installed->group);
+ free(installed);
+ }
+ hmap_destroy(&group_table.existing_groups);
+
+ ovsdb_idl_loop_destroy(&ovs_idl_loop);
+ ovsdb_idl_loop_destroy(&ovnsb_idl_loop);
- free(br_int_name);
- free(ctx.chassis_id);
free(ovnsb_remote);
free(ovs_remote);
+ service_stop();
exit(retval);
}
{
enum {
OPT_PEER_CA_CERT = UCHAR_MAX + 1,
+ OPT_BOOTSTRAP_CA_CERT,
VLOG_OPTION_ENUMS,
DAEMON_OPTION_ENUMS
};
DAEMON_LONG_OPTIONS,
STREAM_SSL_LONG_OPTIONS,
{"peer-ca-cert", required_argument, NULL, OPT_PEER_CA_CERT},
+ {"bootstrap-ca-cert", required_argument, NULL, OPT_BOOTSTRAP_CA_CERT},
{NULL, 0, NULL, 0}
};
char *short_options = ovs_cmdl_long_options_to_short_options(long_options);
stream_ssl_set_peer_ca_cert_file(optarg);
break;
+ case OPT_BOOTSTRAP_CA_CERT:
+ stream_ssl_set_ca_cert_file(optarg, true);
+ break;
+
case '?':
exit(EXIT_FAILURE);
unixctl_command_reply(conn, NULL);
}
+
+static void
+ct_zone_list(struct unixctl_conn *conn, int argc OVS_UNUSED,
+ const char *argv[] OVS_UNUSED, void *ct_zones_)
+{
+ struct simap *ct_zones = ct_zones_;
+ struct ds ds = DS_EMPTY_INITIALIZER;
+ struct simap_node *zone;
+
+ SIMAP_FOR_EACH(zone, ct_zones) {
+ ds_put_format(&ds, "%s %d\n", zone->name, zone->data);
+ }
+
+ unixctl_command_reply(conn, ds_cstr(&ds));
+ ds_destroy(&ds);
+}
+
+/* Get the desired SB probe timer from the OVS database and configure it into
+ * the SB database. */
+static void
+update_probe_interval(struct controller_ctx *ctx)
+{
+ const struct ovsrec_open_vswitch *cfg
+ = ovsrec_open_vswitch_first(ctx->ovs_idl);
+ int interval = (cfg
+ ? smap_get_int(&cfg->external_ids,
+ "ovn-remote-probe-interval",
+ DEFAULT_PROBE_INTERVAL_MSEC)
+ : DEFAULT_PROBE_INTERVAL_MSEC);
+ ovsdb_idl_set_probe_interval(ctx->ovnsb_idl, interval);
+}
projects / cascardo / ovs.git / blobdiff