From: Michael Meffie <mmeffie@sinenomine.net>
Date: Wed, 16 Jan 2013 17:10:02 +0000 (-0500)
Subject: vlclient: add -probe option
X-Git-Tag: upstream/1.6.6_pre2^2~79
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=d64031f3b81ed472e91a4e6823068f81ffefb064;p=packages%2Fo%2Fopenafs.git

vlclient: add -probe option

Add a new option to the vlclient test program to call the
probe server RPC to ping the vlservers in a cell. Uses a multi
rx call to do the probes in parallel.

The existing -host option can be used to ping a single
vlserver.

Reviewed-on: http://gerrit.openafs.org/8911
Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
(cherry picked from commit bb733da134ce7d7742d5b7359edb36f67ec85632)

Change-Id: I9d26e072fafa3e785bb1bc2eb0d8db43fbc1ff57
Reviewed-on: http://gerrit.openafs.org/9570
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Mark Vitale <mvitale@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
---

diff --git a/src/vlserver/vlclient.c b/src/vlserver/vlclient.c
index f2155ea1a..c7bfa7ee8 100644
--- a/src/vlserver/vlclient.c
+++ b/src/vlserver/vlclient.c
@@ -77,7 +77,7 @@ static char *opcode_names[VL_NUMBER_OPCODESX] = {
     "ListAttributes",
     "LinkedList",
     "GetStats",
-    "Probe",
+    "Probe",	/* RPC is ProbeServer */
     "GetAddrs",
     "ChangeAddr",
     "CreateEntryN",
@@ -220,7 +220,42 @@ handleit(struct cmd_syndesc *as, void *arock)
 	exit(1);
     }
 
-    if (as->parms[5].items) {	/* -gstats */
+    if (as->parms[6].items) {	/* -probe */
+	int nconns = 0;
+	int status = 0;
+	int i;
+	char hoststr[16];
+	afs_uint32 addr;
+
+	for (i = 0; cstruct->conns[i]; i++, nconns++) {
+	    rx_SetConnDeadTime(cstruct->conns[i], 6);
+	    addr = rx_HostOf(rx_PeerOf(cstruct->conns[i]));
+	    if (!nconns) {
+		printf("probing");
+	    }
+	    printf(" %s", afs_inet_ntoa_r(addr, hoststr));
+	}
+	if (nconns == 0) {
+	    printf("no connections\n");
+	    return 255;
+	}
+	printf("\n");
+	multi_Rx(cstruct->conns, nconns) {
+	    multi_VL_ProbeServer();
+	    addr = rx_HostOf(rx_PeerOf(cstruct->conns[multi_i]));
+	    if (!multi_error) {
+		printf(" ok: %s\n", afs_inet_ntoa_r(addr, hoststr));
+	    } else {
+		status = 255;
+		printf(" not ok (%d): %s\n", multi_error,
+		       afs_inet_ntoa_r(addr, hoststr));
+	    }
+	}
+	multi_End;
+	return status;
+    }
+
+    if (as->parms[5].items) {	/* -getstats */
 	vldstats stats;
 	vital_vlheader vital_header;
 	code = ubik_VL_GetStats(cstruct, 0, &stats, &vital_header);
@@ -1036,6 +1071,8 @@ main(int argc, char **argv)
 		"cellname '-host' belongs to (required for auth conns)");
     cmd_AddParm(ts, "-getstats", CMD_FLAG, CMD_OPTIONAL,
 		"print vldb statistics (non interactive)");
+    cmd_AddParm(ts, "-probe", CMD_FLAG, CMD_OPTIONAL,
+		"probe vldb servers, use with -host to probe only one. (non interactive)");
     code = cmd_Dispatch(argc, argv);
     exit(code);
 }