EH: CS-1261 qrsh -verbose shall log which transport client it uses and where the information comes from

Author: jgabler-hpc

source/clients/qsh/msg_qsh.h

@@ -77,5 +77,9 @@
 #define MSG_QSH_UNMATCHED_C                                 _MESSAGE(17037, _("unmatched quote %c."))
 #define MSG_QSH_ERRORRUNNINGIJSSERVER_S                     _MESSAGE(17038, _("error running IJS server: " SFQ))
 #define MSG_QSH_ERRORWHILEWAITINGFORBUILTINIJSCONNECTION_S  _MESSAGE(17039, _("error while waiting for builtin IJS connection: " SFQ)) \
+
+#define MSG_QSH_RSH_CLIENT_FROM_ENVIRONMENT_S               _MESSAGE(17040, _("Got rsh client name from environment: " SFN))
+#define MSG_QSH_RSH_CLIENT_FROM_QMASTER_SS                  _MESSAGE(17041, _("Got " SFN " client name from global/local config: " SFN))
+#define MSG_QSH_RSH_NO_CONFIG_USING_DEFAULT_SS              _MESSAGE(17042, _("No " SFN " client configured in global/local config, using default: " SFN))
                                                                                                                                      \
 // clang-format on

source/clients/qsh/ocs_qsh.cc

@@ -962,6 +962,8 @@ get_client_name(int is_rsh, int is_rlogin, int inherit_job)
       client_name = getenv("SGE_RSH_COMMAND");
       if (client_name != nullptr && strlen(client_name) > 0) {
          DPRINTF("rsh client name: %s\n", client_name);
+         VERBOSE_LOG((stderr, MSG_QSH_RSH_CLIENT_FROM_ENVIRONMENT_S, client_name));
+         VERBOSE_LOG((stderr, "\n"))
          if (strcasecmp(client_name, "builtin") == 0) {
             g_new_interactive_job_support = true;
          }
@@ -1013,6 +1015,7 @@ get_client_name(int is_rsh, int is_rlogin, int inherit_job)
          char default_buffer[SGE_PATH_MAX];
          dstring default_dstring;
 
+         // @todo 1262 there is no utilbin/arch/rsh any more
          sge_dstring_init(&default_dstring, default_buffer, SGE_PATH_MAX);
          sge_dstring_sprintf(&default_dstring, "%s/utilbin/%s/%s", 
                              sge_root, sge_get_arch(), 
@@ -1022,8 +1025,12 @@ get_client_name(int is_rsh, int is_rlogin, int inherit_job)
          /* try to find telnet in PATH */
          client_name = strdup(session_type);
       }
+      VERBOSE_LOG((stderr, MSG_QSH_RSH_NO_CONFIG_USING_DEFAULT_SS, session_type, client_name));
+      VERBOSE_LOG((stderr, "\n"))
    } else {
       client_name = strdup(client_name);
+      VERBOSE_LOG((stderr, MSG_QSH_RSH_CLIENT_FROM_QMASTER_SS, session_type, client_name));
+      VERBOSE_LOG((stderr, "\n"))
    }
 
    if (strcasecmp(client_name, "builtin") == 0) {

source/daemons/execd/exec_job.cc

@@ -910,7 +910,8 @@ int sge_exec_job(lListElem *jep, lListElem *jatep, lListElem *petep, char *err_s
          str_buffer = sge_dstring_sprintf(&dstr_buffer, "%s/%s/%s", execd_spool_dir, active_dir_buffer, PE_HOSTFILE);
          var_list_set_string(&environmentList, "PE_HOSTFILE", str_buffer);
       }
-      /* for tightly integrated jobs, also set the rsh_command SGE_RSH_COMMAND */
+      // for tightly integrated parallel jobs, also set the rsh_command SGE_RSH_COMMAND
+      // it will be read by qrsh -inherit in the job script
       pe = lGetObject(jatep, JAT_pe_object);
       if (pe != nullptr && lGetBool(pe, PE_control_slaves)) {
          const char *mconf_string = mconf_get_rsh_command();
@@ -920,6 +921,7 @@ int sge_exec_job(lListElem *jep, lListElem *jatep, lListElem *petep, char *err_s
             char default_buffer[SGE_PATH_MAX];
             dstring default_dstring;
 
+            // @todo CS-1262 there is no utilbin/arch/rsh any more
             sge_dstring_init(&default_dstring, default_buffer, SGE_PATH_MAX);
             sge_dstring_sprintf(&default_dstring, "%s/utilbin/%s/rsh", sge_root, arch);
             var_list_set_string(&environmentList, "SGE_RSH_COMMAND", sge_dstring_get_string(&default_dstring));