diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2013-08-13 13:55:47 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@gmail.com> | 2013-08-14 14:15:33 +1000 |
| commit | de6b97ce4f57ea64d6825039ea346f031d36d6d3 (patch) | |
| tree | adb34213bf13d4a91a3a08d45a3f575750c3000a /ctdb/client | |
| parent | d349b56e2d36282e464efac48e50b15c7fadda14 (diff) | |
| download | samba-de6b97ce4f57ea64d6825039ea346f031d36d6d3.tar.gz samba-de6b97ce4f57ea64d6825039ea346f031d36d6d3.tar.xz samba-de6b97ce4f57ea64d6825039ea346f031d36d6d3.zip | |
Revert "recoverd: Use correct tdb flags when creating missing databases"
This reverts commit 10a057d8e15c8c18e540598a940d3548c731b0b4.
This approach would not work when creating local databases since currently
there is no control to receive TDB flags for remote databases.
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
(This used to be ctdb commit ca61eb776ab862bd269e45ee0f9f96e7e1e0e001)
Diffstat (limited to 'ctdb/client')
| -rw-r--r-- | ctdb/client/ctdb_client.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c index ebd448ccbf..e801c0138e 100644 --- a/ctdb/client/ctdb_client.c +++ b/ctdb/client/ctdb_client.c @@ -1781,21 +1781,19 @@ int ctdb_ctrl_getdbhealth(struct ctdb_context *ctdb, /* create a database */ -int ctdb_ctrl_createdb(struct ctdb_context *ctdb, struct timeval timeout, uint32_t destnode, - TALLOC_CTX *mem_ctx, const char *name, uint32_t tdb_flags) +int ctdb_ctrl_createdb(struct ctdb_context *ctdb, struct timeval timeout, uint32_t destnode, + TALLOC_CTX *mem_ctx, const char *name, bool persistent) { int ret; int32_t res; TDB_DATA data; - bool persistent; data.dptr = discard_const(name); data.dsize = strlen(name)+1; - persistent = (tdb_flags & CTDB_DB_FLAGS_PERSISTENT); - ret = ctdb_control(ctdb, destnode, 0, - persistent?CTDB_CONTROL_DB_ATTACH_PERSISTENT:CTDB_CONTROL_DB_ATTACH, - tdb_flags, data, + ret = ctdb_control(ctdb, destnode, 0, + persistent?CTDB_CONTROL_DB_ATTACH_PERSISTENT:CTDB_CONTROL_DB_ATTACH, + 0, data, mem_ctx, &data, &res, &timeout, NULL); if (ret != 0 || res != 0) { |