------------------------------------------------------------
revno: 284
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Tridgell <[EMAIL PROTECTED]>
branch nick: tridge
timestamp: Sat 2007-05-12 15:51:08 +1000
message:
show total frozen/recoving in status
modified:
common/ctdb_control.c
ctdb_control.c-20070426122724-j6gkpiofhbwdin63-1
include/ctdb_private.h
ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13
tools/ctdb_control.c
ctdb_control.c-20070426122705-9ehj1l5lu2gn9kuj-1
=== modified file 'common/ctdb_control.c'
--- a/common/ctdb_control.c 2007-05-12 05:15:27 +0000
+++ b/common/ctdb_control.c 2007-05-12 05:51:08 +0000
@@ -71,6 +71,8 @@
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;
=== modified file 'include/ctdb_private.h'
--- a/include/ctdb_private.h 2007-05-12 05:15:27 +0000
+++ b/include/ctdb_private.h 2007-05-12 05:51:08 +0000
@@ -136,6 +136,8 @@
*/
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;
=== modified file 'tools/ctdb_control.c'
--- a/tools/ctdb_control.c 2007-05-12 05:44:56 +0000
+++ b/tools/ctdb_control.c 2007-05-12 05:51:08 +0000
@@ -102,6 +102,8 @@
} 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),
