[SCM] CTDB repository - branch master updated - ctdb-1.0.113-67-geae1d4f
Ronnie Sahlberg
sahlberg at samba.org
Wed Feb 3 12:39:39 MST 2010
The branch, master has been updated
via eae1d4f9e52e73b4d8769868fffdafa590d03784 (commit)
from 898b5edfe757cb145960b8f3631029bfd5592119 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit eae1d4f9e52e73b4d8769868fffdafa590d03784
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date: Thu Feb 4 06:37:41 2010 +1100
Drop the debug level for logging fd creation to DEBUG_DEBUG
-----------------------------------------------------------------------
Summary of changes:
common/system_linux.c | 4 ++--
server/ctdb_lockwait.c | 2 +-
server/ctdb_logging.c | 2 +-
server/ctdb_persistent.c | 2 +-
server/ctdb_recover.c | 2 +-
server/ctdb_recoverd.c | 2 +-
server/ctdb_traverse.c | 2 +-
server/ctdb_vacuum.c | 2 +-
tcp/tcp_connect.c | 2 +-
9 files changed, 10 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/common/system_linux.c b/common/system_linux.c
index d8229de..b8aace4 100644
--- a/common/system_linux.c
+++ b/common/system_linux.c
@@ -186,7 +186,7 @@ int ctdb_sys_send_arp(const ctdb_sock_addr *addr, const char *iface)
return -1;
}
- DEBUG(DEBUG_NOTICE, (__location__ " Created SOCKET FD:%d for sending arp\n", s));
+ DEBUG(DEBUG_DEBUG, (__location__ " Created SOCKET FD:%d for sending arp\n", s));
strncpy(ifr.ifr_name, iface, sizeof(ifr.ifr_name));
if (ioctl(s, SIOCGIFINDEX, &ifr) < 0) {
DEBUG(DEBUG_CRIT,(__location__ " interface '%s' not found\n", iface));
@@ -427,7 +427,7 @@ int ctdb_sys_open_capture_socket(const char *iface, void **private_data)
return -1;
}
- DEBUG(DEBUG_NOTICE, (__location__ " Created RAW SOCKET FD:%d for tcp tickle\n", s));
+ DEBUG(DEBUG_DEBUG, (__location__ " Created RAW SOCKET FD:%d for tcp tickle\n", s));
set_nonblocking(s);
set_close_on_exec(s);
diff --git a/server/ctdb_lockwait.c b/server/ctdb_lockwait.c
index e02cd21..afbb921 100644
--- a/server/ctdb_lockwait.c
+++ b/server/ctdb_lockwait.c
@@ -148,7 +148,7 @@ struct lockwait_handle *ctdb_lockwait(struct ctdb_db_context *ctdb_db,
close(result->fd[1]);
set_close_on_exec(result->fd[0]);
- DEBUG(DEBUG_NOTICE, (__location__ " Created PIPE FD:%d to child lockwait process\n", result->fd[0]));
+ DEBUG(DEBUG_DEBUG, (__location__ " Created PIPE FD:%d to child lockwait process\n", result->fd[0]));
talloc_set_destructor(result, lockwait_destructor);
diff --git a/server/ctdb_logging.c b/server/ctdb_logging.c
index 56dcfa2..a7ca1a1 100644
--- a/server/ctdb_logging.c
+++ b/server/ctdb_logging.c
@@ -530,7 +530,7 @@ int ctdb_set_child_logging(struct ctdb_context *ctdb)
ctdb_log_handler, ctdb->log);
ctdb->log->pfd = p[0];
- DEBUG(DEBUG_NOTICE, (__location__ " Created PIPE FD:%d for logging\n", p[0]));
+ DEBUG(DEBUG_DEBUG, (__location__ " Created PIPE FD:%d for logging\n", p[0]));
return 0;
}
diff --git a/server/ctdb_persistent.c b/server/ctdb_persistent.c
index b686cbd..d38aa8d 100644
--- a/server/ctdb_persistent.c
+++ b/server/ctdb_persistent.c
@@ -563,7 +563,7 @@ struct childwrite_handle *ctdb_childwrite(struct ctdb_db_context *ctdb_db,
talloc_set_destructor(result, childwrite_destructor);
- DEBUG(DEBUG_NOTICE, (__location__ " Created PIPE FD:%d for ctdb_childwrite\n", result->fd[0]));
+ DEBUG(DEBUG_DEBUG, (__location__ " Created PIPE FD:%d for ctdb_childwrite\n", result->fd[0]));
result->fde = event_add_fd(ctdb_db->ctdb->ev, result, result->fd[0],
EVENT_FD_READ|EVENT_FD_AUTOCLOSE, childwrite_handler,
diff --git a/server/ctdb_recover.c b/server/ctdb_recover.c
index ecc01e6..9020363 100644
--- a/server/ctdb_recover.c
+++ b/server/ctdb_recover.c
@@ -748,7 +748,7 @@ int32_t ctdb_control_set_recmode(struct ctdb_context *ctdb,
talloc_set_destructor(state, set_recmode_destructor);
- DEBUG(DEBUG_NOTICE, (__location__ " Created PIPE FD:%d for setrecmode\n", state->fd[0]));
+ DEBUG(DEBUG_DEBUG, (__location__ " Created PIPE FD:%d for setrecmode\n", state->fd[0]));
state->te = event_add_timed(ctdb->ev, state, timeval_current_ofs(5, 0),
ctdb_set_recmode_timeout, state);
diff --git a/server/ctdb_recoverd.c b/server/ctdb_recoverd.c
index f910b3e..ebcca1b 100644
--- a/server/ctdb_recoverd.c
+++ b/server/ctdb_recoverd.c
@@ -3496,7 +3496,7 @@ int ctdb_start_recoverd(struct ctdb_context *ctdb)
exit(1);
}
- DEBUG(DEBUG_NOTICE, (__location__ " Created PIPE FD:%d to recovery daemon\n", fd[0]));
+ DEBUG(DEBUG_DEBUG, (__location__ " Created PIPE FD:%d to recovery daemon\n", fd[0]));
event_add_fd(ctdb->ev, ctdb, fd[0], EVENT_FD_READ|EVENT_FD_AUTOCLOSE,
ctdb_recoverd_parent, &fd[0]);
diff --git a/server/ctdb_traverse.c b/server/ctdb_traverse.c
index 26d4328..2c33387 100644
--- a/server/ctdb_traverse.c
+++ b/server/ctdb_traverse.c
@@ -186,7 +186,7 @@ static struct ctdb_traverse_local_handle *ctdb_traverse_local(struct ctdb_db_con
setup a packet queue between the child and the parent. This
copes with all the async and packet boundary issues
*/
- DEBUG(DEBUG_NOTICE, (__location__ " Created PIPE FD:%d to child traverse\n", h->fd[0]));
+ DEBUG(DEBUG_DEBUG, (__location__ " Created PIPE FD:%d to child traverse\n", h->fd[0]));
h->queue = ctdb_queue_setup(ctdb_db->ctdb, h, h->fd[0], 0, ctdb_traverse_local_handler, h);
if (h->queue == NULL) {
diff --git a/server/ctdb_vacuum.c b/server/ctdb_vacuum.c
index 22f4127..7627fdd 100644
--- a/server/ctdb_vacuum.c
+++ b/server/ctdb_vacuum.c
@@ -867,7 +867,7 @@ ctdb_vacuum_event(struct event_context *ev, struct timed_event *te,
timeval_current_ofs(ctdb->tunable.vacuum_max_run_time, 0),
vacuum_child_timeout, child_ctx);
- DEBUG(DEBUG_INFO, (__location__ " Created PIPE FD:%d to child vacuum process\n", child_ctx->fd[0]));
+ DEBUG(DEBUG_DEBUG, (__location__ " Created PIPE FD:%d to child vacuum process\n", child_ctx->fd[0]));
event_add_fd(ctdb->ev, child_ctx, child_ctx->fd[0],
EVENT_FD_READ|EVENT_FD_AUTOCLOSE,
diff --git a/tcp/tcp_connect.c b/tcp/tcp_connect.c
index e1c927d..43ce850 100644
--- a/tcp/tcp_connect.c
+++ b/tcp/tcp_connect.c
@@ -258,7 +258,7 @@ static void ctdb_listen_event(struct event_context *ev, struct fd_event *fde,
set_nonblocking(in->fd);
set_close_on_exec(in->fd);
- DEBUG(DEBUG_NOTICE, (__location__ " Created SOCKET FD:%d to incoming ctdb connection\n", fd));
+ DEBUG(DEBUG_DEBUG, (__location__ " Created SOCKET FD:%d to incoming ctdb connection\n", fd));
setsockopt(in->fd,SOL_SOCKET,SO_KEEPALIVE,(char *)&one,sizeof(one));
--
CTDB repository
More information about the samba-cvs
mailing list