[SCM] CTDB repository - branch master updated - c8181476748395fe6ec5284c49e9d37b882d15ea

[Ronnie Sahlberg]

The branch, master has been updated
       via  c8181476748395fe6ec5284c49e9d37b882d15ea (commit)
       via  1360c2f08a463f288b344d02025e84113743026d (commit)
       via  c66e44d44f8d1142394ce5c6a68ac09fd67211fe (commit)
       via  56af7df33456bf10d19b97cb005257720ac0b610 (commit)
      from  d32b16a4e5ecc31563c6f2767e7d483f3d980284 (commit)

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


- Log -----------------------------------------------------------------
commit c8181476748395fe6ec5284c49e9d37b882d15ea
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Wed May 21 11:50:41 2008 +1000

    lowe the loglevel for the warning that releaseip was called for a non-public address.
    
    the address might be a public address on a different node so no need to fiull up the logs with thoise messages

commit 1360c2f08a463f288b344d02025e84113743026d
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Wed May 21 11:44:50 2008 +1000

     lower the loglevel for when we have "tickles" for an ip address that is not a public address on the local node (it may be a public address on other nodes)

commit c66e44d44f8d1142394ce5c6a68ac09fd67211fe
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Wed May 21 11:23:46 2008 +1000

    dont emit the can not start transaction with locks held at all.
    it just pollutes the logs

commit 56af7df33456bf10d19b97cb005257720ac0b610
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Wed May 21 11:15:14 2008 +1000

    lower the debug level for the "can not start transaction" since we do expect this to happen a few times inside ctdb (since we cant really block and wait for all locks to dissapear before we can write the header, for example when doing a dmaster miration)
    in those cases we accept that we couldnt get a transaction and then just writes the data "unsafely" anyway.

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

Summary of changes:
 lib/tdb/common/transaction.c |    2 +-
 server/ctdb_takeover.c       |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/tdb/common/transaction.c b/lib/tdb/common/transaction.c
index 4e2127b..5e5260b 100644
--- a/lib/tdb/common/transaction.c
+++ b/lib/tdb/common/transaction.c
@@ -419,7 +419,7 @@ int tdb_transaction_start(struct tdb_context *tdb)
 		/* the caller must not have any locks when starting a
 		   transaction as otherwise we'll be screwed by lack
 		   of nested locks in posix */
-		TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_transaction_start: cannot start a transaction with locks held\n"));
+//		TDB_LOG((tdb, TDB_DEBUG_TRACE, "tdb_transaction_start: cannot start a transaction with locks held\n"));
 		tdb->ecode = TDB_ERR_LOCK;
 		return -1;
 	}
diff --git a/server/ctdb_takeover.c b/server/ctdb_takeover.c
index 517970b..1f1111f 100644
--- a/server/ctdb_takeover.c
+++ b/server/ctdb_takeover.c
@@ -323,7 +323,7 @@ int32_t ctdb_control_release_ip(struct ctdb_context *ctdb,
 	/* update our vnn list */
 	vnn = find_public_ip_vnn(ctdb, pip->sin);
 	if (vnn == NULL) {
-		DEBUG(DEBUG_ERR,("releaseip called for an ip '%s' that is not a public address\n", 
+		DEBUG(DEBUG_INFO,("releaseip called for an ip '%s' that is not a public address\n", 
 			 inet_ntoa(pip->sin.sin_addr)));
 		return 0;
 	}
@@ -1545,7 +1545,7 @@ int32_t ctdb_control_set_tcp_tickle_list(struct ctdb_context *ctdb, TDB_DATA ind
 
 	vnn = find_public_ip_vnn(ctdb, list->ip);
 	if (vnn == NULL) {
-		DEBUG(DEBUG_ERR,(__location__ " Could not set tcp tickle list, '%s' is not a public address\n", 
+		DEBUG(DEBUG_INFO,(__location__ " Could not set tcp tickle list, '%s' is not a public address\n", 
 			 inet_ntoa(list->ip.sin_addr))); 
 		return 1;
 	}


-- 
CTDB repository