[SCM] CTDB repository - branch master updated - ctdb-1.0.102-21-g020e2e3

[Ronnie Sahlberg]

The branch, master has been updated
       via  020e2e30e56b9675f345ee62d6bf585396208059 (commit)
       via  fb83dba255fc91413a475b273e374e0c4d538137 (commit)
       via  209ff041596e39688186c99995863ed3e816b8e4 (commit)
       via  f98fefbc566eefbfcc660646af6e25256ab82b13 (commit)
      from  a5d90d8ed8b44355c4ffb9c32ded772025fcc174 (commit)

http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 020e2e30e56b9675f345ee62d6bf585396208059
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Tue Nov 3 11:46:37 2009 +1100

    new version 1.0.103

commit fb83dba255fc91413a475b273e374e0c4d538137
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Tue Nov 3 10:48:27 2009 +1100

    move the check to skip vacuuming on persistent database to the ctdb_vacuuming_init() function

commit 209ff041596e39688186c99995863ed3e816b8e4
Author: Michael Adam <obnox at samba.org>
Date:   Mon Nov 2 01:37:07 2009 +0100

    packaging: use githash in rpm release by default.
    
    setting USE_GITHASH=no in the environment makes
    makerpms.sh omit the git hash
    
    Michael

commit f98fefbc566eefbfcc660646af6e25256ab82b13
Author: Michael Adam <obnox at samba.org>
Date:   Tue Nov 3 00:04:27 2009 +0100

    server: disable vacuuming for persistent tdbs.
    
    The vacuum process treats persistent databases the same as
    non-persistent and thus ignores the extra state for transactions.
    This way, it breaks the api-level transactions.
    
    Michael

-----------------------------------------------------------------------

Summary of changes:
 packaging/RPM/{ctdb.spec => ctdb.spec.in} |   12 ++++++++++--
 packaging/RPM/makerpms.sh                 |   11 +++++++++++
 server/ctdb_ltdb_server.c                 |    3 ++-
 server/ctdb_vacuum.c                      |    5 +++++
 4 files changed, 28 insertions(+), 3 deletions(-)
 rename packaging/RPM/{ctdb.spec => ctdb.spec.in} (98%)


Changeset truncated at 500 lines:

diff --git a/packaging/RPM/ctdb.spec b/packaging/RPM/ctdb.spec.in
similarity index 98%
rename from packaging/RPM/ctdb.spec
rename to packaging/RPM/ctdb.spec.in
index a64b4b8..2052ae4 100644
--- a/packaging/RPM/ctdb.spec
+++ b/packaging/RPM/ctdb.spec.in
@@ -4,8 +4,8 @@ Summary: Clustered TDB
 Vendor: Samba Team
 Packager: Samba Team <samba at samba.org>
 Name: ctdb
-Version: 1.0.102
-Release: 1
+Version: 1.0.103
+Release: 1GITHASH
 Epoch: 0
 License: GNU GPL version 3
 Group: System Environment/Daemons
@@ -118,6 +118,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/ctdb.pc
 
 %changelog
+* Tue Nov 3 2009 : Version 1.0.103
+ - Dont use vacuuming on persistent databases
+ - Michael A : transaction updates to persistent databases
+ - Dont activate service automatically when installing the RPM. Leave this to the admin.
+ - Create a child process to send all log messages to, to prevent a hung/slow syslogd
+   from blocking the main daemon. In this case, discard log messages instead and let the child
+   process block.
+ - Michael A: updates to log messages
 * Thu Oct 29 2009 : Version 1.0.102
  - Wolfgang: fix for the vacuuming code
  - Wolfgang: stronger tests for persistent database filename tests
diff --git a/packaging/RPM/makerpms.sh b/packaging/RPM/makerpms.sh
index 846ab7f..a51099c 100755
--- a/packaging/RPM/makerpms.sh
+++ b/packaging/RPM/makerpms.sh
@@ -41,8 +41,19 @@ SPECDIR=`rpm --eval %_specdir`
 SRCDIR=`rpm --eval %_sourcedir`
 
 SPECFILE="ctdb.spec"
+SPECFILE_IN="ctdb.spec.in"
 RPMBUILD="rpmbuild"
 
+GITHASH=".$(git log --pretty=format:%h -1)"
+
+if test "x$USE_GITHASH" = "xno" ; then
+	GITHASH=""
+fi
+
+sed -e s/GITHASH/${GITHASH}/g \
+	< ${DIRNAME}/${SPECFILE_IN} \
+	> ${DIRNAME}/${SPECFILE}
+
 VERSION=$(grep ^Version ${DIRNAME}/${SPECFILE} | sed -e 's/^Version:\ \+//')
 RELEASE=$(grep ^Release ${DIRNAME}/${SPECFILE} | sed -e 's/^Release:\ \+//')
 
diff --git a/server/ctdb_ltdb_server.c b/server/ctdb_ltdb_server.c
index 09e40c7..1aa0f69 100644
--- a/server/ctdb_ltdb_server.c
+++ b/server/ctdb_ltdb_server.c
@@ -295,7 +295,8 @@ static int ctdb_local_attach(struct ctdb_context *ctdb, const char *db_name, boo
 
 	ret = ctdb_vacuum_init(ctdb_db);
 	if (ret != 0) {
-		DEBUG(DEBUG_CRIT,("Failed to setup vacuuming for database '%s'\n", ctdb_db->db_name));
+		DEBUG(DEBUG_CRIT,("Failed to setup vacuuming for "
+				  "database '%s'\n", ctdb_db->db_name));
 		talloc_free(ctdb_db);
 		return -1;
 	}
diff --git a/server/ctdb_vacuum.c b/server/ctdb_vacuum.c
index 80e5dbd..52f2060 100644
--- a/server/ctdb_vacuum.c
+++ b/server/ctdb_vacuum.c
@@ -872,6 +872,11 @@ ctdb_vacuum_event(struct event_context *ev, struct timed_event *te,
  */
 int ctdb_vacuum_init(struct ctdb_db_context *ctdb_db)
 {
+	if (ctdb_db->persistent != 0) {
+		DEBUG(DEBUG_ERR,("Vacuuming is disabled for persistent database %s\n", ctdb_db->db_name));
+		return 0;
+	}
+
 	ctdb_db->vacuum_handle = talloc(ctdb_db, struct ctdb_vacuum_handle);
 	CTDB_NO_MEMORY(ctdb_db->ctdb, ctdb_db->vacuum_handle);
 


-- 
CTDB repository