diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2015-09-15 12:22:17 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2015-10-07 14:53:26 +0200 |
| commit | 7afabb1285f6778b5b2862e178315b03f54eb8ef (patch) | |
| tree | 2d1880535c8f7cb51255b58402a9161cd87b4240 /ctdb/server/ctdb_monitor.c | |
| parent | 8c58c7392fe342fb39fcaf81c2465762f1823b51 (diff) | |
| download | samba-7afabb1285f6778b5b2862e178315b03f54eb8ef.tar.gz | |
ctdb-daemon: Avoid the use of ctdb->freeze_handle variable
These variables are used for state information related to freezing
databases. Instead use the API functions to check if the databases
are frozen.
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'ctdb/server/ctdb_monitor.c')
| -rw-r--r-- | ctdb/server/ctdb_monitor.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/ctdb/server/ctdb_monitor.c b/ctdb/server/ctdb_monitor.c index 6dd7c1e637a..edaae48ff8e 100644 --- a/ctdb/server/ctdb_monitor.c +++ b/ctdb/server/ctdb_monitor.c @@ -368,14 +368,10 @@ static void ctdb_check_health(struct event_context *ev, struct timed_event *te, ctdb->monitor->monitoring_mode == CTDB_MONITORING_DISABLED) { skip_monitoring = true; } else { - int i; - for (i=1; i<=NUM_DB_PRIORITIES; i++) { - if (ctdb->freeze_handles[i] != NULL) { - DEBUG(DEBUG_ERR, - ("Skip monitoring since databases are frozen\n")); - skip_monitoring = true; - break; - } + if (ctdb_db_all_frozen(ctdb)) { + DEBUG(DEBUG_ERR, + ("Skip monitoring since databases are frozen\n")); + skip_monitoring = true; } } |