added workaround for CS-1597 to issue_1941 test

Author: Joachim Gabler

src/checktree/bugs/issuezilla/1741/check.exp

@@ -302,9 +302,14 @@ proc issue_check_unsuspended_queue {} {
    wait_for_load_from_all_queues
 
    # check queue state of b.q
-   set state [get_queue_state $bq]
-   if {$state != ""} {
-      ts_log_severe "Queue b.q is not in state running, it is in state $state"
+   # @todo CS-1597 load values are spooled, so wait_for_load_from_all_queues returned immediately
+   if {0} {
+      set state [get_queue_state $bq]
+      if {$state != ""} {
+         ts_log_severe "Queue b.q is not in state running, it is in state $state"
+      }
+   } else {
+      wait_for_queue_state $bq "" 60
    }
 
    # check state state of job
@@ -367,15 +372,25 @@ proc issue_check_unsuspended_queue_with_more_slots {} {
    wait_for_load_from_all_queues
 
    # check queue state of b.q
-   set state [get_queue_state $bq]
-   if {$state != ""} {
-      ts_log_severe "Queue b.q is not in state running, it is in state $state"
+   # @todo CS-1597 load values are spooled, so wait_for_load_from_all_queues returned immediately
+   if {0} {
+      set state [get_queue_state $bq qstat_output]
+      if {$state != ""} {
+         ts_log_severe "Queue b.q is not in state running, it is in state $state\n$qstat_output"
+      }
+   } else {
+      wait_for_queue_state $bq "" 60
    }
 
    # check queue state of a.q
-   set state [get_queue_state $aq]
-   if {$state != ""} {
-      ts_log_severe "Queue a.q is not in state running, it is in state $state"
+   # @todo CS-1597 load values are spooled, so wait_for_load_from_all_queues returned immediately
+   if {0} {
+      set state [get_queue_state $aq qstat_output]
+      if {$state != ""} {
+         ts_log_severe "Queue a.q is not in state running, it is in state $state\n$qstat_output"
+      }
+   } else {
+      wait_for_queue_state $aq "" 60
    }
 
    # check if both jobs are running

src/tcl_files/sge_procedures.tcl

@@ -3514,8 +3514,16 @@ proc wait_for_queue_state {queue state wait_timeout} {
       ts_log_progress
       after 500
       set q_state [get_queue_state $queue]
-      if {[string first $state $q_state] >= 0} {
-         return $q_state
+      # we might want to wait for state "" = no special state = queue is running
+      # need to handle this special case as we cannot pass "" into string first
+      if {$state eq ""} {
+         if {$q_state eq ""} {
+            return $q_state
+         }
+      } else {
+         if {[string first $state $q_state] >= 0} {
+            return $q_state
+         }
       }
       if {[clock seconds] > $my_timeout} {
          set qstat_output [start_sge_bin "qstat" "-f -q $queue"]

src/tcl_files/sge_queue.tcl

@@ -671,6 +671,8 @@ proc mod_queue_state { queuelist state } {
 #
 #  INPUTS
 #     queue - name of the queue
+#     qstat_output_var - if given, the name of a variable which will return the output
+#                        of the qstat command called to get the queue state
 #
 #  RESULT
 #     The return value can contain more than one state. Here is a list of possible
@@ -687,9 +689,13 @@ proc mod_queue_state { queuelist state } {
 #     E(rror)
 #
 #*******************************
-proc get_queue_state { queue_name } {
+proc get_queue_state {queue_name {qstat_output_var ""}} {
   get_current_cluster_config_array ts_config
 
+   if {$qstat_output_var ne ""} {
+      upvar $qstat_output_var result
+   }
+
   # resolve the queue name
   set queue [resolve_queue $queue_name 0]
   # long queue names would be truncated by plain qstat, e.g.