show total frozen/recoving in status

(This used to be ctdb commit 0d0eb66a63fe6912edb85bf7387ac76acb70babd)

diff --git a/ctdb/common/ctdb_control.c b/ctdb/common/ctdb_control.c
index af8df80e95858ab3124e640e1be627a040dae548..7a7b7ee270cc9f9c64b1d728136803f0b017bf00 100644 (file)
--- a/ctdb/common/ctdb_control.c
+++ b/ctdb/common/ctdb_control.c
@@ -71,6 +71,8 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb,
                CHECK_CONTROL_DATA_SIZE(0);
                ctdb->status.controls.status++;
                ctdb->status.memory_used = talloc_total_size(ctdb);
+               ctdb->status.frozen = (ctdb->freeze_mode == CTDB_FREEZE_FROZEN);
+               ctdb->status.recovering = (ctdb->recovery_mode == CTDB_RECOVERY_ACTIVE);
                outdata->dptr = (uint8_t *)&ctdb->status;
                outdata->dsize = sizeof(ctdb->status);
                return 0;

diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h
index 50500d9741aed13c149c816a918414d8c1d92963..11231d680eda0ae283bcddfedcabd3898acc40a0 100644 (file)
--- a/ctdb/include/ctdb_private.h
+++ b/ctdb/include/ctdb_private.h
@@ -136,6 +136,8 @@ struct ctdb_daemon_data {
  */
 struct ctdb_status {
        uint32_t num_clients;
+       uint32_t frozen;
+       uint32_t recovering;
        uint32_t client_packets_sent;
        uint32_t client_packets_recv;
        uint32_t node_packets_sent;

diff --git a/ctdb/tools/ctdb_control.c b/ctdb/tools/ctdb_control.c
index 5c24bdb70a4b1913bf840c6b28cd758ffb1d9a17..54cf0f8e41b9110d6568e335a17fbc88a954b766 100644 (file)
--- a/ctdb/tools/ctdb_control.c
+++ b/ctdb/tools/ctdb_control.c
@@ -102,6 +102,8 @@ static void show_status(struct ctdb_status *s)
        } fields[] = {
 #define STATUS_FIELD(n) { #n, offsetof(struct ctdb_status, n) }
                STATUS_FIELD(num_clients),
+               STATUS_FIELD(frozen),
+               STATUS_FIELD(recovering),
                STATUS_FIELD(client_packets_sent),
                STATUS_FIELD(client_packets_recv),
                STATUS_FIELD(node_packets_sent),