diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2017-03-21 13:50:07 +1100 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2017-06-26 15:47:24 +0200 |
| commit | 1be2ff8b81871c1e2ff8721a0174862573edec38 (patch) | |
| tree | d3b011131faf812228f86454091e51623e3eb833 /ctdb/client | |
| parent | 45ea95126e370d09f392e79dc8deeac7804636e5 (diff) | |
| download | samba-1be2ff8b81871c1e2ff8721a0174862573edec38.tar.gz | |
ctdb-daemon: Refactor calculation of tdb open flags based on database type
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'ctdb/client')
| -rw-r--r-- | ctdb/client/ctdb_client.c | 42 |
1 files changed, 13 insertions, 29 deletions
diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c index 6ffa0f43d1d..5ba03c87071 100644 --- a/ctdb/client/ctdb_client.c +++ b/ctdb/client/ctdb_client.c @@ -2085,15 +2085,15 @@ struct ctdb_db_context *ctdb_attach(struct ctdb_context *ctdb, struct timeval timeout, const char *name, bool persistent, - uint32_t tdb_flags) + uint32_t tdb_flags_unused) { struct ctdb_db_context *ctdb_db; TDB_DATA data; int ret; int32_t res; -#ifdef TDB_MUTEX_LOCKING - uint32_t mutex_enabled = 0; -#endif + uint8_t db_flags = 0; + int tdb_flags; + bool with_mutex = false; ctdb_db = ctdb_db_handle(ctdb, name); if (ctdb_db) { @@ -2110,16 +2110,10 @@ struct ctdb_db_context *ctdb_attach(struct ctdb_context *ctdb, data.dptr = discard_const(name); data.dsize = strlen(name)+1; - /* CTDB has switched to using jenkins hash for volatile databases. - * Even if tdb_flags do not explicitly mention TDB_INCOMPATIBLE_HASH, - * always set it. - */ - if (!persistent) { - tdb_flags |= TDB_INCOMPATIBLE_HASH; - } - #ifdef TDB_MUTEX_LOCKING if (!persistent) { + uint32_t mutex_enabled = 0; + ret = ctdb_ctrl_get_tunable(ctdb, timeval_current_ofs(3,0), CTDB_CURRENT_NODE, "TDBMutexEnabled", @@ -2129,11 +2123,16 @@ struct ctdb_db_context *ctdb_attach(struct ctdb_context *ctdb, } if (mutex_enabled == 1) { - tdb_flags |= (TDB_MUTEX_LOCKING | TDB_CLEAR_IF_FIRST); + with_mutex = true; } } #endif + if (persistent) { + db_flags = CTDB_DB_FLAGS_PERSISTENT; + } + tdb_flags = ctdb_db_tdb_flags(db_flags, ctdb->valgrinding, with_mutex); + /* tell ctdb daemon to attach */ ret = ctdb_control(ctdb, CTDB_CURRENT_NODE, tdb_flags, persistent?CTDB_CONTROL_DB_ATTACH_PERSISTENT:CTDB_CONTROL_DB_ATTACH, @@ -2143,7 +2142,7 @@ struct ctdb_db_context *ctdb_attach(struct ctdb_context *ctdb, talloc_free(ctdb_db); return NULL; } - + ctdb_db->db_id = *(uint32_t *)data.dptr; talloc_free(data.dptr); @@ -2154,21 +2153,6 @@ struct ctdb_db_context *ctdb_attach(struct ctdb_context *ctdb, return NULL; } - if (persistent) { - tdb_flags = TDB_DEFAULT; - } else { - tdb_flags = TDB_NOSYNC; -#ifdef TDB_MUTEX_LOCKING - if (mutex_enabled) { - tdb_flags |= (TDB_MUTEX_LOCKING | TDB_CLEAR_IF_FIRST); - } -#endif - } - if (ctdb->valgrinding) { - tdb_flags |= TDB_NOMMAP; - } - tdb_flags |= TDB_DISALLOW_NESTING; - ctdb_db->ltdb = tdb_wrap_open(ctdb_db, ctdb_db->db_path, 0, tdb_flags, O_RDWR, 0); if (ctdb_db->ltdb == NULL) { |