New version : 1.0.112-30

diff --git a/packaging/RPM/ctdb.spec.in b/packaging/RPM/ctdb.spec.in
index 625f3e3a6d1e30c27cafd63ce26b626f189d1449..4017e24ba3f70509c3707a4235aec1c54a4694db 100644 (file)
--- a/packaging/RPM/ctdb.spec.in
+++ b/packaging/RPM/ctdb.spec.in
@@ -5,7 +5,7 @@ Vendor: Samba Team
 Packager: Samba Team <samba@samba.org>
 Name: ctdb
 Version: 1.0.112
-Release: 29
+Release: 30
 Epoch: 0
 License: GNU GPL version 3
 Group: System Environment/Daemons
@@ -125,6 +125,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_docdir}/ctdb/tests/bin/ctdb_transaction
 
 %changelog
+* Mon Jul 26 2010 : Version 1.0.112-30
+ - last minute fix for crash bug in the recent "vacuum abort" code.
+
 * Mon Jul 26 2010 : Version 1.0.112-29
  - Fix for a SEGV that can happen when tcp tickles fail/timeout
    CQ:S1019041

diff --git a/server/ctdb_vacuum.c b/server/ctdb_vacuum.c
index 91ea74fc5e4bd7bb188dae6d445721860dffb7ea..72d86555e401a1ec6d188d1a19d99caa61a9ffe9 100644 (file)
--- a/server/ctdb_vacuum.c
+++ b/server/ctdb_vacuum.c
@@ -660,7 +660,6 @@ static int ctdb_repack_db(struct ctdb_db_context *ctdb_db, int abortfd, TALLOC_C
        vdata->repack_limit = repack_limit;
        vdata->delete_tree = trbt_create(vdata, 0);
        vdata->abortfd = abortfd;
-       vdata->ctdb_db = ctdb_db;
        if (vdata->delete_tree == NULL) {
                DEBUG(DEBUG_ERR,(__location__ " Out of memory\n"));
                talloc_free(vdata);
@@ -939,9 +938,9 @@ void ctdb_stop_vacuuming(struct ctdb_context *ctdb)
        /* FIXME: We don't just free them, since current TDB is not robust
         * against death during transaction commit. */
        for (i = ctdb->vacuumers; i; i = i->next) {
-               DEBUG(DEBUG_INFO, ("Aborting vacuuming for %s (%i)\n",
+               DEBUG(DEBUG_INFO, ("Aborting vacuuming for %s (%p)\n",
                                   i->vacuum_handle->ctdb_db->db_name,
-                                  (int)i->child_pid));
+                                  i->child_pid));
                write(i->abortfd[1], &c, 1);
        }
 }