Revert "Dont allow client processes to attach to databases while we are still in...

[sahlberg/ctdb.git] / server / ctdb_control.c

diff --git a/server/ctdb_control.c b/server/ctdb_control.c
index cbacd17bedd04eee24f58c9aec3164271fbd9633..90900c94b1d5a409e1c01350b0c11a10e8be85c0 100644 (file)
--- a/server/ctdb_control.c
+++ b/server/ctdb_control.c
@@ -334,8 +334,16 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb,
                return ctdb_control_startup(ctdb, srcnode);
 
        case CTDB_CONTROL_TCP_ADD: 
-               CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_control_tcp_vnn));
-               return ctdb_control_tcp_add(ctdb, indata);
+               CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_tcp_connection));
+               return ctdb_control_tcp_add(ctdb, indata, false);
+
+       case CTDB_CONTROL_TCP_ADD_DELAYED_UPDATE: 
+               CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_tcp_connection));
+               return ctdb_control_tcp_add(ctdb, indata, true);
+
+       case CTDB_CONTROL_TCP_REMOVE: 
+               CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_tcp_connection));
+               return ctdb_control_tcp_remove(ctdb, indata);
 
        case CTDB_CONTROL_SET_TUNABLE:
                return ctdb_control_set_tunable(ctdb, indata);
@@ -453,7 +461,7 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb,
 
        case CTDB_CONTROL_RECD_RECLOCK_LATENCY:
                CHECK_CONTROL_DATA_SIZE(sizeof(double));
-               ctdb_reclock_latency(ctdb, "recd reclock", &ctdb->statistics.reclock.recd, *((double *)indata.dptr));
+               CTDB_UPDATE_RECLOCK_LATENCY(ctdb, "recd reclock", reclock.recd, *((double *)indata.dptr));
                return 0;
        case CTDB_CONTROL_GET_RECLOCK_FILE:
                CHECK_CONTROL_DATA_SIZE(0);
@@ -592,6 +600,10 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb,
                CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_control_iface_info));
                return ctdb_control_set_iface_link(ctdb, c, indata);
 
+       case CTDB_CONTROL_GET_STAT_HISTORY:
+               CHECK_CONTROL_DATA_SIZE(0);
+               return ctdb_control_get_stat_history(ctdb, c, outdata);
+
        default:
                DEBUG(DEBUG_CRIT,(__location__ " Unknown CTDB control opcode %u\n", opcode));
                return -1;
@@ -712,7 +724,7 @@ static void ctdb_control_timeout(struct event_context *ev, struct timed_event *t
        struct ctdb_control_state *state = talloc_get_type(private_data, struct ctdb_control_state);
        TALLOC_CTX *tmp_ctx = talloc_new(ev);
 
-       state->ctdb->statistics.timeouts.control++;
+       CTDB_INCREMENT_STAT(state->ctdb, timeouts.control);
 
        talloc_steal(tmp_ctx, state);
 
@@ -738,7 +750,7 @@ int ctdb_daemon_send_control(struct ctdb_context *ctdb, uint32_t destnode,
        size_t len;
 
        if (ctdb->methods == NULL) {
-               DEBUG(DEBUG_ERR,(__location__ " Failed to send control. Transport is DOWN\n"));
+               DEBUG(DEBUG_INFO,(__location__ " Failed to send control. Transport is DOWN\n"));
                return -1;
        }