From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 12 May 2007 05:51:08 +0000 (+1000)
Subject: show total frozen/recoving in status
X-Git-Tag: tevent-0.9.20~348^2~2747
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2c90d9e794466e5418ee1dee8a967fe5e0e5f77c;p=thirdparty%2Fsamba.git

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 af8df80e958..7a7b7ee270c 100644
--- 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 50500d9741a..11231d680ed 100644
--- 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 5c24bdb70a4..54cf0f8e41b 100644
--- 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),