summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2012-12-14 16:47:41 -0600
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-17 08:51:19 -0800
commit6ea5c964ecc4037d4ae56694982be253bd821685 (patch)
treedc0a6999e694922ee62c80a1fade25111eabb49d
parent1c0bd4af222ba3a54bf3ba489127323079d0816d (diff)
downloadlinux-3.10-6ea5c964ecc4037d4ae56694982be253bd821685.tar.gz
linux-3.10-6ea5c964ecc4037d4ae56694982be253bd821685.tar.bz2
linux-3.10-6ea5c964ecc4037d4ae56694982be253bd821685.zip
libceph: report connection fault with warning
When a connection's socket disconnects, or if there's a protocol error of some kind on the connection, a fault is signaled and the connection is reset (closed and reopened, basically). We currently get an error message on the log whenever this occurs. A ceph connection will attempt to reestablish a socket connection repeatedly if a fault occurs. This means that these error messages will get repeatedly added to the log, which is undesirable. Change the error message to be a warning, so they don't get logged by default. Signed-off-by: Alex Elder <elder@inktank.com> Reviewed-by: Sage Weil <sage@inktank.com> (cherry picked from commit 28362986f8743124b3a0fda20a8ed3e80309cce1) Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--net/ceph/messenger.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index 429f3bcb56a..0ff14e88586 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -2365,7 +2365,7 @@ fault:
static void ceph_fault(struct ceph_connection *con)
__releases(con->mutex)
{
- pr_err("%s%lld %s %s\n", ENTITY_NAME(con->peer_name),
+ pr_warning("%s%lld %s %s\n", ENTITY_NAME(con->peer_name),
ceph_pr_addr(&con->peer_addr.in_addr), con->error_msg);
dout("fault %p state %lu to peer %s\n",
con, con->state, ceph_pr_addr(&con->peer_addr.in_addr));