BF: CS-663 In a default installation on Google Cloud the hostname length is too long for commands

Author: jgabler-hpc

source/clients/qacct/ocs_qacct.cc

@@ -290,7 +290,7 @@ int main(int argc, char **argv)
             if (*(argv[ii+1])=='-') {
                options.hostflag = 1;
             } else {
-               char unique[CL_MAXHOSTLEN];
+               char unique[CL_MAXHOSTNAMELEN + 1];
                lList *answer_list = nullptr;
                gdi_client_prepare_enroll(&answer_list);
                if (getuniquehostname(argv[++ii], unique, 0) != CL_RETVAL_OK) {

source/clients/qhost/ocs_qhost_print.cc

@@ -285,7 +285,7 @@ static int
 sge_print_host(lListElem *hep, lList *centry_list, qhost_report_handler_t *report_handler, lList **alpp, u_long32 show)
 {
    lListElem *lep;
-   char *s, host_print[CL_MAXHOSTLEN+1] = "";
+   char *s, host_print[CL_MAXHOSTNAMELEN+1] = "";
    const char *host;
    char load_avg[20], mem_total[20], mem_used[20], swap_total[20],
         swap_used[20], num_proc[20], socket[20], core[20], arch_string[80], thread[20];
@@ -303,7 +303,7 @@ sge_print_host(lListElem *hep, lList *centry_list, qhost_report_handler_t *repor
    host = lGetHost(hep, EH_name);
 
    /* cut away domain in case of ignore_fqdn */
-   sge_strlcpy(host_print, host, CL_MAXHOSTLEN);
+   sge_strlcpy(host_print, host, CL_MAXHOSTNAMELEN);
    if (ignore_fqdn && (s = strchr(host_print, '.'))) {
       *s = '\0';
    }   

source/daemons/qmaster/configuration_qmaster.cc

@@ -218,7 +218,7 @@ sge_read_configuration(const lListElem *aSpoolContext, lList **config_list, lLis
 int
 sge_del_configuration(sge_gdi_packet_class_t *packet, sge_gdi_task_class_t *task, lListElem *aConf, lList **anAnswer, char *aUser, char *aHost) {
    const char *tmp_name = nullptr;
-   char unique_name[CL_MAXHOSTLEN];
+   char unique_name[CL_MAXHOSTNAMELEN];
    int ret = -1;
 
    DENTER(TOP_LAYER);
@@ -238,7 +238,7 @@ sge_del_configuration(sge_gdi_packet_class_t *packet, sge_gdi_task_class_t *task
    /*
     * Due to CR 6319231 IZ 1760:
     *    try to resolve the hostname
-    *    if it is not resolveable then
+    *    if it is not resolvable then
     *       ignore this and use the hostname stored in the configuration obj
     *       or use the given name if no object can be found
     */
@@ -315,7 +315,7 @@ int
 sge_mod_configuration(lListElem *aConf, lList **anAnswer, const char *aUser, const char *aHost, u_long64 gdi_session) {
    lListElem *old_conf;
    const char *tmp_name = nullptr;
-   char unique_name[CL_MAXHOSTLEN];
+   char unique_name[CL_MAXHOSTNAMELEN];
    int ret = -1;
    const char *cell_root = bootstrap_get_cell_root();
    const char *qualified_hostname = component_get_qualified_hostname();
@@ -730,7 +730,7 @@ static u_long32
 sge_get_config_version_for_host(const char *aName) {
    const lListElem *conf = nullptr;
    u_long32 version = 0;
-   char unique_name[CL_MAXHOSTLEN];
+   char unique_name[CL_MAXHOSTNAMELEN];
    int ret = -1;
    const lList *config_list = *ocs::DataStore::get_master_list(SGE_TYPE_CONFIG);
 
@@ -743,7 +743,7 @@ sge_get_config_version_for_host(const char *aName) {
       /*
        * Due to CR 6319231 IZ 1760:
        *    Try to resolve the hostname
-       *    if it is not resolveable then
+       *    if it is not resolvable then
        *       ignore this and use the given hostname
        */
       ret = sge_resolve_hostname(aName, unique_name, EH_name);
@@ -772,7 +772,7 @@ sge_get_config_version_for_host(const char *aName) {
 lListElem *
 sge_get_configuration_for_host(const char *aName) {
    lListElem *conf = nullptr;
-   char unique_name[CL_MAXHOSTLEN];
+   char unique_name[CL_MAXHOSTNAMELEN];
    int ret = -1;
    const lList *config_list = *ocs::DataStore::get_master_list(SGE_TYPE_CONFIG);
 
@@ -783,7 +783,7 @@ sge_get_configuration_for_host(const char *aName) {
    /*
     * Due to CR 6319231 IZ 1760:
     *    Try to resolve the hostname
-    *    if it is not resolveable then
+    *    if it is not resolvable then
     *       ignore this and use the given hostname
     */
    ret = sge_resolve_hostname(aName, unique_name, EH_name);

source/daemons/qmaster/sge_host_qmaster.cc

@@ -258,7 +258,7 @@ int sge_del_host(sge_gdi_packet_class_t *packet, sge_gdi_task_class_t *task, lLi
    int pos;
    lListElem *ep;
    const char *host;
-   char unique[CL_MAXHOSTLEN];
+   char unique[CL_MAXHOSTNAMELEN];
    lList **host_list = nullptr;
    int nm = 0;
    const char *name = nullptr;
@@ -1019,7 +1019,7 @@ master_kill_execds(sge_gdi_packet_class_t *packet, sge_gdi_task_class_t *task) {
    int kill_jobs;
    lListElem *lel;
    const lListElem *rep;
-   char host[CL_MAXHOSTLEN];
+   char host[CL_MAXHOSTNAMELEN];
    const char *hostname;
    lList *master_ehost_list = *ocs::DataStore::get_master_list_rw(SGE_TYPE_EXECHOST);
 

source/daemons/qmaster/sge_qmaster_heartbeat.cc

@@ -122,8 +122,8 @@ increment_heartbeat(te_event_t anEvent, monitoring_t *monitor)
    int retval = 0;
    int heartbeat = 0;
    int check_act_qmaster_file = 0;
-   char act_qmaster_name[CL_MAXHOSTLEN];
-   char act_resolved_qmaster_name[CL_MAXHOSTLEN];
+   char act_qmaster_name[CL_MAXHOSTNAMELEN];
+   char act_resolved_qmaster_name[CL_MAXHOSTNAMELEN];
    char err_str[SGE_PATH_MAX+128];
    const char *act_qmaster_file = bootstrap_get_act_qmaster_file();
    const char *qualified_hostname = component_get_qualified_hostname();

source/daemons/qmaster/sge_utility_qmaster.cc

@@ -775,7 +775,7 @@ cqueue_mod_sublist(lListElem *this_elem, lList **answer_list, lListElem *reduced
        */
       for_each_rw(mod_elem, mod_list) {
          const char *name = lGetHost(mod_elem, sublist_host_name);
-         char resolved_name[CL_MAXHOSTLEN + 1];
+         char resolved_name[CL_MAXHOSTNAMELEN + 1];
          lListElem *org_elem = nullptr;
 
          if (name == nullptr) {

source/dist/util/install_modules/inst_common.sh

@@ -1078,9 +1078,9 @@ CheckConfigFile()
 
    if [  "$EXECD" = "uninstall" ]; then
       if [ -z "$EXEC_HOST_LIST_RM" ]; then
-         $INFOTEXT -e "Your >EXEC_HOST_LIST_RM< is empty or not resolveable!"
+         $INFOTEXT -e "Your >EXEC_HOST_LIST_RM< is empty or not resolvable!"
          $INFOTEXT -e "For a automatic execd unintallation you have to enter a valid exechost name!"
-         $INFOTEXT -log "Your >EXEC_HOST_LIST_RM< is empty or not resolveable!"
+         $INFOTEXT -log "Your >EXEC_HOST_LIST_RM< is empty or not resolvable!"
          $INFOTEXT -log "For a automatic execd unintallation you have to enter a valid exechost name!"
          is_valid="false"
       fi

source/libs/comm/cl_commlib.cc

@@ -589,7 +589,7 @@ bool cl_com_setup_commlib_complete() {
    return setup_complete;
 }
 
-/* the cl_com_get_(un)resolveable_hosts functions don't need a mutex,
+/* the cl_com_get_(un)resolvable_hosts functions don't need a mutex,
  * because the memory is malloced in cl_com_setup_commlib()
  * and freed in cl_com_cleanup_commlib()
  */
@@ -7637,15 +7637,15 @@ int getuniquehostname(const char *hostin, char *hostout, int refresh_aliases) {
    }
    ret_val = cl_com_cached_gethostbyname((char *) hostin, &resolved_host, nullptr, nullptr, nullptr);
    if (resolved_host != nullptr) {
-      if (strlen(resolved_host) >= CL_MAXHOSTLEN) {
+      if (strlen(resolved_host) >= CL_MAXHOSTNAMELEN) {
          char tmp_buffer[1024];
          snprintf(tmp_buffer, 1024, MSG_CL_COMMLIB_HOSTNAME_EXEEDS_MAX_HOSTNAME_LENGTH_SU,
-                  resolved_host, sge_u32c(CL_MAXHOSTLEN));
+                  resolved_host, sge_u32c(CL_MAXHOSTNAMELEN));
          cl_commlib_push_application_error(CL_LOG_ERROR, CL_RETVAL_HOSTNAME_LENGTH_ERROR, tmp_buffer);
          sge_free(&resolved_host);
          return CL_RETVAL_HOSTNAME_LENGTH_ERROR;
       }
-      snprintf(hostout, CL_MAXHOSTLEN, "%s", resolved_host);
+      snprintf(hostout, CL_MAXHOSTNAMELEN, "%s", resolved_host);
       sge_free(&resolved_host);
    }
    return ret_val;

source/libs/comm/cl_commlib.h

@@ -259,10 +259,6 @@ cl_commlib_get_last_message_time(cl_com_handle_t *handle, const char *un_resolve
 #define COMMD_NACK_CONFLICT CL_RETVAL_ENDPOINT_NOT_UNIQUE
 #define CL_FIRST_FREE_EC    32
 
-#ifndef CL_MAXHOSTLEN
-#define CL_MAXHOSTLEN CL_MAXHOSTNAMELEN_LENGTH   /* TODO: remove this define */
-#endif
-
 int getuniquehostname(const char *hostin, char *hostout, int refresh_aliases);
 
 cl_raw_list_t * cl_com_get_thread_list();

source/libs/comm/cl_communication.cc

@@ -1598,10 +1598,10 @@ char *cl_com_get_h_error_string(int h_error) {
 int cl_com_gethostname(char **unique_hostname, struct in_addr *copy_addr, struct hostent **he_copy,
                        int *system_error_value) {  /* CR check */
 
-   char localhostname[CL_MAXHOSTNAMELEN_LENGTH + 1];
+   char localhostname[CL_MAXHOSTNAMELEN + 1];
 
    errno = 0;
-   if (gethostname(localhostname, CL_MAXHOSTNAMELEN_LENGTH) != 0) {
+   if (gethostname(localhostname, CL_MAXHOSTNAMELEN) != 0) {
       if (system_error_value != nullptr) {
          *system_error_value = errno;
       }
@@ -2277,7 +2277,7 @@ int cl_com_read_alias_file(cl_raw_list_t *hostlist) {
    char alias_file_buffer[LINE_MAX * 4];
    int max_line = LINE_MAX * 4;
    const char *alias_delemiters = "\n\t ,;";
-   char printbuf[(2 * CL_MAXHOSTLEN) + 100];
+   char printbuf[(2 * CL_MAXHOSTNAMELEN) + 100];
 
    if (hostlist == nullptr) {
       return CL_RETVAL_PARAMS;
@@ -2341,7 +2341,7 @@ int cl_com_read_alias_file(cl_raw_list_t *hostlist) {
                return CL_RETVAL_MALLOC;
             }
          } else {
-            CL_LOG_STR(CL_LOG_ERROR, "mainname in alias file is not resolveable:", help);
+            CL_LOG_STR(CL_LOG_ERROR, "mainname in alias file is not resolvable:", help);
             continue;
          }
          while (cl_com_remove_host_alias(main_name) == CL_RETVAL_OK);
@@ -2714,7 +2714,7 @@ int cl_com_cached_gethostbyaddr(struct in_addr *addr, char **unique_hostname, st
 
    if (elem_host != nullptr) {
       if (elem_host->resolved_name == nullptr) {
-         CL_LOG(CL_LOG_INFO, "found addr in cache - not resolveable");
+         CL_LOG(CL_LOG_INFO, "found addr in cache - not resolvable");
          cl_raw_list_unlock(hostlist);
          return CL_RETVAL_GETHOSTADDR_ERROR;
       }