Merge pull request #492 from datacratic/queue_check_only_normal_wait

Queue check only normal wait

starcluster/balancers/sge/__init__.py

@@ -203,7 +203,7 @@ def get_queued_jobs(self):
         """
         queued = []
         for j in self.jobs:
-            if j['job_state'] == u'pending':
+            if j['job_state'] == u'pending' and j['state'] == u'qw':
                 queued.append(j)
         return queued
 
@@ -245,10 +245,11 @@ def slots_per_host(self):
 
     def oldest_queued_job_age(self):
         """
-        This returns the age of the oldest job in the queue
+        This returns the age of the oldest job in the queue in normal waiting
+        state
         """
         for j in self.jobs:
-            if 'JB_submission_time' in j:
+            if 'JB_submission_time' in j and j['state'] == 'qw':
                 st = j['JB_submission_time']
                 dt = utils.iso_to_datetime_tuple(st)
                 return dt.replace(tzinfo=self.remote_tzinfo)