[prev in list] [next in list] [prev in thread] [next in thread] 

List:       grid-engine-cvs
Subject:    CVS update: MODIFIED: sched ...
From:       sgrell () sunsource ! net
Date:       2003-08-27 8:41:26
Message-ID: 20030827084126.5489.qmail () s005 ! sfo ! collab ! net
[Download RAW message or body]

  User: sgrell  
  Date: 03/08/27 01:41:26

  Modified:    source/libs/sched sgeee.c sgeee.h
  Log:
  SG-2003-08-27-1: Bugfix:    Fixed a bug, which I added during some code cleanup
                              with the last commit. Jobs, which did exed the maxujobs
                              limit were ignored during the ticket calculation and \
kept  their tickets from the last calculation.
  
                   Changed:   sge_schedd
  
  Issue number:
  
  Revision  Changes    Path
  1.48      +1 -0      gridengine/source/daemons/schedd/scheduler.c
  
  http://gridengine.sunsource.net/source/browse/gridengine/source/daemons/schedd/scheduler.c.diff?r1=1.47&r2=1.48
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: scheduler.c
  ===================================================================
  RCS file: /cvs/gridengine/source/daemons/schedd/scheduler.c,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -b -r1.47 -r1.48
  --- scheduler.c	2003/08/26 13:13:22	1.47
  +++ scheduler.c	2003/08/27 08:41:25	1.48
  @@ -495,6 +495,7 @@
                       *(splitted_job_lists[SPLIT_RUNNING]),
                       *(splitted_job_lists[SPLIT_FINISHED]),
                       *(splitted_job_lists[SPLIT_PENDING]),
  +                    *(splitted_job_lists[SPLIT_PENDING_EXCLUDED]),
                       orderlist,
                       queue != NULL,
                       nr_pending_jobs > 0); 
  
  
  
  1.43      +10 -1     gridengine/source/libs/sched/sgeee.c
  
  http://gridengine.sunsource.net/source/browse/gridengine/source/libs/sched/sgeee.c.diff?r1=1.42&r2=1.43
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: sgeee.c
  ===================================================================
  RCS file: /cvs/gridengine/source/libs/sched/sgeee.c,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -b -r1.42 -r1.43
  --- sgeee.c	2003/08/26 13:13:24	1.42
  +++ sgeee.c	2003/08/27 08:41:25	1.43
  @@ -4535,6 +4535,7 @@
                  lList *running_jobs,
                  lList *finished_jobs,
                  lList *pending_jobs,
  +               lList *pending_jobs_excluded,
                  lList **orderlist,
                  bool has_queues,
                  bool has_pending_jobs )
  @@ -4550,7 +4551,10 @@
      if (pending_jobs)
         for_each(job, pending_jobs)
            sge_clear_job(job);
  -
  +   if (pending_jobs_excluded){
  +      for_each(job, pending_jobs_excluded)
  +         sge_clear_job(job);
  +   }
      if ((now = sge_get_gmt())<next) { /* normal scheduling interval */
   
         if (classic_sgeee_scheduling) {
  @@ -4629,6 +4633,11 @@
                                           finished_jobs, *orderlist, 1, seqno, \
max_report_job_tickets);  
         next = now + scheddconf.sgeee_schedule_interval;
  +   }
  +
  +   if (pending_jobs_excluded){
  +      *orderlist = sge_build_sge_orders(lists, NULL, pending_jobs_excluded, NULL,
  +                                        *orderlist, 0, seqno, \
max_report_job_tickets);  }
   
      if(!has_pending_jobs || !has_queues)
  
  
  
  1.12      +1 -0      gridengine/source/libs/sched/sgeee.h
  
  http://gridengine.sunsource.net/source/browse/gridengine/source/libs/sched/sgeee.h.diff?r1=1.11&r2=1.12
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: sgeee.h
  ===================================================================
  RCS file: /cvs/gridengine/source/libs/sched/sgeee.h,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -b -r1.11 -r1.12
  --- sgeee.h	2003/08/26 13:13:25	1.11
  +++ sgeee.h	2003/08/27 08:41:25	1.12
  @@ -130,6 +130,7 @@
                       lList *running_jobs,
                       lList *finished_jobs,
                       lList *pending_jobs,
  +                    lList *pending_jobs_excluded,
                       lList **orderlist,
                       bool has_queues,
                       bool has_pending_jobs );
  
  
  


[prev in list] [next in list] [prev in thread] [next in thread]