diff options
| author | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2011-09-08 11:22:53 +1000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2011-09-08 11:22:53 +1000 |
| commit | 1c05db2c9c0173ab30958cd5afceb46efb4b11c4 (patch) | |
| tree | 6fb8d04fce7481494345b07d52a24f0d6dc7b289 /ctdb/tests/src/ctdb_persistent.c | |
| parent | b0fdfd8ec9a035c4c66e6a146b43f9a0a27da707 (diff) | |
| parent | 66f92be635f5d001fb82517175f44cc72fe7db61 (diff) | |
| download | samba-1c05db2c9c0173ab30958cd5afceb46efb4b11c4.tar.gz samba-1c05db2c9c0173ab30958cd5afceb46efb4b11c4.tar.xz samba-1c05db2c9c0173ab30958cd5afceb46efb4b11c4.zip | |
Merge remote branch 'ddiss/master_pmda_and_client_timeouts'
(This used to be ctdb commit 7bebfc7bad8f36e54003b8e25372fdaf54836e21)
Diffstat (limited to 'ctdb/tests/src/ctdb_persistent.c')
| -rw-r--r-- | ctdb/tests/src/ctdb_persistent.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ctdb/tests/src/ctdb_persistent.c b/ctdb/tests/src/ctdb_persistent.c index 6074b6a1e3..98c100f4ed 100644 --- a/ctdb/tests/src/ctdb_persistent.c +++ b/ctdb/tests/src/ctdb_persistent.c @@ -220,7 +220,7 @@ int main(int argc, const char *argv[]) ev = event_context_init(NULL); - ctdb = ctdb_cmdline_client(ev); + ctdb = ctdb_cmdline_client(ev, timeval_current_ofs(3, 0)); if (ctdb == NULL) { printf("Could not attach to daemon\n"); return 1; @@ -228,9 +228,11 @@ int main(int argc, const char *argv[]) /* attach to a specific database */ if (unsafe_writes == 1) { - ctdb_db = ctdb_attach(ctdb, "persistent.tdb", true, TDB_NOSYNC); + ctdb_db = ctdb_attach(ctdb, timeval_current_ofs(2, 0), + "persistent.tdb", true, TDB_NOSYNC); } else { - ctdb_db = ctdb_attach(ctdb, "persistent.tdb", true, 0); + ctdb_db = ctdb_attach(ctdb, timeval_current_ofs(2, 0), + "persistent.tdb", true, 0); } if (!ctdb_db) { |