diff options
| author | Michael Adam <obnox@samba.org> | 2011-03-11 15:57:45 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2011-03-14 13:35:52 +0100 |
| commit | fe852ca33741049d9da6fc1e9416ac32a76d05cf (patch) | |
| tree | 27263ca261bd00321b14370ef9bf6d915c17e87a | |
| parent | 74f65b6ca62d7c306b2c9654faf1fd2b4faaaf5d (diff) | |
| download | samba-fe852ca33741049d9da6fc1e9416ac32a76d05cf.tar.gz samba-fe852ca33741049d9da6fc1e9416ac32a76d05cf.tar.xz samba-fe852ca33741049d9da6fc1e9416ac32a76d05cf.zip | |
vacuum: use insert_record_into_delete_queue in ctdb_local_schedule_for_deletion.
This is to take advantage of the hash collision handling and logging
also in ctdb_local_schedule_for_deletion.
(This used to be ctdb commit 52193b6692091e341ed7a81dbd9a61ae49a8aac5)
| -rw-r--r-- | ctdb/server/ctdb_vacuum.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/ctdb/server/ctdb_vacuum.c b/ctdb/server/ctdb_vacuum.c index e34627cf9f..5be946af0e 100644 --- a/ctdb/server/ctdb_vacuum.c +++ b/ctdb/server/ctdb_vacuum.c @@ -1360,14 +1360,9 @@ int32_t ctdb_local_schedule_for_deletion(struct ctdb_db_context *ctdb_db, if (ctdb_db->ctdb->ctdbd_pid == getpid()) { /* main daemon - directly queue */ - ret = insert_delete_record_data_into_tree(ctdb_db->ctdb, - ctdb_db, - ctdb_db->delete_queue, - hdr, key); - if (ret != 0) { - return -1; - } - return 0; + ret = insert_record_into_delete_queue(ctdb_db, hdr, key); + + return ret; } /* child process: send the main daemon a control */ |