diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2017-03-02 15:44:48 +1100 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2017-06-29 10:34:26 +0200 |
| commit | d0fa710ea10049c69ec8cb155444a35ecad4b538 (patch) | |
| tree | f6793005ffa38fc3bd3d1c62e5038055276dcb09 /ctdb/server/ctdb_recover.c | |
| parent | 94af277c489f0ad861c6923d91286f46f9e4d29b (diff) | |
| download | samba-d0fa710ea10049c69ec8cb155444a35ecad4b538.tar.gz | |
ctdb-daemon: Add accessors for CTDB_DB_FLAGS_READONLY flag
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'ctdb/server/ctdb_recover.c')
| -rw-r--r-- | ctdb/server/ctdb_recover.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/ctdb/server/ctdb_recover.c b/ctdb/server/ctdb_recover.c index b9fdaa7ed74..9097f7a3ffa 100644 --- a/ctdb/server/ctdb_recover.c +++ b/ctdb/server/ctdb_recover.c @@ -118,7 +118,7 @@ ctdb_control_getdbmap(struct ctdb_context *ctdb, uint32_t opcode, TDB_DATA indat if (ctdb_db_persistent(ctdb_db)) { dbid_map->dbs[i].flags |= CTDB_DB_FLAGS_PERSISTENT; } - if (ctdb_db->readonly != 0) { + if (ctdb_db_readonly(ctdb_db)) { dbid_map->dbs[i].flags |= CTDB_DB_FLAGS_READONLY; } if (ctdb_db->sticky != 0) { @@ -513,15 +513,14 @@ int32_t ctdb_control_push_db(struct ctdb_context *ctdb, TDB_DATA indata) DEBUG(DEBUG_DEBUG,("finished push of %u records for dbid 0x%x\n", reply->count, reply->db_id)); - if (ctdb_db->readonly) { + if (ctdb_db_readonly(ctdb_db)) { DEBUG(DEBUG_CRIT,("Clearing the tracking database for dbid 0x%x\n", ctdb_db->db_id)); if (tdb_wipe_all(ctdb_db->rottdb) != 0) { DEBUG(DEBUG_ERR,("Failed to wipe tracking database for 0x%x. Dropping read-only delegation support\n", ctdb_db->db_id)); - ctdb_db->readonly = false; tdb_close(ctdb_db->rottdb); ctdb_db->rottdb = NULL; - ctdb_db->readonly = false; + ctdb_db_reset_readonly(ctdb_db); } while (ctdb_db->revokechild_active != NULL) { talloc_free(ctdb_db->revokechild_active); @@ -702,7 +701,7 @@ int32_t ctdb_control_db_push_confirm(struct ctdb_context *ctdb, return -1; } - if (ctdb_db->readonly) { + if (ctdb_db_readonly(ctdb_db)) { DEBUG(DEBUG_ERR, ("Clearing the tracking database for dbid 0x%x\n", ctdb_db->db_id)); @@ -711,10 +710,9 @@ int32_t ctdb_control_db_push_confirm(struct ctdb_context *ctdb, ("Failed to wipe tracking database for 0x%x." " Dropping read-only delegation support\n", ctdb_db->db_id)); - ctdb_db->readonly = false; tdb_close(ctdb_db->rottdb); ctdb_db->rottdb = NULL; - ctdb_db->readonly = false; + ctdb_db_reset_readonly(ctdb_db); } while (ctdb_db->revokechild_active != NULL) { |