X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Futils%2Flnetctl.c;h=2328d00b119fa77a7e4b2271d0181ad26149ab70;hp=33bf04638fc74143038d831aadede3c4e1700233;hb=3e5c6620fd0b0511498d14d38e8610d08f6da7b3;hpb=a2e61838f8de89e0f7c80c3bf288cbeb1b358baa

diff --git a/lnet/utils/lnetctl.c b/lnet/utils/lnetctl.c
index 33bf046..2328d00 100644
--- a/lnet/utils/lnetctl.c
+++ b/lnet/utils/lnetctl.c
@@ -84,6 +84,7 @@ static int jt_set_ni_value(int argc, char **argv);
 static int jt_set_peer_ni_value(int argc, char **argv);
 static int jt_calc_service_id(int argc, char **argv);
 static int jt_set_response_tracking(int argc, char **argv);
+static int jt_set_recovery_limit(int argc, char **argv);
 
 command_t cmd_list[] = {
 	{"lnet", jt_lnet, 0, "lnet {configure | unconfigure} [--all]"},
@@ -92,7 +93,10 @@ command_t cmd_list[] = {
 	{"routing", jt_routing, 0, "routing {show | help}"},
 	{"set", jt_set, 0, "set {tiny_buffers | small_buffers | large_buffers"
 			   " | routing | numa_range | max_interfaces"
-			   " | discovery}"},
+			   " | discovery | drop_asym_route | retry_count"
+			   " | transaction_timeout | health_sensitivity"
+			   " | recovery_interval | router_sensitivity"
+			   " | response_tracking | recovery_limit}"},
 	{"import", jt_import, 0, "import FILE.yaml"},
 	{"export", jt_export, 0, "export FILE.yaml"},
 	{"stats", jt_stats, 0, "stats {show | help}"},
@@ -225,6 +229,10 @@ command_t set_cmds[] = {
 	 "\t3 - Both PUTs and GETs are eligible for response tracking (default)\n"
 	 "\tNote: Regardless of the value of the response_tracking parameter LNet\n"
 	 "\t      pings and discovery pushes always utilize response tracking\n"},
+	{"recovery_limit", jt_set_recovery_limit, 0,
+	 "Set how long LNet will attempt to recover unhealthy interfaces.\n"
+	 "\t0 - Recover indefinitely (default)\n"
+	 "\t>0 - Recover for the specified number of seconds.\n"},
 	{ 0, 0, 0, NULL }
 };
 
@@ -372,6 +380,35 @@ static int jt_set_response_tracking(int argc, char **argv)
 	return rc;
 }
 
+static int jt_set_recovery_limit(int argc, char **argv)
+{
+	long int value;
+	int rc;
+	struct cYAML *err_rc = NULL;
+
+	rc = check_cmd(set_cmds, "set", "recovery_limit", 2, argc, argv);
+	if (rc)
+		return rc;
+
+	rc = parse_long(argv[1], &value);
+	if (rc != 0) {
+		cYAML_build_error(-1, -1, "parser", "set",
+				  "cannot parse recovery_limit value",
+				  &err_rc);
+		cYAML_print_tree2file(stderr, err_rc);
+		cYAML_free_tree(err_rc);
+		return -1;
+	}
+
+	rc = lustre_lnet_config_recovery_limit(value, -1, &err_rc);
+	if (rc != LUSTRE_CFG_RC_NO_ERR)
+		cYAML_print_tree2file(stderr, err_rc);
+
+	cYAML_free_tree(err_rc);
+
+	return rc;
+}
+
 static int jt_set_max_intf(int argc, char **argv)
 {
 	long int value;
@@ -1418,6 +1455,12 @@ static int jt_show_global(int argc, char **argv)
 		goto out;
 	}
 
+	rc = lustre_lnet_show_recovery_limit(-1, &show_rc, &err_rc);
+	if (rc != LUSTRE_CFG_RC_NO_ERR) {
+		cYAML_print_tree2file(stderr, err_rc);
+		goto out;
+	}
+
 	if (show_rc)
 		cYAML_print_tree(show_rc);
 
@@ -1754,6 +1797,13 @@ static int jt_export(int argc, char **argv)
 		err_rc = NULL;
 	}
 
+	rc = lustre_lnet_show_recovery_limit(-1, &show_rc, &err_rc);
+	if (rc != LUSTRE_CFG_RC_NO_ERR) {
+		cYAML_print_tree2file(stderr, err_rc);
+		cYAML_free_tree(err_rc);
+		err_rc = NULL;
+	}
+
 	if (show_rc != NULL) {
 		cYAML_print_tree2file(f, show_rc);
 		cYAML_free_tree(show_rc);