From 947afd3ed44d94a28472b48afeb1a4fee2c0ee2b Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Thu, 31 Jan 2008 09:57:44 -0800
Subject: [PATCH] msgr: turn down messenger debug defaults

---
 src/TODO               |  6 +++++-
 src/kernel/ktcp.c      |  4 ++--
 src/kernel/messenger.c |  2 +-
 src/kernel/super.c     | 30 +++++++++++++++++++-----------
 src/kernel/super.h     |  1 +
 5 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/TODO b/src/TODO
index 1cb3eda3c2559..a61782984259e 100644
--- a/src/TODO
+++ b/src/TODO
@@ -20,6 +20,11 @@ code cleanup
 
 
 kernel client
+- some bugs
+ - open path needs to call fill_trace/fill_inode such that ci->i_max_size gets filled in
+ - echo blah >> mnt/blah "appends" from offset zero, regardless of file size
+ - cap handler probably needs i_mutex or something when updating file sizes
+   - which means it probably needs to be done in a different worker thread (NOT the messenger's)
 - msgr layer
   - callbacks for 'remote reset'
   - idle state, to keep connect_seq around after a disconnect
@@ -31,7 +36,6 @@ kernel client
  - getattr should do an lstat?
  - d_revalidate?
  - test truncate
- - open path needs to call fill_trace/fill_inode such that ci->i_max_size gets filled in
 - is ino_t really still 32 bits on i386??  hrm!
 - fix file open vs file_cap race
   - preemptively release caps as part of request if doing utimes/etc. on an open file?
diff --git a/src/kernel/ktcp.c b/src/kernel/ktcp.c
index 5eacf4403f0a5..9dffa0d7dc25f 100644
--- a/src/kernel/ktcp.c
+++ b/src/kernel/ktcp.c
@@ -5,8 +5,8 @@
 #include "messenger.h"
 #include "ktcp.h"
 
-int ceph_tcp_debug = 50;
-#define DOUT_VAR ceph_tcp_debug
+int ceph_debug_tcp = 1;
+#define DOUT_VAR ceph_debug_tcp
 #define DOUT_PREFIX "tcp: "
 #include "super.h"
 
diff --git a/src/kernel/messenger.c b/src/kernel/messenger.c
index 9af4f410dedf5..5108ce1652be4 100644
--- a/src/kernel/messenger.c
+++ b/src/kernel/messenger.c
@@ -8,7 +8,7 @@
 #include "messenger.h"
 #include "ktcp.h"
 
-int ceph_debug_msgr = 50;
+int ceph_debug_msgr = 1;
 #define DOUT_VAR ceph_debug_msgr
 #define DOUT_PREFIX "msgr: " 
 #include "super.h"
diff --git a/src/kernel/super.c b/src/kernel/super.c
index 026be7c511284..f628f6f904fa0 100644
--- a/src/kernel/super.c
+++ b/src/kernel/super.c
@@ -198,6 +198,7 @@ enum {
 	Opt_fsidminor,
 	Opt_debug,
 	Opt_debug_msgr,
+	Opt_debug_tcp,
 	Opt_debug_mdsc,
 	Opt_debug_osdc,
 	Opt_monport,
@@ -210,6 +211,7 @@ static match_table_t arg_tokens = {
 	{Opt_fsidminor, "fsidminor=%ld"},
 	{Opt_debug, "debug=%d"},
 	{Opt_debug_msgr, "debug_msgr=%d"},
+	{Opt_debug_tcp, "debug_tcp=%d"},
 	{Opt_debug_mdsc, "debug_mdsc=%d"},
 	{Opt_debug_osdc, "debug_osdc=%d"},
 	{Opt_monport, "monport=%d"},
@@ -321,29 +323,35 @@ static int parse_mount_args(int flags, char *options, const char *dev_name,
 				args->mon_addr[i].ipaddr.sin_port =
 					htons(intval);
 			break;
+		case Opt_port:
+			args->my_addr.ipaddr.sin_port = htons(intval);
+			break;
+		case Opt_ip:
+			err = parse_ip(argstr[0].from,
+				       argstr[0].to-argstr[0].from,
+				       &args->my_addr);
+			if (err < 0)
+				return err;
+			args->flags |= CEPH_MOUNT_MYIP;
+			break;
+			
+			/* debug levels */
 		case Opt_debug:
 			ceph_debug = intval;
 			break;
 		case Opt_debug_msgr:
 			ceph_debug_msgr = intval;
 			break;
+		case Opt_debug_tcp:
+			ceph_debug_tcp = intval;
+			break;
 		case Opt_debug_mdsc:
 			ceph_debug_mdsc = intval;
 			break;
 		case Opt_debug_osdc:
 			ceph_debug_osdc = intval;
 			break;
-		case Opt_port:
-			args->my_addr.ipaddr.sin_port = htons(intval);
-			break;
-		case Opt_ip:
-			err = parse_ip(argstr[0].from,
-				       argstr[0].to-argstr[0].from,
-				       &args->my_addr);
-			if (err < 0)
-				return err;
-			args->flags |= CEPH_MOUNT_MYIP;
-			break;
+
 		default:
 			derr(1, "parse_mount_args bad token %d\n", token);
 			continue;
diff --git a/src/kernel/super.h b/src/kernel/super.h
index cc4a650d7fe25..ce609427d7bdb 100644
--- a/src/kernel/super.h
+++ b/src/kernel/super.h
@@ -13,6 +13,7 @@
 
 extern int ceph_debug;
 extern int ceph_debug_msgr;
+extern int ceph_debug_tcp;
 extern int ceph_debug_mdsc;
 extern int ceph_debug_osdc;
 
-- 
2.39.5