there are now far too many controls for the controls statistics fields to be useful

(This used to be ctdb commit f5e188fc7e13b55b6b4081dcc74ea9614a76f9bb)

diff --git a/ctdb/common/ctdb_control.c b/ctdb/common/ctdb_control.c
index 73e728937e51613a0bbb04fcf807d9dfa8faaa58..2a9182647b1a5bd0fdbcba19a9762f85a5e191d0 100644 (file)
--- a/ctdb/common/ctdb_control.c
+++ b/ctdb/common/ctdb_control.c
@@ -52,7 +52,6 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb,
        switch (opcode) {
        case CTDB_CONTROL_PROCESS_EXISTS: {
                CHECK_CONTROL_DATA_SIZE(sizeof(pid_t));
-               ctdb->statistics.controls.process_exists++;
                return kill(*(pid_t *)indata.dptr, 0);
        }
 
@@ -71,7 +70,6 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb,
 
        case CTDB_CONTROL_STATISTICS: {
                CHECK_CONTROL_DATA_SIZE(0);
-               ctdb->statistics.controls.statistics++;
                ctdb->statistics.memory_used = talloc_total_size(ctdb);
                ctdb->statistics.frozen = (ctdb->freeze_mode == CTDB_FREEZE_FROZEN);
                ctdb->statistics.recovering = (ctdb->recovery_mode == CTDB_RECOVERY_ACTIVE);
@@ -147,7 +145,6 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb,
 
        case CTDB_CONTROL_PING:
                CHECK_CONTROL_DATA_SIZE(0);
-               ctdb->statistics.controls.ping++;
                return ctdb->statistics.num_clients;
 
        case CTDB_CONTROL_GET_DBNAME: {
@@ -177,45 +174,36 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb,
        }
 
        case CTDB_CONTROL_DB_ATTACH:
-               ctdb->statistics.controls.attach++;
                return ctdb_control_db_attach(ctdb, indata, outdata);
 
        case CTDB_CONTROL_SET_CALL: {
                struct ctdb_control_set_call *sc = 
                        (struct ctdb_control_set_call *)indata.dptr;
-               ctdb->statistics.controls.set_call++;
                CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_control_set_call));
                return ctdb_daemon_set_call(ctdb, sc->db_id, sc->fn, sc->id);
        }
 
        case CTDB_CONTROL_TRAVERSE_START:
                CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_traverse_start));
-               ctdb->statistics.controls.traverse_start++;
                return ctdb_control_traverse_start(ctdb, indata, outdata, srcnode);
 
        case CTDB_CONTROL_TRAVERSE_ALL:
-               ctdb->statistics.controls.traverse_all++;
                return ctdb_control_traverse_all(ctdb, indata, outdata);
 
        case CTDB_CONTROL_TRAVERSE_DATA:
-               ctdb->statistics.controls.traverse_data++;
                return ctdb_control_traverse_data(ctdb, indata, outdata);
 
        case CTDB_CONTROL_REGISTER_SRVID:
-               ctdb->statistics.controls.register_srvid++;
                return daemon_register_message_handler(ctdb, client_id, srvid);
 
        case CTDB_CONTROL_DEREGISTER_SRVID:
-               ctdb->statistics.controls.deregister_srvid++;
                return daemon_deregister_message_handler(ctdb, client_id, srvid);
 
        case CTDB_CONTROL_ENABLE_SEQNUM:
-               ctdb->statistics.controls.enable_seqnum++;
                CHECK_CONTROL_DATA_SIZE(sizeof(uint32_t));
                return ctdb_ltdb_enable_seqnum(ctdb, *(uint32_t *)indata.dptr);
 
        case CTDB_CONTROL_UPDATE_SEQNUM:
-               ctdb->statistics.controls.update_seqnum++;
                CHECK_CONTROL_DATA_SIZE(sizeof(uint32_t));              
                return ctdb_ltdb_update_seqnum(ctdb, *(uint32_t *)indata.dptr, srcnode);
 

diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h
index cfa33d28aedd34cae26d227b76a1cc638a30d2a3..989d837568c9183bc6eac7dc45e33faca642f44b 100644 (file)
--- a/ctdb/include/ctdb_private.h
+++ b/ctdb/include/ctdb_private.h
@@ -210,22 +210,6 @@ struct ctdb_statistics {
                uint32_t req_message;
                uint32_t req_control;
        } client;
-       struct {
-               uint32_t statistics;
-               uint32_t get_config;
-               uint32_t ping;
-               uint32_t attach;
-               uint32_t set_call;
-               uint32_t process_exists;
-               uint32_t traverse_start;
-               uint32_t traverse_all;
-               uint32_t traverse_data;
-               uint32_t update_seqnum;
-               uint32_t enable_seqnum;
-               uint32_t set_seqnum_frequency;
-               uint32_t register_srvid;
-               uint32_t deregister_srvid;
-       } controls;
        struct {
                uint32_t call;
                uint32_t control;

diff --git a/ctdb/tools/ctdb_control.c b/ctdb/tools/ctdb_control.c
index 2b6a37dced4b62f26b5af028f05bdbf4ab24790e..537d657ce66d228506bc60200051a435883fae12 100644 (file)
--- a/ctdb/tools/ctdb_control.c
+++ b/ctdb/tools/ctdb_control.c
@@ -96,19 +96,6 @@ static void show_statistics(struct ctdb_statistics *s)
                STATISTICS_FIELD(client.req_call),
                STATISTICS_FIELD(client.req_message),
                STATISTICS_FIELD(client.req_control),
-               STATISTICS_FIELD(controls.statistics),
-               STATISTICS_FIELD(controls.get_config),
-               STATISTICS_FIELD(controls.ping),
-               STATISTICS_FIELD(controls.attach),
-               STATISTICS_FIELD(controls.set_call),
-               STATISTICS_FIELD(controls.process_exists),
-               STATISTICS_FIELD(controls.traverse_start),
-               STATISTICS_FIELD(controls.traverse_all),
-               STATISTICS_FIELD(controls.traverse_data),
-               STATISTICS_FIELD(controls.update_seqnum),
-               STATISTICS_FIELD(controls.enable_seqnum),
-               STATISTICS_FIELD(controls.register_srvid),
-               STATISTICS_FIELD(controls.deregister_srvid),
                STATISTICS_FIELD(timeouts.call),
                STATISTICS_FIELD(timeouts.control),
                STATISTICS_FIELD(timeouts.traverse),