exclusive_host_usage test failed due to usufficient host slots, further cleanup

Author: jgabler-hpc

src/checktree/functional/exclusive_host_usage/check.exp

@@ -74,7 +74,7 @@ lappend check_functions "exclusive_job_consumables"
 proc exclusive_host_usage_setup {} {
    global ts_config CHECK_FIRST_FOREIGN_SYSTEM_USER
    global exclusive_hosts
-   global exclusive_host_usage_complex_backup
+   global exclusive_host_usage_complex_backup exclusive_host_usage_host_backup
 
    if {$ts_config(source_dir) == "none"} {
       ts_log_config "source directory is set to \"none\" - cannot run test"
@@ -92,9 +92,19 @@ proc exclusive_host_usage_setup {} {
    set_complex tmp_complex
 
    # set host complex attributes
-   set host_config(complex_values) "excl=true,jexcl=true"
-   set_exechost host_config [lindex $exclusive_hosts 0]
-   set_exechost host_config [lindex $exclusive_hosts 1]
+   set hosts [concat [lindex $exclusive_hosts 0] [lindex $exclusive_hosts 1]]
+   foreach host $hosts {
+      # backup existing complex values
+      get_exechost eh_backup $host
+      set exclusive_host_usage_host_backup($host) $eh_backup(complex_values)
+
+      # set new ones
+      add_or_replace_array_param host_config exclusive_host_usage_host_backup "complex_values" "excl" "true"
+      add_or_replace_array_param host_config host_config "complex_values" "jexcl" "true"
+      set_exechost host_config $host
+   }
+   # beginning with 9.1.0 we need to increase slots on host level
+   setup_host_slots_for_binding $hosts
 
    # add pes
    set pe(slots)             "100"
@@ -128,7 +138,7 @@ proc exclusive_host_usage_setup {} {
 
 proc exclusive_host_usage_cleanup {} {
    global ts_config
-   global exclusive_host_usage_complex_backup
+   global exclusive_host_usage_complex_backup exclusive_host_usage_host_backup
    global exclusive_hosts
 
    delete_all_jobs
@@ -147,21 +157,16 @@ proc exclusive_host_usage_cleanup {} {
    del_pe "round_robin"
    del_pe "fill_up"
 
-   # remove host complex attributes
-   set host_config(complex_values) "NONE"
-   set_exechost host_config [lindex $exclusive_hosts 0]
-   set_exechost host_config [lindex $exclusive_hosts 1]
+   # restore exec hosts
+   cleanup_host_slots_for_binding
+   host_restore_complex_values exclusive_host_usage_host_backup
 
    # remove exclusive complex
    reset_complex exclusive_host_usage_complex_backup
    unset exclusive_host_usage_complex_backup
 
    # unset our test's global variables
-   foreach var "exclusive_hosts" {
-      if {[info exists $var]} {
-         unset $var
-      }
-   }
+   unset -nocomplain exclusive_hosts exclusive_host_usage_complex_backup exclusive_host_usage_host_backup
 }
 
 proc do_exclusive_usage_test { first_is_exclusive {pe_name ""} {rqs_test 0} } {

src/tcl_files/sge_host.tcl

@@ -945,3 +945,41 @@ proc get_shell_fd_limit_for_host { host user {mode "soft"} } {
    return $ret_val
 }
 
+##
+# @brief Backup complex_values of a list of hosts
+#
+# This procedure backs up the complex_values attribute of a list of hosts.
+# The backup is stored in an associative array passed as argument,
+# where the host names are the keys and the complex_values are the values.
+#
+# @param hostlist List of hosts
+# @param backup_var Name of array variable to store the backup
+# @see host_restore_complex_values
+proc host_backup_complex_values {hostlist backup_var} {
+   upvar $backup_var backup
+
+   foreach host $hostlist {
+      get_exechost eh_backup $host
+      set backup($host) $eh_backup(complex_values)
+   }
+}
+
+##
+# @brief Restore complex_values of a list of hosts from backup
+#
+# The function expects an associative array as argument,
+# where the host names are the keys and the complex_values are the values.
+# It restores the complex_values attribute of each host.
+#
+# @param backup_var Name of array variable containing the backup
+# @see host_backup_complex_values
+proc host_restore_complex_values {backup_var} {
+   upvar $backup_var backup
+
+   foreach host [array names backup] {
+      unset -nocomplain eh_restore
+      set eh_restore(complex_values) $backup($host)
+      set_exechost eh_restore $host
+   }
+}
+

src/tcl_files/sge_procedures.tcl

@@ -3600,7 +3600,7 @@ proc shutdown_execd {host_list {soft 0} {timeout 120}} {
          }
          set result [start_sge_bin "qconf" "$option $host" $ts_config(master_host) $CHECK_USER]
          if {$prg_exit_state != 0} {
-            ts_log_fine "qconf -ke $host returned $prg_exit_state, hard killing execd"
+            ts_log_fine "qconf -ke $host returned $prg_exit_state, hard killing execd:\n$result"
             shutdown_system_daemon $host execd
          }
       }