diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2014-08-21 12:32:02 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2015-10-07 14:53:26 +0200 |
| commit | 8c58c7392fe342fb39fcaf81c2465762f1823b51 (patch) | |
| tree | 05291da16a54d164293cad1ee13c989e74dbd57a /ctdb/server/ctdb_control.c | |
| parent | 056c44fda3f3d84dc3eb9766e0ee04bdb6387ea5 (diff) | |
| download | samba-8c58c7392fe342fb39fcaf81c2465762f1823b51.tar.gz | |
ctdb-daemon: Avoid the use of ctdb->freeze_mode variable
Use ctdb->freeze_mode only in ctdb_freeze.c and use the functions to
check if databases are frozen everywhere else.
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'ctdb/server/ctdb_control.c')
| -rw-r--r-- | ctdb/server/ctdb_control.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/ctdb/server/ctdb_control.c b/ctdb/server/ctdb_control.c index 2335f06ceeb..7b26ff96983 100644 --- a/ctdb/server/ctdb_control.c +++ b/ctdb/server/ctdb_control.c @@ -110,16 +110,10 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb, } case CTDB_CONTROL_STATISTICS: { - int i; CHECK_CONTROL_DATA_SIZE(0); ctdb->statistics.memory_used = talloc_total_size(NULL); ctdb->statistics.num_clients = ctdb->num_clients; - ctdb->statistics.frozen = 0; - for (i=1; i<= NUM_DB_PRIORITIES; i++) { - if (ctdb->freeze_mode[i] == CTDB_FREEZE_FROZEN) { - ctdb->statistics.frozen = 1; - } - } + ctdb->statistics.frozen = (ctdb_db_all_frozen(ctdb) ? 1 : 0); ctdb->statistics.recovering = (ctdb->recovery_mode == CTDB_RECOVERY_ACTIVE); ctdb->statistics.statistics_current_time = timeval_current(); |