[DRBD-cvs] svn commit by phil - r2128 - trunk/drbd - improved the status display. Now all bits of DRBD's sta

[drbd-cvs at lists.linbit.com]

Author: phil
Date: 2006-03-31 14:49:16 +0200 (Fri, 31 Mar 2006)
New Revision: 2128

Modified:
   trunk/drbd/drbd_main.c
   trunk/drbd/drbd_proc.c
Log:
improved the status display. Now all bits of DRBD's status
are displayed in /proc/drbd and various kernel log messages.


Modified: trunk/drbd/drbd_main.c
===================================================================
--- trunk/drbd/drbd_main.c	2006-03-30 12:37:02 UTC (rev 2127)
+++ trunk/drbd/drbd_main.c	2006-03-31 12:49:16 UTC (rev 2128)
@@ -527,16 +527,20 @@
 	return ok;
 }
 
-
 static void print_st(drbd_dev* mdev, char *name, drbd_state_t ns)
 {
-	ERR(" %s = { cs:%s st:%s/%s ds:%s/%s }\n",
+	ERR(" %s = { cs:%s st:%s/%s ds:%s/%s %c%c%c%c }\n",
 	    name,
 	    conns_to_name(ns.conn),
 	    roles_to_name(ns.role),
 	    roles_to_name(ns.peer),
 	    disks_to_name(ns.disk),
-	    disks_to_name(ns.pdsk));
+	    disks_to_name(ns.pdsk),
+	    ns.susp ? 's' : 'r',
+	    ns.aftr_isp ? 'a' : '-',
+	    ns.peer_isp ? 'p' : '-',
+	    ns.user_isp ? 'u' : '-'
+	    );
 }
 
 void print_st_err(drbd_dev* mdev, drbd_state_t os, drbd_state_t ns, int err)
@@ -550,6 +554,11 @@
 #define peers_to_name roles_to_name
 #define pdsks_to_name disks_to_name
 
+#define susps_to_name(A) ( (A) ? "1" : "0" )
+#define aftr_isps_to_name(A) ( (A) ? "1" : "0" )
+#define peer_isps_to_name(A) ( (A) ? "1" : "0" )
+#define user_isps_to_name(A) ( (A) ? "1" : "0" )
+
 #define PSC(A) \
 	({ if( ns.A != os.A ) { \
 		pbp += sprintf(pbp, #A "( %s -> %s ) ", \
@@ -686,11 +695,16 @@
 #if DUMP_MD >= 2
 	char *pbp,pb[300];
 	pbp = pb;
+	*pbp=0;
 	PSC(role);
 	PSC(peer);
 	PSC(conn);
 	PSC(disk);
 	PSC(pdsk);
+	PSC(susp);
+	PSC(aftr_isp);
+	PSC(peer_isp);
+	PSC(user_isp);
 	INFO("%s\n", pb);
 #endif
 

Modified: trunk/drbd/drbd_proc.c
===================================================================
--- trunk/drbd/drbd_proc.c	2006-03-30 12:37:02 UTC (rev 2127)
+++ trunk/drbd/drbd_proc.c	2006-03-31 12:49:16 UTC (rev 2128)
@@ -201,7 +201,7 @@
 			seq_printf( seq, "%2d: cs:Unconfigured\n", i);
 		} else {
 			seq_printf( seq,
-			   "%2d: cs:%s st:%s/%s ds:%s/%s\n"
+			   "%2d: cs:%s st:%s/%s ds:%s/%s %c%c%c%c\n"
 			   "    ns:%u nr:%u dw:%u dr:%u al:%u bm:%u "
 			   "lo:%d pe:%d ua:%d ap:%d\n",
 			   i, sn,
@@ -209,6 +209,10 @@
 			   roles_to_name(drbd_conf[i].state.peer),
 			   disks_to_name(drbd_conf[i].state.disk),
 			   disks_to_name(drbd_conf[i].state.pdsk),
+			   drbd_conf[i].state.susp ? 's' : 'r',
+			   drbd_conf[i].state.aftr_isp ? 'a' : '-',
+			   drbd_conf[i].state.peer_isp ? 'p' : '-',
+			   drbd_conf[i].state.user_isp ? 'u' : '-',
 			   drbd_conf[i].send_cnt/2,
 			   drbd_conf[i].recv_cnt/2,
 			   drbd_conf[i].writ_cnt/2,