[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1rc2-202-g39d4ef4

[mysql vizuser]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".

The branch, master has been updated
       via  39d4ef4a7e2a4156b636b7585c1c792b401d0328 (commit)
      from  892cfc3d31c4b837b0ed164312f4fa7a2ebbf565 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/39d4ef4a7e2a4156b636b7585c1c792b401d0328

commit 39d4ef4a7e2a4156b636b7585c1c792b401d0328
Author: Pavan Balaji <balaji at mcs.anl.gov>
Date:   Thu Jan 30 02:16:19 2014 -0600

    Provide a way to disable ssh warnings in Hydra.
    
    By default we still print warnings, but if the
    HYDRA_LAUNCHER_SSH_ENABLE_WARNINGS environment variable is set to
    false, we disable it.
    
    Refs #2007.
    
    Signed-off-by: Ken Raffenetti <raffenet at mcs.anl.gov>

diff --git a/src/pm/hydra/tools/bootstrap/external/ssh.c b/src/pm/hydra/tools/bootstrap/external/ssh.c
index 764618f..9c92c5b 100644
--- a/src/pm/hydra/tools/bootstrap/external/ssh.c
+++ b/src/pm/hydra/tools/bootstrap/external/ssh.c
@@ -81,8 +81,9 @@ HYD_status HYDTI_bscd_ssh_store_launch_time(char *hostname)
      * mean that we need to deal with nested calls to the demux engine
      * and process launches. */
     if (time_left > 0) {
-        HYDU_dump(stdout, "WARNING: too many ssh connections to %s; waiting %d seconds\n",
-                  hostname, time_left);
+        if (HYDT_bscd_ssh_warnings)
+            HYDU_dump(stdout, "WARNING: too many ssh connections to %s; waiting %d seconds\n",
+                      hostname, time_left);
         sleep(time_left);
     }
 
diff --git a/src/pm/hydra/tools/bootstrap/external/ssh.h b/src/pm/hydra/tools/bootstrap/external/ssh.h
index 5bac875..eafabff 100644
--- a/src/pm/hydra/tools/bootstrap/external/ssh.h
+++ b/src/pm/hydra/tools/bootstrap/external/ssh.h
@@ -28,6 +28,7 @@ struct HYDT_bscd_ssh_time {
 
 extern int HYDT_bscd_ssh_limit;
 extern int HYDT_bscd_ssh_limit_time;
+extern int HYDT_bscd_ssh_warnings;
 extern struct HYDT_bscd_ssh_time *HYDT_bscd_ssh_time;
 
 HYD_status HYDTI_bscd_ssh_store_launch_time(char *hostname);
diff --git a/src/pm/hydra/tools/bootstrap/external/ssh_init.c b/src/pm/hydra/tools/bootstrap/external/ssh_init.c
index 8633b32..9f02244 100644
--- a/src/pm/hydra/tools/bootstrap/external/ssh_init.c
+++ b/src/pm/hydra/tools/bootstrap/external/ssh_init.c
@@ -10,6 +10,7 @@
 
 int HYDT_bscd_ssh_limit;
 int HYDT_bscd_ssh_limit_time;
+int HYDT_bscd_ssh_warnings;
 
 HYD_status HYDT_bsci_launcher_ssh_init(void)
 {
@@ -27,5 +28,9 @@ HYD_status HYDT_bsci_launcher_ssh_init(void)
     if (rc == 0)
         HYDT_bscd_ssh_limit_time = HYDRA_LAUNCHER_SSH_DEFAULT_LIMIT_TIME;
 
+    rc = MPL_env2bool("HYDRA_LAUNCHER_SSH_ENABLE_WARNINGS", &HYDT_bscd_ssh_warnings);
+    if (rc == 0)
+        HYDT_bscd_ssh_warnings = 1;
+
     return HYD_SUCCESS;
 }

-----------------------------------------------------------------------

Summary of changes:
 src/pm/hydra/tools/bootstrap/external/ssh.c      |    5 +++--
 src/pm/hydra/tools/bootstrap/external/ssh.h      |    1 +
 src/pm/hydra/tools/bootstrap/external/ssh_init.c |    5 +++++
 3 files changed, 9 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
MPICH primary repository