[SCM] CTDB repository - branch 1.2 updated - ctdb-1.9.1-217-gd017164
Ronnie Sahlberg
sahlberg at samba.org
Wed Oct 27 20:48:09 MDT 2010
The branch, 1.2 has been updated
via d017164a57e83d0fff0e70ea45bf09115030ac8b (commit)
via b065e4a05fc5f403f27b8c4a281b449c182e42e3 (commit)
via 4ad3af070080d103c1e9b11161f84e6d96fed3a4 (commit)
via 1250edbf338870c602929cae5f4a5cbd8b5ea540 (commit)
from ba60c7b12e2132a64d7258c4c2eb615fd6bf135a (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=1.2
- Log -----------------------------------------------------------------
commit d017164a57e83d0fff0e70ea45bf09115030ac8b
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date: Thu Oct 28 13:38:34 2010 +1100
during shutdown there is a window after we have stopped TCP and disconnected from all other nodes but before we have stopped all processing.
During this window we may still hit asynchronous events that will fail because we can not send/receive packets from other nodes.
These messages are logged as ... Transport is DOWN. To help indicate that they are benign messages related to the process of shutting down.
These messages spam the syslog during normal shutdown, so this patch will drop the loglevel of these messages to DEBUG, so that they will not appear in or spam the syslog.
commit b065e4a05fc5f403f27b8c4a281b449c182e42e3
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date: Thu Oct 28 13:36:24 2010 +1100
When shuttind down, we always unconditionally try to remove the natgw address
even if we are not currently the natgw master.
This adds extra reliability in case we have stopped previously without removing it proper,
but does add spam messages to syslog everytime we shutdowm.
Remove these spam messages from pulluting the syslog upon normal shutdown
commit 4ad3af070080d103c1e9b11161f84e6d96fed3a4
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date: Thu Oct 28 13:34:33 2010 +1100
Redirect the output from 00.ctdb pfetch to stdout.
Normally, the config.tdb database would not exist, so we do not need
to spam syslog with a "config.tdb does not exist" message every time we start ctdb
commit 1250edbf338870c602929cae5f4a5cbd8b5ea540
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date: Thu Oct 28 13:32:29 2010 +1100
Drop the loglevel of the "reqid wrap" developer debug message to DEBUG
so that we dont spam the logs with this normal benign message.
-----------------------------------------------------------------------
Summary of changes:
common/ctdb_util.c | 2 +-
config/events.d/00.ctdb | 2 +-
config/events.d/11.natgw | 2 +-
server/ctdb_call.c | 8 ++++----
server/ctdb_control.c | 2 +-
server/ctdb_daemon.c | 4 ++--
6 files changed, 10 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/common/ctdb_util.c b/common/ctdb_util.c
index 749b9c2..c705249 100644
--- a/common/ctdb_util.c
+++ b/common/ctdb_util.c
@@ -120,7 +120,7 @@ uint32_t ctdb_reqid_new(struct ctdb_context *ctdb, void *state)
{
int id = idr_get_new_above(ctdb->idr, state, ctdb->lastid+1, INT_MAX);
if (id < 0) {
- DEBUG(DEBUG_NOTICE, ("Reqid wrap!\n"));
+ DEBUG(DEBUG_DEBUG, ("Reqid wrap!\n"));
id = idr_get_new(ctdb->idr, state, INT_MAX);
}
ctdb->lastid = id;
diff --git a/config/events.d/00.ctdb b/config/events.d/00.ctdb
index 1389ae4..61f2031 100755
--- a/config/events.d/00.ctdb
+++ b/config/events.d/00.ctdb
@@ -16,7 +16,7 @@ update_config_from_tdb() {
# Pull optional ctdb configuration data out of config.tdb
PUBLICADDRESSESKEY='public-addresses:node#'`ctdb -t 1 xpnn|sed -e "s/.*://"`
rm -f $CTDB_VARDIR/state/public_addresses
- ctdb pfetch config.tdb $PUBLICADDRESSESKEY $CTDB_VARDIR/state/public_addresses
+ ctdb pfetch config.tdb $PUBLICADDRESSESKEY $CTDB_VARDIR/state/public_addresses 2>/dev/null
[ "$?" = "0" ] && [ `stat --format="%s" /etc/ctdb/state/public_addresses` != "0" ] && [ ! -z "$CTDB_PUBLIC_ADDRESSES" ] && {
diff $CTDB_VARDIR/state/public_addresses $CTDB_PUBLIC_ADDRESSES >/dev/null 2>/dev/null
[ $? = "0" ] || {
diff --git a/config/events.d/11.natgw b/config/events.d/11.natgw
index 34aee19..512f8de 100755
--- a/config/events.d/11.natgw
+++ b/config/events.d/11.natgw
@@ -22,7 +22,7 @@ delete_all() {
local _maskbits=`echo $CTDB_NATGW_PUBLIC_IP | cut -d '/' -f2`
[ -z "$CTDB_NATGW_PUBLIC_IFACE" ] || {
- delete_ip_from_iface $CTDB_NATGW_PUBLIC_IFACE $_ip $_maskbits
+ delete_ip_from_iface $CTDB_NATGW_PUBLIC_IFACE $_ip $_maskbits 2>/dev/null
}
delete_ip_from_iface lo $_ip 32
diff --git a/server/ctdb_call.c b/server/ctdb_call.c
index 0bb7902..c5f7e7d 100644
--- a/server/ctdb_call.c
+++ b/server/ctdb_call.c
@@ -70,7 +70,7 @@ static void ctdb_send_error(struct ctdb_context *ctdb,
int msglen, len;
if (ctdb->methods == NULL) {
- DEBUG(DEBUG_ERR,(__location__ " Failed to send error. Transport is DOWN\n"));
+ DEBUG(DEBUG_INFO,(__location__ " Failed to send error. Transport is DOWN\n"));
return;
}
@@ -413,7 +413,7 @@ void ctdb_request_call(struct ctdb_context *ctdb, struct ctdb_req_header *hdr)
struct ctdb_db_context *ctdb_db;
if (ctdb->methods == NULL) {
- DEBUG(DEBUG_ERR,(__location__ " Failed ctdb_request_call. Transport is DOWN\n"));
+ DEBUG(DEBUG_INFO,(__location__ " Failed ctdb_request_call. Transport is DOWN\n"));
return;
}
@@ -730,7 +730,7 @@ struct ctdb_call_state *ctdb_daemon_call_send_remote(struct ctdb_db_context *ctd
struct ctdb_context *ctdb = ctdb_db->ctdb;
if (ctdb->methods == NULL) {
- DEBUG(DEBUG_ERR,(__location__ " Failed send packet. Transport is down\n"));
+ DEBUG(DEBUG_INFO,(__location__ " Failed send packet. Transport is down\n"));
return NULL;
}
@@ -814,7 +814,7 @@ void ctdb_send_keepalive(struct ctdb_context *ctdb, uint32_t destnode)
struct ctdb_req_keepalive *r;
if (ctdb->methods == NULL) {
- DEBUG(DEBUG_ERR,(__location__ " Failed to send keepalive. Transport is DOWN\n"));
+ DEBUG(DEBUG_INFO,(__location__ " Failed to send keepalive. Transport is DOWN\n"));
return;
}
diff --git a/server/ctdb_control.c b/server/ctdb_control.c
index 3356ba1..90900c9 100644
--- a/server/ctdb_control.c
+++ b/server/ctdb_control.c
@@ -750,7 +750,7 @@ int ctdb_daemon_send_control(struct ctdb_context *ctdb, uint32_t destnode,
size_t len;
if (ctdb->methods == NULL) {
- DEBUG(DEBUG_ERR,(__location__ " Failed to send control. Transport is DOWN\n"));
+ DEBUG(DEBUG_INFO,(__location__ " Failed to send control. Transport is DOWN\n"));
return -1;
}
diff --git a/server/ctdb_daemon.c b/server/ctdb_daemon.c
index 12ad954..5eca727 100644
--- a/server/ctdb_daemon.c
+++ b/server/ctdb_daemon.c
@@ -874,7 +874,7 @@ struct ctdb_req_header *_ctdb_transport_allocate(struct ctdb_context *ctdb,
size = (length+(CTDB_DS_ALIGNMENT-1)) & ~(CTDB_DS_ALIGNMENT-1);
if (ctdb->methods == NULL) {
- DEBUG(DEBUG_ERR,(__location__ " Unable to allocate transport packet for operation %u of length %u. Transport is DOWN.\n",
+ DEBUG(DEBUG_INFO,(__location__ " Unable to allocate transport packet for operation %u of length %u. Transport is DOWN.\n",
operation, (unsigned)length));
return NULL;
}
@@ -1099,7 +1099,7 @@ int ctdb_daemon_send_message(struct ctdb_context *ctdb, uint32_t pnn,
int len;
if (ctdb->methods == NULL) {
- DEBUG(DEBUG_ERR,(__location__ " Failed to send message. Transport is DOWN\n"));
+ DEBUG(DEBUG_INFO,(__location__ " Failed to send message. Transport is DOWN\n"));
return -1;
}
--
CTDB repository
More information about the samba-cvs
mailing list