diff options
Diffstat (limited to 'ctdb')
| -rw-r--r-- | ctdb/server/ctdb_monitor.c | 6 | ||||
| -rw-r--r-- | ctdb/server/ctdb_recover.c | 6 | ||||
| -rw-r--r-- | ctdb/server/ctdb_recoverd.c | 2 | ||||
| -rw-r--r-- | ctdb/server/ctdb_takeover.c | 10 |
4 files changed, 15 insertions, 9 deletions
diff --git a/ctdb/server/ctdb_monitor.c b/ctdb/server/ctdb_monitor.c index dfa91abe71..bdb3d45eda 100644 --- a/ctdb/server/ctdb_monitor.c +++ b/ctdb/server/ctdb_monitor.c @@ -199,7 +199,7 @@ static void ctdb_check_health(struct event_context *ev, struct timed_event *te, void ctdb_disable_monitoring(struct ctdb_context *ctdb) { ctdb->monitoring_mode = CTDB_MONITORING_DISABLED; - DEBUG(1,("Monitoring has been disabled\n")); + DEBUG(2,("Monitoring has been disabled\n")); } /* @@ -208,7 +208,7 @@ void ctdb_disable_monitoring(struct ctdb_context *ctdb) void ctdb_enable_monitoring(struct ctdb_context *ctdb) { ctdb->monitoring_mode = CTDB_MONITORING_ACTIVE; - DEBUG(1,("Monitoring has been enabled\n")); + DEBUG(2,("Monitoring has been enabled\n")); } /* stop any monitoring @@ -269,7 +269,7 @@ int32_t ctdb_control_modflags(struct ctdb_context *ctdb, TDB_DATA indata) node->flags &= ~m->clear; if (node->flags == old_flags) { - DEBUG(0, ("Control modflags on node %u - Unchanged - flags 0x%x\n", ctdb->pnn, node->flags)); + DEBUG(2, ("Control modflags on node %u - Unchanged - flags 0x%x\n", ctdb->pnn, node->flags)); return 0; } diff --git a/ctdb/server/ctdb_recover.c b/ctdb/server/ctdb_recover.c index 1c9f6a91bd..8b2dfb7583 100644 --- a/ctdb/server/ctdb_recover.c +++ b/ctdb/server/ctdb_recover.c @@ -415,6 +415,8 @@ static void ctdb_recovered_callback(struct ctdb_context *ctdb, int status, void { struct ctdb_set_recmode_state *state = talloc_get_type(p, struct ctdb_set_recmode_state); + ctdb_enable_monitoring(state->ctdb); + if (status == 0) { ctdb->recovery_mode = state->recmode; } else { @@ -491,9 +493,9 @@ static void set_recmode_handler(struct event_context *ev, struct fd_event *fde, ctdb_recovered_callback, state, "recovered"); - ctdb_enable_monitoring(state->ctdb); - if (ret != 0) { + ctdb_enable_monitoring(state->ctdb); + ctdb_request_control_reply(state->ctdb, state->c, NULL, -1, "failed to run eventscript from set_recmode"); talloc_free(state); return; diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c index 88f2254366..8e297e9f52 100644 --- a/ctdb/server/ctdb_recoverd.c +++ b/ctdb/server/ctdb_recoverd.c @@ -770,7 +770,7 @@ static void ctdb_set_culprit(struct ctdb_recoverd *rec, uint32_t culprit) if (rec->last_culprit != culprit || timeval_elapsed(&rec->first_recover_time) > ctdb->tunable.recovery_grace_period) { DEBUG(0,("New recovery culprit %u\n", culprit)); - /* either a new node is the culprit, or we've decide to forgive them */ + /* either a new node is the culprit, or we've decided to forgive them */ rec->last_culprit = culprit; rec->first_recover_time = timeval_current(); rec->culprit_counter = 0; diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c index 90d692e355..a452da6424 100644 --- a/ctdb/server/ctdb_takeover.c +++ b/ctdb/server/ctdb_takeover.c @@ -131,6 +131,8 @@ static void takeover_ip_callback(struct ctdb_context *ctdb, int status, char *ip = inet_ntoa(state->sin->sin_addr); struct ctdb_tcp_array *tcparray; + ctdb_enable_monitoring(ctdb); + if (status != 0) { DEBUG(0,(__location__ " Failed to takeover IP %s on interface %s\n", ip, state->vnn->iface)); @@ -245,9 +247,9 @@ int32_t ctdb_control_takeover_ip(struct ctdb_context *ctdb, vnn->iface, inet_ntoa(pip->sin.sin_addr), vnn->public_netmask_bits); - ctdb_enable_monitoring(ctdb); if (ret != 0) { + ctdb_enable_monitoring(ctdb); DEBUG(0,(__location__ " Failed to takeover IP %s on interface %s\n", inet_ntoa(pip->sin.sin_addr), vnn->iface)); talloc_free(state); @@ -299,6 +301,8 @@ static void release_ip_callback(struct ctdb_context *ctdb, int status, char *ip = inet_ntoa(state->sin->sin_addr); TDB_DATA data; + ctdb_enable_monitoring(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 */ @@ -371,9 +375,9 @@ int32_t ctdb_control_release_ip(struct ctdb_context *ctdb, vnn->iface, inet_ntoa(pip->sin.sin_addr), vnn->public_netmask_bits); - ctdb_enable_monitoring(ctdb); - if (ret != 0) { + ctdb_enable_monitoring(ctdb); + DEBUG(0,(__location__ " Failed to release IP %s on interface %s\n", inet_ntoa(pip->sin.sin_addr), vnn->iface)); talloc_free(state); |