#define CTDB_ARP_INTERVAL 1
#define CTDB_ARP_REPEAT 3
+struct ctdb_iface {
+ struct ctdb_iface *prev, *next;
+ const char *name;
+ bool link_up;
+ uint32_t references;
+};
+
+static const char *ctdb_vnn_iface_string(const struct ctdb_vnn *vnn)
+{
+ if (vnn->iface) {
+ return vnn->iface->name;
+ }
+
+ return "__none__";
+}
+
+static int ctdb_add_local_iface(struct ctdb_context *ctdb, const char *iface)
+{
+ struct ctdb_iface *i;
+
+ /* Verify that we dont have an entry for this ip yet */
+ for (i=ctdb->ifaces;i;i=i->next) {
+ if (strcmp(i->name, iface) == 0) {
+ return 0;
+ }
+ }
+
+ /* create a new structure for this interface */
+ i = talloc_zero(ctdb, struct ctdb_iface);
+ CTDB_NO_MEMORY_FATAL(ctdb, i);
+ i->name = talloc_strdup(i, iface);
+ CTDB_NO_MEMORY(ctdb, i->name);
+ i->link_up = false;
+
+ DLIST_ADD(ctdb->ifaces, i);
+
+ return 0;
+}
+
+static struct ctdb_iface *ctdb_find_iface(struct ctdb_context *ctdb,
+ const char *iface)
+{
+ struct ctdb_iface *i;
+
+ /* Verify that we dont have an entry for this ip yet */
+ for (i=ctdb->ifaces;i;i=i->next) {
+ if (strcmp(i->name, iface) == 0) {
+ return i;
+ }
+ }
+
+ return NULL;
+}
+
+static struct ctdb_iface *ctdb_vnn_best_iface(struct ctdb_context *ctdb,
+ struct ctdb_vnn *vnn)
+{
+ int i;
+ struct ctdb_iface *cur = NULL;
+ struct ctdb_iface *best = NULL;
+
+ for (i=0; vnn->ifaces[i]; i++) {
+
+ cur = ctdb_find_iface(ctdb, vnn->ifaces[i]);
+ if (cur == NULL) {
+ continue;
+ }
+
+ if (!cur->link_up) {
+ continue;
+ }
+
+ if (best == NULL) {
+ best = cur;
+ continue;
+ }
+
+ if (cur->references < best->references) {
+ best = cur;
+ continue;
+ }
+ }
+
+ return best;
+}
+
+static int32_t ctdb_vnn_assign_iface(struct ctdb_context *ctdb,
+ struct ctdb_vnn *vnn)
+{
+ struct ctdb_iface *best = NULL;
+
+ if (vnn->iface) {
+ DEBUG(DEBUG_INFO, (__location__ " public address '%s' "
+ "still assigned to iface '%s'\n",
+ ctdb_addr_to_str(&vnn->public_address),
+ ctdb_vnn_iface_string(vnn)));
+ return 0;
+ }
+
+ best = ctdb_vnn_best_iface(ctdb, vnn);
+ if (best == NULL) {
+ DEBUG(DEBUG_ERR, (__location__ " public address '%s' "
+ "cannot assign to iface any iface\n",
+ ctdb_addr_to_str(&vnn->public_address)));
+ return -1;
+ }
+
+ vnn->iface = best;
+ best->references++;
+ vnn->pnn = ctdb->pnn;
+
+ DEBUG(DEBUG_INFO, (__location__ " public address '%s' "
+ "now assigned to iface '%s' refs[%d]\n",
+ ctdb_addr_to_str(&vnn->public_address),
+ ctdb_vnn_iface_string(vnn),
+ best->references));
+ return 0;
+}
+
+static void ctdb_vnn_unassign_iface(struct ctdb_context *ctdb,
+ struct ctdb_vnn *vnn)
+{
+ DEBUG(DEBUG_INFO, (__location__ " public address '%s' "
+ "now unassigned (old iface '%s' refs[%d])\n",
+ ctdb_addr_to_str(&vnn->public_address),
+ ctdb_vnn_iface_string(vnn),
+ vnn->iface?vnn->iface->references:0));
+ if (vnn->iface) {
+ vnn->iface->references--;
+ }
+ vnn->iface = NULL;
+ if (vnn->pnn == ctdb->pnn) {
+ vnn->pnn = -1;
+ }
+}
+
+static bool ctdb_vnn_available(struct ctdb_context *ctdb,
+ struct ctdb_vnn *vnn)
+{
+ int i;
+
+ if (vnn->iface && vnn->iface->link_up) {
+ return true;
+ }
+
+ for (i=0; vnn->ifaces[i]; i++) {
+ struct ctdb_iface *cur;
+
+ cur = ctdb_find_iface(ctdb, vnn->ifaces[i]);
+ if (cur == NULL) {
+ continue;
+ }
+
+ if (cur->link_up) {
+ return true;
+ }
+ }
+
+ return false;
+}
+
struct ctdb_takeover_arp {
struct ctdb_context *ctdb;
uint32_t count;
struct ctdb_takeover_arp);
int i, ret;
struct ctdb_tcp_array *tcparray;
+ const char *iface = ctdb_vnn_iface_string(arp->vnn);
- ret = ctdb_sys_send_arp(&arp->addr, arp->vnn->iface);
+ ret = ctdb_sys_send_arp(&arp->addr, iface);
if (ret != 0) {
- DEBUG(DEBUG_CRIT,(__location__ " sending of arp failed (%s)\n", strerror(errno)));
+ DEBUG(DEBUG_CRIT,(__location__ " sending of arp failed on iface '%s' (%s)\n",
+ iface, strerror(errno)));
}
tcparray = arp->tcparray;
}
event_add_timed(arp->ctdb->ev, arp->vnn->takeover_ctx,
- timeval_current_ofs(CTDB_ARP_INTERVAL, 0),
+ timeval_current_ofs(CTDB_ARP_INTERVAL, 100000),
ctdb_control_send_arp, arp);
}
+static int32_t ctdb_announce_vnn_iface(struct ctdb_context *ctdb,
+ struct ctdb_vnn *vnn)
+{
+ struct ctdb_takeover_arp *arp;
+ struct ctdb_tcp_array *tcparray;
+
+ if (!vnn->takeover_ctx) {
+ vnn->takeover_ctx = talloc_new(vnn);
+ if (!vnn->takeover_ctx) {
+ return -1;
+ }
+ }
+
+ arp = talloc_zero(vnn->takeover_ctx, struct ctdb_takeover_arp);
+ if (!arp) {
+ return -1;
+ }
+
+ arp->ctdb = ctdb;
+ arp->addr = vnn->public_address;
+ arp->vnn = vnn;
+
+ tcparray = vnn->tcp_array;
+ if (tcparray) {
+ /* add all of the known tcp connections for this IP to the
+ list of tcp connections to send tickle acks for */
+ arp->tcparray = talloc_steal(arp, tcparray);
+
+ vnn->tcp_array = NULL;
+ vnn->tcp_update_needed = true;
+ }
+
+ event_add_timed(arp->ctdb->ev, vnn->takeover_ctx,
+ timeval_zero(), ctdb_control_send_arp, arp);
+
+ return 0;
+}
+
struct takeover_callback_state {
struct ctdb_req_control *c;
ctdb_sock_addr *addr;
struct ctdb_vnn *vnn;
};
+struct ctdb_do_takeip_state {
+ struct ctdb_req_control *c;
+ struct ctdb_vnn *vnn;
+};
+
/*
called when takeip event finishes
*/
-static void takeover_ip_callback(struct ctdb_context *ctdb, int status,
- void *private_data)
+static void ctdb_do_takeip_callback(struct ctdb_context *ctdb, int status,
+ void *private_data)
{
- struct takeover_callback_state *state =
- talloc_get_type(private_data, struct takeover_callback_state);
- struct ctdb_takeover_arp *arp;
- struct ctdb_tcp_array *tcparray;
+ struct ctdb_do_takeip_state *state =
+ talloc_get_type(private_data, struct ctdb_do_takeip_state);
+ int32_t ret;
if (status != 0) {
+ if (status == -ETIME) {
+ ctdb_ban_self(ctdb);
+ }
DEBUG(DEBUG_ERR,(__location__ " Failed to takeover IP %s on interface %s\n",
- ctdb_addr_to_str(state->addr),
- state->vnn->iface));
+ ctdb_addr_to_str(&state->vnn->public_address),
+ ctdb_vnn_iface_string(state->vnn)));
ctdb_request_control_reply(ctdb, state->c, NULL, status, NULL);
talloc_free(state);
return;
}
- if (!state->vnn->takeover_ctx) {
- state->vnn->takeover_ctx = talloc_new(ctdb);
- if (!state->vnn->takeover_ctx) {
- goto failed;
- }
+ ret = ctdb_announce_vnn_iface(ctdb, state->vnn);
+ if (ret != 0) {
+ ctdb_request_control_reply(ctdb, state->c, NULL, -1, NULL);
+ talloc_free(state);
+ return;
}
- arp = talloc_zero(state->vnn->takeover_ctx, struct ctdb_takeover_arp);
- if (!arp) goto failed;
-
- arp->ctdb = ctdb;
- arp->addr = *state->addr;
- arp->vnn = state->vnn;
+ /* the control succeeded */
+ ctdb_request_control_reply(ctdb, state->c, NULL, 0, NULL);
+ talloc_free(state);
+ return;
+}
- tcparray = state->vnn->tcp_array;
- if (tcparray) {
- /* add all of the known tcp connections for this IP to the
- list of tcp connections to send tickle acks for */
- arp->tcparray = talloc_steal(arp, tcparray);
+/*
+ take over an ip address
+ */
+static int32_t ctdb_do_takeip(struct ctdb_context *ctdb,
+ struct ctdb_req_control *c,
+ struct ctdb_vnn *vnn)
+{
+ int ret;
+ struct ctdb_do_takeip_state *state;
- state->vnn->tcp_array = NULL;
- state->vnn->tcp_update_needed = true;
+ ret = ctdb_vnn_assign_iface(ctdb, vnn);
+ if (ret != 0) {
+ DEBUG(DEBUG_ERR,("Takeover of IP %s/%u failed to "
+ "assin a usable interface\n",
+ ctdb_addr_to_str(&vnn->public_address),
+ vnn->public_netmask_bits));
+ return -1;
}
- event_add_timed(arp->ctdb->ev, state->vnn->takeover_ctx,
- timeval_zero(), ctdb_control_send_arp, arp);
+ state = talloc(vnn, struct ctdb_do_takeip_state);
+ CTDB_NO_MEMORY(ctdb, state);
+
+ state->c = talloc_steal(ctdb, c);
+ state->vnn = vnn;
+
+ DEBUG(DEBUG_NOTICE,("Takeover of IP %s/%u on interface %s\n",
+ ctdb_addr_to_str(&vnn->public_address),
+ vnn->public_netmask_bits,
+ ctdb_vnn_iface_string(vnn)));
+
+ ret = ctdb_event_script_callback(ctdb,
+ state,
+ ctdb_do_takeip_callback,
+ state,
+ false,
+ CTDB_EVENT_TAKE_IP,
+ "%s %s %u",
+ ctdb_vnn_iface_string(vnn),
+ ctdb_addr_to_str(&vnn->public_address),
+ vnn->public_netmask_bits);
+
+ if (ret != 0) {
+ DEBUG(DEBUG_ERR,(__location__ " Failed to takeover IP %s on interface %s\n",
+ ctdb_addr_to_str(&vnn->public_address),
+ ctdb_vnn_iface_string(vnn)));
+ talloc_free(state);
+ return -1;
+ }
+
+ return 0;
+}
+
+struct ctdb_do_updateip_state {
+ struct ctdb_req_control *c;
+ struct ctdb_iface *old;
+ struct ctdb_vnn *vnn;
+};
+
+/*
+ called when updateip event finishes
+ */
+static void ctdb_do_updateip_callback(struct ctdb_context *ctdb, int status,
+ void *private_data)
+{
+ struct ctdb_do_updateip_state *state =
+ talloc_get_type(private_data, struct ctdb_do_updateip_state);
+ int32_t ret;
+
+ if (status != 0) {
+ if (status == -ETIME) {
+ ctdb_ban_self(ctdb);
+ }
+ DEBUG(DEBUG_ERR,(__location__ " Failed to move IP %s from interface %s to %s\n",
+ ctdb_addr_to_str(&state->vnn->public_address),
+ state->old->name,
+ ctdb_vnn_iface_string(state->vnn)));
+
+ /*
+ * All we can do is reset the old interface
+ * and let the next run fix it
+ */
+ ctdb_vnn_unassign_iface(ctdb, state->vnn);
+ state->vnn->iface = state->old;
+ state->vnn->iface->references++;
+
+ ctdb_request_control_reply(ctdb, state->c, NULL, status, NULL);
+ talloc_free(state);
+ return;
+ }
+
+ ret = ctdb_announce_vnn_iface(ctdb, state->vnn);
+ if (ret != 0) {
+ ctdb_request_control_reply(ctdb, state->c, NULL, -1, NULL);
+ talloc_free(state);
+ return;
+ }
/* the control succeeded */
ctdb_request_control_reply(ctdb, state->c, NULL, 0, NULL);
talloc_free(state);
return;
+}
-failed:
- ctdb_request_control_reply(ctdb, state->c, NULL, -1, NULL);
- talloc_free(state);
- return;
+/*
+ update (move) an ip address
+ */
+static int32_t ctdb_do_updateip(struct ctdb_context *ctdb,
+ struct ctdb_req_control *c,
+ struct ctdb_vnn *vnn)
+{
+ int ret;
+ struct ctdb_do_updateip_state *state;
+ struct ctdb_iface *old = vnn->iface;
+
+ ctdb_vnn_unassign_iface(ctdb, vnn);
+ ret = ctdb_vnn_assign_iface(ctdb, vnn);
+ if (ret != 0) {
+ DEBUG(DEBUG_ERR,("update of IP %s/%u failed to "
+ "assin a usable interface (old iface '%s')\n",
+ ctdb_addr_to_str(&vnn->public_address),
+ vnn->public_netmask_bits,
+ old->name));
+ return -1;
+ }
+
+ if (vnn->iface == old) {
+ DEBUG(DEBUG_ERR,("update of IP %s/%u trying to "
+ "assin a same interface '%s'\n",
+ ctdb_addr_to_str(&vnn->public_address),
+ vnn->public_netmask_bits,
+ old->name));
+ return -1;
+ }
+
+ state = talloc(vnn, struct ctdb_do_updateip_state);
+ CTDB_NO_MEMORY(ctdb, state);
+
+ state->c = talloc_steal(ctdb, c);
+ state->old = old;
+ state->vnn = vnn;
+
+ DEBUG(DEBUG_NOTICE,("Update of IP %s/%u from "
+ "interface %s to %s\n",
+ ctdb_addr_to_str(&vnn->public_address),
+ vnn->public_netmask_bits,
+ old->name,
+ ctdb_vnn_iface_string(vnn)));
+
+ ret = ctdb_event_script_callback(ctdb,
+ state,
+ ctdb_do_updateip_callback,
+ state,
+ false,
+ CTDB_EVENT_UPDATE_IP,
+ "%s %s %s %u",
+ state->old->name,
+ ctdb_vnn_iface_string(vnn),
+ ctdb_addr_to_str(&vnn->public_address),
+ vnn->public_netmask_bits);
+ if (ret != 0) {
+ DEBUG(DEBUG_ERR,(__location__ " Failed update IP %s from interface %s to %s\n",
+ ctdb_addr_to_str(&vnn->public_address),
+ old->name, ctdb_vnn_iface_string(vnn)));
+ talloc_free(state);
+ return -1;
+ }
+
+ return 0;
}
/*
return NULL;
}
-
/*
take over an ip address
*/
-int32_t ctdb_control_takeover_ip(struct ctdb_context *ctdb,
+int32_t ctdb_control_takeover_ip(struct ctdb_context *ctdb,
struct ctdb_req_control *c,
- TDB_DATA indata,
+ TDB_DATA indata,
bool *async_reply)
{
int ret;
- struct takeover_callback_state *state;
struct ctdb_public_ip *pip = (struct ctdb_public_ip *)indata.dptr;
struct ctdb_vnn *vnn;
+ bool have_ip = false;
+ bool do_updateip = false;
+ bool do_takeip = false;
+ struct ctdb_iface *best_iface = NULL;
+
+ if (pip->pnn != ctdb->pnn) {
+ DEBUG(DEBUG_ERR,(__location__" takeoverip called for an ip '%s' "
+ "with pnn %d, but we're node %d\n",
+ ctdb_addr_to_str(&pip->addr),
+ pip->pnn, ctdb->pnn));
+ return -1;
+ }
/* update out vnn list */
vnn = find_public_ip_vnn(ctdb, &pip->addr);
if (vnn == NULL) {
- DEBUG(DEBUG_ERR,("takeoverip called for an ip '%s' that is not a public address\n",
+ DEBUG(DEBUG_INFO,("takeoverip called for an ip '%s' that is not a public address\n",
ctdb_addr_to_str(&pip->addr)));
return 0;
}
- vnn->pnn = pip->pnn;
- /* if our kernel already has this IP, do nothing */
- if (ctdb_sys_have_ip(&pip->addr)) {
- return 0;
+ have_ip = ctdb_sys_have_ip(&pip->addr);
+ best_iface = ctdb_vnn_best_iface(ctdb, vnn);
+ if (best_iface == NULL) {
+ DEBUG(DEBUG_ERR,("takeoverip of IP %s/%u failed to find"
+ "a usable interface (old %s, have_ip %d)\n",
+ ctdb_addr_to_str(&vnn->public_address),
+ vnn->public_netmask_bits,
+ ctdb_vnn_iface_string(vnn),
+ have_ip));
+ return -1;
}
- state = talloc(ctdb, struct takeover_callback_state);
- CTDB_NO_MEMORY(ctdb, state);
-
- state->c = talloc_steal(ctdb, c);
- state->addr = talloc(ctdb, ctdb_sock_addr);
- CTDB_NO_MEMORY(ctdb, state->addr);
+ if (vnn->iface == NULL && have_ip) {
+ DEBUG(DEBUG_CRIT,(__location__ " takeoverip of IP %s is known to the kernel, "
+ "but we have no interface assigned, has someone manually configured it?"
+ "banning ourself\n",
+ ctdb_addr_to_str(&vnn->public_address)));
+ ctdb_ban_self(ctdb);
+ return -1;
+ }
- *state->addr = pip->addr;
- state->vnn = vnn;
+ if (vnn->pnn != ctdb->pnn && have_ip) {
+ DEBUG(DEBUG_CRIT,(__location__ " takeoverip of IP %s is known to the kernel, "
+ "and we have it on iface[%s], but it was assigned to node %d"
+ "and we are node %d, banning ourself\n",
+ ctdb_addr_to_str(&vnn->public_address),
+ ctdb_vnn_iface_string(vnn), vnn->pnn, ctdb->pnn));
+ ctdb_ban_self(ctdb);
+ return -1;
+ }
- DEBUG(DEBUG_NOTICE,("Takeover of IP %s/%u on interface %s\n",
- ctdb_addr_to_str(&pip->addr),
- vnn->public_netmask_bits,
- vnn->iface));
+ if (vnn->iface) {
+ if (vnn->iface->link_up) {
+ /* only move when the rebalance gains something */
+ if (vnn->iface->references > (best_iface->references + 1)) {
+ do_updateip = true;
+ }
+ } else if (vnn->iface != best_iface) {
+ do_updateip = true;
+ }
+ }
- ret = ctdb_event_script_callback(ctdb,
- timeval_current_ofs(ctdb->tunable.script_timeout, 0),
- state, takeover_ip_callback, state,
- "takeip %s %s %u",
- vnn->iface,
- talloc_strdup(state, ctdb_addr_to_str(&pip->addr)),
- vnn->public_netmask_bits);
+ if (!have_ip) {
+ if (do_updateip) {
+ ctdb_vnn_unassign_iface(ctdb, vnn);
+ do_updateip = false;
+ }
+ do_takeip = true;
+ }
- if (ret != 0) {
- DEBUG(DEBUG_ERR,(__location__ " Failed to takeover IP %s on interface %s\n",
+ if (do_takeip) {
+ ret = ctdb_do_takeip(ctdb, c, vnn);
+ if (ret != 0) {
+ return -1;
+ }
+ } else if (do_updateip) {
+ ret = ctdb_do_updateip(ctdb, c, vnn);
+ if (ret != 0) {
+ return -1;
+ }
+ } else {
+ /*
+ * The interface is up and the kernel known the ip
+ * => do nothing
+ */
+ DEBUG(DEBUG_INFO,("Redundant takeover of IP %s/%u on interface %s (ip already held)\n",
ctdb_addr_to_str(&pip->addr),
- vnn->iface));
- talloc_free(state);
- return -1;
+ vnn->public_netmask_bits,
+ ctdb_vnn_iface_string(vnn)));
+ return 0;
}
/* tell ctdb_control.c that we will be replying asynchronously */
talloc_get_type(private_data, struct takeover_callback_state);
TDB_DATA data;
+ if (status == -ETIME) {
+ ctdb_ban_self(ctdb);
+ }
+
/* send a message to all clients of this node telling them
that the cluster has been reconfigured and they should
release any sockets on this IP */
data.dptr = (uint8_t *)talloc_strdup(state, ctdb_addr_to_str(state->addr));
+ CTDB_NO_MEMORY_VOID(ctdb, data.dptr);
data.dsize = strlen((char *)data.dptr)+1;
DEBUG(DEBUG_INFO,(__location__ " sending RELEASE_IP for '%s'\n", data.dptr));
/* kill clients that have registered with this IP */
release_kill_clients(ctdb, state->addr);
-
+
+ ctdb_vnn_unassign_iface(ctdb, state->vnn);
+
/* the control succeeded */
ctdb_request_control_reply(ctdb, state->c, NULL, 0, NULL);
talloc_free(state);
/* update our vnn list */
vnn = find_public_ip_vnn(ctdb, &pip->addr);
if (vnn == NULL) {
- DEBUG(DEBUG_ERR,("takeoverip called for an ip '%s' that is not a public address\n",
+ DEBUG(DEBUG_INFO,("releaseip called for an ip '%s' that is not a public address\n",
ctdb_addr_to_str(&pip->addr)));
return 0;
}
vnn->takeover_ctx = NULL;
if (!ctdb_sys_have_ip(&pip->addr)) {
- DEBUG(DEBUG_INFO,("Redundant release of IP %s/%u on interface %s (ip not held)\n",
+ DEBUG(DEBUG_DEBUG,("Redundant release of IP %s/%u on interface %s (ip not held)\n",
ctdb_addr_to_str(&pip->addr),
vnn->public_netmask_bits,
- vnn->iface));
+ ctdb_vnn_iface_string(vnn)));
+ ctdb_vnn_unassign_iface(ctdb, vnn);
return 0;
}
- DEBUG(DEBUG_NOTICE,("Release of IP %s/%u on interface %s\n",
+ if (vnn->iface == NULL) {
+ DEBUG(DEBUG_CRIT,(__location__ " release_ip of IP %s is known to the kernel, "
+ "but we have no interface assigned, has someone manually configured it?"
+ "banning ourself\n",
+ ctdb_addr_to_str(&vnn->public_address)));
+ ctdb_ban_self(ctdb);
+ return -1;
+ }
+
+ DEBUG(DEBUG_NOTICE,("Release of IP %s/%u on interface %s node:%d\n",
ctdb_addr_to_str(&pip->addr),
vnn->public_netmask_bits,
- vnn->iface));
+ ctdb_vnn_iface_string(vnn),
+ pip->pnn));
state = talloc(ctdb, struct takeover_callback_state);
CTDB_NO_MEMORY(ctdb, state);
state->vnn = vnn;
ret = ctdb_event_script_callback(ctdb,
- timeval_current_ofs(ctdb->tunable.script_timeout, 0),
state, release_ip_callback, state,
- "releaseip %s %s %u",
- vnn->iface,
- talloc_strdup(state, ctdb_addr_to_str(&pip->addr)),
+ false,
+ CTDB_EVENT_RELEASE_IP,
+ "%s %s %u",
+ ctdb_vnn_iface_string(vnn),
+ ctdb_addr_to_str(&pip->addr),
vnn->public_netmask_bits);
if (ret != 0) {
DEBUG(DEBUG_ERR,(__location__ " Failed to release IP %s on interface %s\n",
ctdb_addr_to_str(&pip->addr),
- vnn->iface));
+ ctdb_vnn_iface_string(vnn)));
talloc_free(state);
return -1;
}
}
-static int ctdb_add_public_address(struct ctdb_context *ctdb, ctdb_sock_addr *addr, unsigned mask, const char *iface)
+static int ctdb_add_public_address(struct ctdb_context *ctdb,
+ ctdb_sock_addr *addr,
+ unsigned mask, const char *ifaces)
{
struct ctdb_vnn *vnn;
+ uint32_t num = 0;
+ char *tmp;
+ const char *iface;
+ int i;
+ int ret;
/* Verify that we dont have an entry for this ip yet */
for (vnn=ctdb->vnn;vnn;vnn=vnn->next) {
/* create a new vnn structure for this ip address */
vnn = talloc_zero(ctdb, struct ctdb_vnn);
CTDB_NO_MEMORY_FATAL(ctdb, vnn);
- vnn->iface = talloc_strdup(vnn, iface);
+ vnn->ifaces = talloc_array(vnn, const char *, num + 2);
+ tmp = talloc_strdup(vnn, ifaces);
+ CTDB_NO_MEMORY_FATAL(ctdb, tmp);
+ for (iface = strtok(tmp, ","); iface; iface = strtok(NULL, ",")) {
+ vnn->ifaces = talloc_realloc(vnn, vnn->ifaces, const char *, num + 2);
+ CTDB_NO_MEMORY_FATAL(ctdb, vnn->ifaces);
+ vnn->ifaces[num] = talloc_strdup(vnn, iface);
+ CTDB_NO_MEMORY_FATAL(ctdb, vnn->ifaces[num]);
+ num++;
+ }
+ talloc_free(tmp);
+ vnn->ifaces[num] = NULL;
vnn->public_address = *addr;
vnn->public_netmask_bits = mask;
vnn->pnn = -1;
-
+
+ for (i=0; vnn->ifaces[i]; i++) {
+ ret = ctdb_add_local_iface(ctdb, vnn->ifaces[i]);
+ if (ret != 0) {
+ DEBUG(DEBUG_CRIT, (__location__ " failed to add iface[%s] "
+ "for public_address[%s]\n",
+ vnn->ifaces[i], ctdb_addr_to_str(addr)));
+ talloc_free(vnn);
+ return -1;
+ }
+ }
+
DLIST_ADD(ctdb->vnn, vnn);
return 0;
}
-
/*
setup the event script directory
*/
for (i=0;i<nlines;i++) {
unsigned mask;
ctdb_sock_addr addr;
- const char *iface;
+ const char *addrstr;
+ const char *ifaces;
char *tok, *line;
line = lines[i];
continue;
}
tok = strtok(line, " \t");
- if (!tok || !parse_ip_mask(tok, &addr, &mask)) {
- DEBUG(DEBUG_CRIT,("Badly formed line %u in public address list\n", i+1));
- talloc_free(lines);
- return -1;
- }
+ addrstr = tok;
tok = strtok(NULL, " \t");
if (tok == NULL) {
if (NULL == ctdb->default_public_interface) {
talloc_free(lines);
return -1;
}
- iface = ctdb->default_public_interface;
+ ifaces = ctdb->default_public_interface;
} else {
- iface = tok;
+ ifaces = tok;
}
- if (ctdb_add_public_address(ctdb, &addr, mask, iface)) {
+ if (!addrstr || !parse_ip_mask(addrstr, ifaces, &addr, &mask)) {
+ DEBUG(DEBUG_CRIT,("Badly formed line %u in public address list\n", i+1));
+ talloc_free(lines);
+ return -1;
+ }
+ if (ctdb_add_public_address(ctdb, &addr, mask, ifaces)) {
DEBUG(DEBUG_CRIT,("Failed to add line %u to the public address list\n", i+1));
talloc_free(lines);
return -1;
return 0;
}
+int ctdb_set_single_public_ip(struct ctdb_context *ctdb,
+ const char *iface,
+ const char *ip)
+{
+ struct ctdb_vnn *svnn;
+ bool ok;
+ int ret;
+ svnn = talloc_zero(ctdb, struct ctdb_vnn);
+ CTDB_NO_MEMORY(ctdb, svnn);
+ svnn->ifaces = talloc_array(svnn, const char *, 2);
+ CTDB_NO_MEMORY(ctdb, svnn->ifaces);
+ svnn->ifaces[0] = talloc_strdup(svnn->ifaces, iface);
+ CTDB_NO_MEMORY(ctdb, svnn->ifaces[0]);
+ svnn->ifaces[1] = NULL;
+
+ ok = parse_ip(ip, iface, 0, &svnn->public_address);
+ if (!ok) {
+ talloc_free(svnn);
+ return -1;
+ }
+
+ ret = ctdb_add_local_iface(ctdb, svnn->ifaces[0]);
+ if (ret != 0) {
+ DEBUG(DEBUG_CRIT, (__location__ " failed to add iface[%s] "
+ "for single_ip[%s]\n",
+ svnn->ifaces[0],
+ ctdb_addr_to_str(&svnn->public_address)));
+ talloc_free(svnn);
+ return -1;
+ }
+
+ ret = ctdb_vnn_assign_iface(ctdb, svnn);
+ if (ret != 0) {
+ talloc_free(svnn);
+ return -1;
+ }
+
+ ctdb->single_ip_vnn = svnn;
+ return 0;
+}
struct ctdb_public_ip_list {
struct ctdb_public_ip_list *next;
struct ctdb_all_public_ips *public_ips;
int i;
- public_ips = ctdb->nodes[pnn]->public_ips;
+ public_ips = ctdb->nodes[pnn]->available_public_ips;
if (public_ips == NULL) {
return -1;
return 0;
}
-struct ctdb_public_ip_list *
-add_ip_to_merged_list(struct ctdb_context *ctdb,
- TALLOC_CTX *tmp_ctx,
- struct ctdb_public_ip_list *ip_list,
- struct ctdb_public_ip *ip)
+#define IP_KEYLEN 4
+static uint32_t *ip_key(ctdb_sock_addr *ip)
{
- struct ctdb_public_ip_list *tmp_ip;
+ static uint32_t key[IP_KEYLEN];
- /* do we already have this ip in our merged list ?*/
- for (tmp_ip=ip_list;tmp_ip;tmp_ip=tmp_ip->next) {
+ bzero(key, sizeof(key));
- /* we already have this public ip in the list */
- if (ctdb_same_ip(&tmp_ip->addr, &ip->addr)) {
- return ip_list;
- }
+ switch (ip->sa.sa_family) {
+ case AF_INET:
+ key[3] = htonl(ip->ip.sin_addr.s_addr);
+ break;
+ case AF_INET6:
+ key[0] = htonl(ip->ip6.sin6_addr.s6_addr32[0]);
+ key[1] = htonl(ip->ip6.sin6_addr.s6_addr32[1]);
+ key[2] = htonl(ip->ip6.sin6_addr.s6_addr32[2]);
+ key[3] = htonl(ip->ip6.sin6_addr.s6_addr32[3]);
+ break;
+ default:
+ DEBUG(DEBUG_ERR, (__location__ " ERROR, unknown family passed :%u\n", ip->sa.sa_family));
+ return key;
}
- /* this is a new public ip, we must add it to the list */
- tmp_ip = talloc_zero(tmp_ctx, struct ctdb_public_ip_list);
- CTDB_NO_MEMORY_NULL(ctdb, tmp_ip);
- tmp_ip->pnn = ip->pnn;
- tmp_ip->addr = ip->addr;
- tmp_ip->next = ip_list;
+ return key;
+}
- return tmp_ip;
+static void *add_ip_callback(void *parm, void *data)
+{
+ return parm;
}
-struct ctdb_public_ip_list *
-create_merged_ip_list(struct ctdb_context *ctdb, TALLOC_CTX *tmp_ctx)
+void getips_count_callback(void *param, void *data)
+{
+ struct ctdb_public_ip_list **ip_list = (struct ctdb_public_ip_list **)param;
+ struct ctdb_public_ip_list *new_ip = (struct ctdb_public_ip_list *)data;
+
+ new_ip->next = *ip_list;
+ *ip_list = new_ip;
+}
+
+static struct ctdb_public_ip_list *
+create_merged_ip_list(struct ctdb_context *ctdb)
{
int i, j;
- struct ctdb_public_ip_list *ip_list = NULL;
+ struct ctdb_public_ip_list *ip_list;
struct ctdb_all_public_ips *public_ips;
+ if (ctdb->ip_tree != NULL) {
+ talloc_free(ctdb->ip_tree);
+ ctdb->ip_tree = NULL;
+ }
+ ctdb->ip_tree = trbt_create(ctdb, 0);
+
for (i=0;i<ctdb->num_nodes;i++) {
- public_ips = ctdb->nodes[i]->public_ips;
+ public_ips = ctdb->nodes[i]->known_public_ips;
+
+ if (ctdb->nodes[i]->flags & NODE_FLAGS_DELETED) {
+ continue;
+ }
/* there were no public ips for this node */
if (public_ips == NULL) {
}
for (j=0;j<public_ips->num;j++) {
- ip_list = add_ip_to_merged_list(ctdb, tmp_ctx,
- ip_list, &public_ips->ips[j]);
+ struct ctdb_public_ip_list *tmp_ip;
+
+ tmp_ip = talloc_zero(ctdb->ip_tree, struct ctdb_public_ip_list);
+ CTDB_NO_MEMORY_NULL(ctdb, tmp_ip);
+ tmp_ip->pnn = public_ips->ips[j].pnn;
+ tmp_ip->addr = public_ips->ips[j].addr;
+ tmp_ip->next = NULL;
+
+ trbt_insertarray32_callback(ctdb->ip_tree,
+ IP_KEYLEN, ip_key(&public_ips->ips[j].addr),
+ add_ip_callback,
+ tmp_ip);
}
}
+ ip_list = NULL;
+ trbt_traversearray32(ctdb->ip_tree, IP_KEYLEN, getips_count_callback, &ip_list);
+
return ip_list;
}
a full list of all public addresses that exist in the cluster.
Walk over all node structures and create a merged list of
all public addresses that exist in the cluster.
+
+ keep the tree of ips around as ctdb->ip_tree
*/
- all_ips = create_merged_ip_list(ctdb, tmp_ctx);
+ all_ips = create_merged_ip_list(ctdb);
/* If we want deterministic ip allocations, i.e. that the ip addresses
will always be allocated the same way for a specific set of
/*
called by a client to inform us of a TCP connection that it is managing
that should tickled with an ACK when IP takeover is done
+ we handle both the old ipv4 style of packets as well as the new ipv4/6
+ pdus.
*/
-//qqq we need a new version of this control that takes ctdb_sock_addr
-//and have samba move to that instead.
-// This is IPV4 ONLY
int32_t ctdb_control_tcp_client(struct ctdb_context *ctdb, uint32_t client_id,
TDB_DATA indata)
{
struct ctdb_client *client = ctdb_reqid_find(ctdb, client_id, struct ctdb_client);
- struct ctdb_control_tcp *p = (struct ctdb_control_tcp *)indata.dptr;
+ struct ctdb_control_tcp *old_addr = NULL;
+ struct ctdb_control_tcp_addr new_addr;
+ struct ctdb_control_tcp_addr *tcp_sock = NULL;
struct ctdb_tcp_list *tcp;
struct ctdb_control_tcp_vnn t;
int ret;
struct ctdb_vnn *vnn;
ctdb_sock_addr addr;
+ switch (indata.dsize) {
+ case sizeof(struct ctdb_control_tcp):
+ old_addr = (struct ctdb_control_tcp *)indata.dptr;
+ ZERO_STRUCT(new_addr);
+ tcp_sock = &new_addr;
+ tcp_sock->src.ip = old_addr->src;
+ tcp_sock->dest.ip = old_addr->dest;
+ break;
+ case sizeof(struct ctdb_control_tcp_addr):
+ tcp_sock = (struct ctdb_control_tcp_addr *)indata.dptr;
+ break;
+ default:
+ DEBUG(DEBUG_ERR,(__location__ " Invalid data structure passed "
+ "to ctdb_control_tcp_client. size was %d but "
+ "only allowed sizes are %lu and %lu\n",
+ (int)indata.dsize,
+ (long unsigned)sizeof(struct ctdb_control_tcp),
+ (long unsigned)sizeof(struct ctdb_control_tcp_addr)));
+ return -1;
+ }
+
+ addr = tcp_sock->src;
+ ctdb_canonicalize_ip(&addr, &tcp_sock->src);
+ addr = tcp_sock->dest;
+ ctdb_canonicalize_ip(&addr, &tcp_sock->dest);
+
ZERO_STRUCT(addr);
- addr.ip = p->dest;
+ memcpy(&addr, &tcp_sock->dest, sizeof(addr));
vnn = find_public_ip_vnn(ctdb, &addr);
if (vnn == NULL) {
- if (ntohl(p->dest.sin_addr.s_addr) != INADDR_LOOPBACK) {
- DEBUG(DEBUG_INFO,("Could not add client IP %s. This is not a public address.\n",
- ctdb_addr_to_str((ctdb_sock_addr *)&p->dest)));
+ switch (addr.sa.sa_family) {
+ case AF_INET:
+ if (ntohl(addr.ip.sin_addr.s_addr) != INADDR_LOOPBACK) {
+ DEBUG(DEBUG_ERR,("Could not add client IP %s. This is not a public address.\n",
+ ctdb_addr_to_str(&addr)));
+ }
+ break;
+ case AF_INET6:
+ DEBUG(DEBUG_ERR,("Could not add client IP %s. This is not a public ipv6 address.\n",
+ ctdb_addr_to_str(&addr)));
+ break;
+ default:
+ DEBUG(DEBUG_ERR,(__location__ " Unknown family type %d\n", addr.sa.sa_family));
}
+
return 0;
}
if (vnn->pnn != ctdb->pnn) {
DEBUG(DEBUG_ERR,("Attempt to register tcp client for IP %s we don't hold - failing (client_id %u pid %u)\n",
- ctdb_addr_to_str((ctdb_sock_addr *)&p->dest),
+ ctdb_addr_to_str(&addr),
client_id, client->pid));
/* failing this call will tell smbd to die */
return -1;
CTDB_NO_MEMORY(ctdb, ip);
ip->ctdb = ctdb;
- ip->addr.ip = p->dest;
+ ip->addr = addr;
ip->client_id = client_id;
talloc_set_destructor(ip, ctdb_client_ip_destructor);
DLIST_ADD(ctdb->client_ip_list, ip);
tcp = talloc(client, struct ctdb_tcp_list);
CTDB_NO_MEMORY(ctdb, tcp);
- tcp->connection.src_addr.ip = p->src;
- tcp->connection.dst_addr.ip = p->dest;
+ tcp->connection.src_addr = tcp_sock->src;
+ tcp->connection.dst_addr = tcp_sock->dest;
DLIST_ADD(client->tcp_list, tcp);
- t.src.ip = p->src;
- t.dest.ip = p->dest;
+ t.src = tcp_sock->src;
+ t.dest = tcp_sock->dest;
data.dptr = (uint8_t *)&t;
data.dsize = sizeof(t);
- DEBUG(DEBUG_INFO,("registered tcp client for %u->%s:%u (client_id %u pid %u)\n",
- (unsigned)ntohs(p->dest.sin_port),
- ctdb_addr_to_str((ctdb_sock_addr *)&p->src),
- (unsigned)ntohs(p->src.sin_port), client_id, client->pid));
+ switch (addr.sa.sa_family) {
+ case AF_INET:
+ DEBUG(DEBUG_INFO,("registered tcp client for %u->%s:%u (client_id %u pid %u)\n",
+ (unsigned)ntohs(tcp_sock->dest.ip.sin_port),
+ ctdb_addr_to_str(&tcp_sock->src),
+ (unsigned)ntohs(tcp_sock->src.ip.sin_port), client_id, client->pid));
+ break;
+ case AF_INET6:
+ DEBUG(DEBUG_INFO,("registered tcp client for %u->%s:%u (client_id %u pid %u)\n",
+ (unsigned)ntohs(tcp_sock->dest.ip6.sin6_port),
+ ctdb_addr_to_str(&tcp_sock->src),
+ (unsigned)ntohs(tcp_sock->src.ip6.sin6_port), client_id, client->pid));
+ break;
+ default:
+ DEBUG(DEBUG_ERR,(__location__ " Unknown family %d\n", addr.sa.sa_family));
+ }
+
/* tell all nodes about this tcp connection */
ret = ctdb_daemon_send_control(ctdb, CTDB_BROADCAST_CONNECTED, 0,
for (vnn=ctdb->vnn;vnn;vnn=vnn->next) {
if (!ctdb_sys_have_ip(&vnn->public_address)) {
+ ctdb_vnn_unassign_iface(ctdb, vnn);
continue;
}
- ctdb_event_script(ctdb, "releaseip %s %s %u",
- vnn->iface,
- talloc_strdup(ctdb, ctdb_addr_to_str(&vnn->public_address)),
+ if (!vnn->iface) {
+ continue;
+ }
+ ctdb_event_script_args(ctdb, CTDB_EVENT_RELEASE_IP, "%s %s %u",
+ ctdb_vnn_iface_string(vnn),
+ ctdb_addr_to_str(&vnn->public_address),
vnn->public_netmask_bits);
release_kill_clients(ctdb, &vnn->public_address);
+ ctdb_vnn_unassign_iface(ctdb, vnn);
}
}
int i, num, len;
struct ctdb_all_public_ips *ips;
struct ctdb_vnn *vnn;
+ bool only_available = false;
+
+ if (c->flags & CTDB_PUBLIC_IP_FLAGS_ONLY_AVAILABLE) {
+ only_available = true;
+ }
/* count how many public ip structures we have */
num = 0;
ips = talloc_zero_size(outdata, len);
CTDB_NO_MEMORY(ctdb, ips);
- outdata->dsize = len;
- outdata->dptr = (uint8_t *)ips;
-
- ips->num = num;
i = 0;
for (vnn=ctdb->vnn;vnn;vnn=vnn->next) {
+ if (only_available && !ctdb_vnn_available(ctdb, vnn)) {
+ continue;
+ }
ips->ips[i].pnn = vnn->pnn;
ips->ips[i].addr = vnn->public_address;
i++;
}
+ ips->num = i;
+ len = offsetof(struct ctdb_all_public_ips, ips) +
+ i*sizeof(struct ctdb_public_ip);
+
+ outdata->dsize = len;
+ outdata->dptr = (uint8_t *)ips;
return 0;
}
return 0;
}
+int32_t ctdb_control_get_public_ip_info(struct ctdb_context *ctdb,
+ struct ctdb_req_control *c,
+ TDB_DATA indata,
+ TDB_DATA *outdata)
+{
+ int i, num, len;
+ ctdb_sock_addr *addr;
+ struct ctdb_control_public_ip_info *info;
+ struct ctdb_vnn *vnn;
+
+ addr = (ctdb_sock_addr *)indata.dptr;
+
+ vnn = find_public_ip_vnn(ctdb, addr);
+ if (vnn == NULL) {
+ /* if it is not a public ip it could be our 'single ip' */
+ if (ctdb->single_ip_vnn) {
+ if (ctdb_same_ip(&ctdb->single_ip_vnn->public_address, addr)) {
+ vnn = ctdb->single_ip_vnn;
+ }
+ }
+ }
+ if (vnn == NULL) {
+ DEBUG(DEBUG_ERR,(__location__ " Could not get public ip info, "
+ "'%s'not a public address\n",
+ ctdb_addr_to_str(addr)));
+ return -1;
+ }
+
+ /* count how many public ip structures we have */
+ num = 0;
+ for (;vnn->ifaces[num];) {
+ num++;
+ }
+
+ len = offsetof(struct ctdb_control_public_ip_info, ifaces) +
+ num*sizeof(struct ctdb_control_iface_info);
+ info = talloc_zero_size(outdata, len);
+ CTDB_NO_MEMORY(ctdb, info);
+
+ info->ip.addr = vnn->public_address;
+ info->ip.pnn = vnn->pnn;
+ info->active_idx = 0xFFFFFFFF;
+
+ for (i=0; vnn->ifaces[i]; i++) {
+ struct ctdb_iface *cur;
+
+ cur = ctdb_find_iface(ctdb, vnn->ifaces[i]);
+ if (cur == NULL) {
+ DEBUG(DEBUG_CRIT, (__location__ " internal error iface[%s] unknown\n",
+ vnn->ifaces[i]));
+ return -1;
+ }
+ if (vnn->iface == cur) {
+ info->active_idx = i;
+ }
+ strcpy(info->ifaces[i].name, cur->name);
+ info->ifaces[i].link_state = cur->link_up;
+ info->ifaces[i].references = cur->references;
+ }
+ info->num = i;
+ len = offsetof(struct ctdb_control_public_ip_info, ifaces) +
+ i*sizeof(struct ctdb_control_iface_info);
+
+ outdata->dsize = len;
+ outdata->dptr = (uint8_t *)info;
+
+ return 0;
+}
+
+int32_t ctdb_control_get_ifaces(struct ctdb_context *ctdb,
+ struct ctdb_req_control *c,
+ TDB_DATA *outdata)
+{
+ int i, num, len;
+ struct ctdb_control_get_ifaces *ifaces;
+ struct ctdb_iface *cur;
+
+ /* count how many public ip structures we have */
+ num = 0;
+ for (cur=ctdb->ifaces;cur;cur=cur->next) {
+ num++;
+ }
+
+ len = offsetof(struct ctdb_control_get_ifaces, ifaces) +
+ num*sizeof(struct ctdb_control_iface_info);
+ ifaces = talloc_zero_size(outdata, len);
+ CTDB_NO_MEMORY(ctdb, ifaces);
+
+ i = 0;
+ for (cur=ctdb->ifaces;cur;cur=cur->next) {
+ strcpy(ifaces->ifaces[i].name, cur->name);
+ ifaces->ifaces[i].link_state = cur->link_up;
+ ifaces->ifaces[i].references = cur->references;
+ i++;
+ }
+ ifaces->num = i;
+ len = offsetof(struct ctdb_control_get_ifaces, ifaces) +
+ i*sizeof(struct ctdb_control_iface_info);
+
+ outdata->dsize = len;
+ outdata->dptr = (uint8_t *)ifaces;
+
+ return 0;
+}
+
+int32_t ctdb_control_set_iface_link(struct ctdb_context *ctdb,
+ struct ctdb_req_control *c,
+ TDB_DATA indata)
+{
+ struct ctdb_control_iface_info *info;
+ struct ctdb_iface *iface;
+ bool link_up = false;
+
+ info = (struct ctdb_control_iface_info *)indata.dptr;
+
+ if (info->name[CTDB_IFACE_SIZE] != '\0') {
+ int len = strnlen(info->name, CTDB_IFACE_SIZE);
+ DEBUG(DEBUG_ERR, (__location__ " name[%*.*s] not terminated\n",
+ len, len, info->name));
+ return -1;
+ }
+
+ switch (info->link_state) {
+ case 0:
+ link_up = false;
+ break;
+ case 1:
+ link_up = true;
+ break;
+ default:
+ DEBUG(DEBUG_ERR, (__location__ " link_state[%u] invalid\n",
+ (unsigned int)info->link_state));
+ return -1;
+ }
+
+ if (info->references != 0) {
+ DEBUG(DEBUG_ERR, (__location__ " references[%u] should be 0\n",
+ (unsigned int)info->references));
+ return -1;
+ }
+
+ iface = ctdb_find_iface(ctdb, info->name);
+ if (iface == NULL) {
+ DEBUG(DEBUG_ERR, (__location__ "iface[%s] is unknown\n",
+ info->name));
+ return -1;
+ }
+
+ if (link_up == iface->link_up) {
+ return 0;
+ }
+
+ DEBUG(iface->link_up?DEBUG_ERR:DEBUG_NOTICE,
+ ("iface[%s] has changed it's link status %s => %s\n",
+ iface->name,
+ iface->link_up?"up":"down",
+ link_up?"up":"down"));
+
+ iface->link_up = link_up;
+ return 0;
+}
+
/*
structure containing the listening socket and the list of tcp connections
If we dont have a socket to listen on yet we must create it
*/
if (killtcp->capture_fd == -1) {
- killtcp->capture_fd = ctdb_sys_open_capture_socket(vnn->iface, &killtcp->private_data);
+ const char *iface = ctdb_vnn_iface_string(vnn);
+ killtcp->capture_fd = ctdb_sys_open_capture_socket(iface, &killtcp->private_data);
if (killtcp->capture_fd == -1) {
- DEBUG(DEBUG_CRIT,(__location__ " Failed to open capturing socket for killtcp\n"));
+ DEBUG(DEBUG_CRIT,(__location__ " Failed to open capturing "
+ "socket on iface '%s' for killtcp (%s)\n",
+ iface, strerror(errno)));
goto failed;
}
}
ret = ctdb_sys_send_arp(&arp->addr, arp->iface);
if (ret != 0) {
- DEBUG(DEBUG_ERR,(__location__ " sending of gratious arp failed (%s)\n", strerror(errno)));
+ DEBUG(DEBUG_ERR,(__location__ " sending of gratious arp on iface '%s' failed (%s)\n",
+ arp->iface, strerror(errno)));
}
int32_t ctdb_control_add_public_address(struct ctdb_context *ctdb, TDB_DATA indata)
{
struct ctdb_control_ip_iface *pub = (struct ctdb_control_ip_iface *)indata.dptr;
-
+ int ret;
/* verify the size of indata */
if (indata.dsize < offsetof(struct ctdb_control_ip_iface, iface)) {
return -1;
}
- return ctdb_add_public_address(ctdb, &pub->addr, pub->mask, &pub->iface[0]);
+ ret = ctdb_add_public_address(ctdb, &pub->addr, pub->mask, &pub->iface[0]);
+
+ if (ret != 0) {
+ DEBUG(DEBUG_ERR,(__location__ " Failed to add public address\n"));
+ return -1;
+ }
+
+ return 0;
}
/*
/* walk over all public addresses until we find a match */
for (vnn=ctdb->vnn;vnn;vnn=vnn->next) {
if (ctdb_same_ip(&vnn->public_address, &pub->addr)) {
- TALLOC_CTX *mem_ctx = talloc_new(ctdb);
+ TALLOC_CTX *mem_ctx;
DLIST_REMOVE(ctdb->vnn, vnn);
+ if (vnn->iface == NULL) {
+ talloc_free(vnn);
+ return 0;
+ }
+ mem_ctx = talloc_new(ctdb);
ret = ctdb_event_script_callback(ctdb,
- timeval_current_ofs(ctdb->tunable.script_timeout, 0),
mem_ctx, delete_ip_callback, mem_ctx,
- "releaseip %s %s %u",
- vnn->iface,
- talloc_strdup(mem_ctx, ctdb_addr_to_str(&vnn->public_address)),
+ false,
+ CTDB_EVENT_RELEASE_IP,
+ "%s %s %u",
+ ctdb_vnn_iface_string(vnn),
+ ctdb_addr_to_str(&vnn->public_address),
vnn->public_netmask_bits);
+ ctdb_vnn_unassign_iface(ctdb, vnn);
talloc_free(vnn);
if (ret != 0) {
return -1;
return -1;
}
+/* This function is called from the recovery daemon to verify that a remote
+ node has the expected ip allocation.
+ This is verified against ctdb->ip_tree
+*/
+int verify_remote_ip_allocation(struct ctdb_context *ctdb, struct ctdb_all_public_ips *ips)
+{
+ struct ctdb_public_ip_list *tmp_ip;
+ int i;
+
+ if (ctdb->ip_tree == NULL) {
+ /* dont know the expected allocation yet, assume remote node
+ is correct. */
+ return 0;
+ }
+
+ if (ips == NULL) {
+ return 0;
+ }
+
+ for (i=0; i<ips->num; i++) {
+ tmp_ip = trbt_lookuparray32(ctdb->ip_tree, IP_KEYLEN, ip_key(&ips->ips[i].addr));
+ if (tmp_ip == NULL) {
+ DEBUG(DEBUG_ERR,(__location__ " Could not find host for address %s, reassign ips\n", ctdb_addr_to_str(&ips->ips[i].addr)));
+ return -1;
+ }
+
+ if (tmp_ip->pnn == -1 || ips->ips[i].pnn == -1) {
+ continue;
+ }
+
+ if (tmp_ip->pnn != ips->ips[i].pnn) {
+ DEBUG(DEBUG_ERR,("Inconsistent ip allocation. Trigger reallocation. Thinks %s is held by node %u while it is held by node %u\n", ctdb_addr_to_str(&ips->ips[i].addr), ips->ips[i].pnn, tmp_ip->pnn));
+ return -1;
+ }
+ }
+
+ return 0;
+}
+
+int update_ip_assignment_tree(struct ctdb_context *ctdb, struct ctdb_public_ip *ip)
+{
+ struct ctdb_public_ip_list *tmp_ip;
+
+ if (ctdb->ip_tree == NULL) {
+ DEBUG(DEBUG_ERR,("No ctdb->ip_tree yet. Failed to update ip assignment\n"));
+ return -1;
+ }
+
+ tmp_ip = trbt_lookuparray32(ctdb->ip_tree, IP_KEYLEN, ip_key(&ip->addr));
+ if (tmp_ip == NULL) {
+ DEBUG(DEBUG_ERR,(__location__ " Could not find record for address %s, update ip\n", ctdb_addr_to_str(&ip->addr)));
+ return -1;
+ }
+
+ DEBUG(DEBUG_NOTICE,("Updated ip assignment tree for ip : %s from node %u to node %u\n", ctdb_addr_to_str(&ip->addr), tmp_ip->pnn, ip->pnn));
+ tmp_ip->pnn = ip->pnn;
+
+ return 0;
+}
git.samba.org / metze / ctdb / wip.git / blobdiff