[Oar-commits] r2697 - trunk/Scheduler

rcavagna at users.gforge.inria.fr rcavagna at users.gforge.inria.fr
Mon Mar 1 18:21:37 CET 2010


Author: rcavagna
Date: 2010-03-01 18:21:36 +0100 (Mon, 01 Mar 2010)
New Revision: 2697

Modified:
   trunk/Scheduler/oar_sched_gantt_with_timesharing
   trunk/Scheduler/oar_sched_gantt_with_timesharing_and_fairsharing
Log:
Bugfix : Take into account in schedulers nodes in energy saving mode (Hulot)


Modified: trunk/Scheduler/oar_sched_gantt_with_timesharing
===================================================================
--- trunk/Scheduler/oar_sched_gantt_with_timesharing	2010-03-01 15:31:05 UTC (rev 2696)
+++ trunk/Scheduler/oar_sched_gantt_with_timesharing	2010-03-01 17:21:36 UTC (rev 2697)
@@ -291,9 +291,9 @@
             $duration = $moldable->[1] + $security_time_overhead;
         }
 
-        # CM part
+        # CM part and Hulot part (wake up nodes in energy saving mode)
         my $alive_resources_vector_store = $alive_resources_vector;
-        if (is_conf("SCHEDULER_NODE_MANAGER_WAKE_UP_CMD")){
+        if (is_conf("SCHEDULER_NODE_MANAGER_WAKE_UP_CMD") or (get_conf("ENERGY_SAVING_INTERNAL") eq "yes" and is_conf("ENERGY_SAVING_NODE_MANAGER_WAKE_UP_CMD"))){
             foreach my $r (iolib::get_resources_that_can_be_waked_up($base, iolib::get_date($base) + $duration)){
                 vec($alive_resources_vector, $r->{resource_id}, 1) = 1;
             }

Modified: trunk/Scheduler/oar_sched_gantt_with_timesharing_and_fairsharing
===================================================================
--- trunk/Scheduler/oar_sched_gantt_with_timesharing_and_fairsharing	2010-03-01 15:31:05 UTC (rev 2696)
+++ trunk/Scheduler/oar_sched_gantt_with_timesharing_and_fairsharing	2010-03-01 17:21:36 UTC (rev 2697)
@@ -362,9 +362,9 @@
             $duration = $moldable->[1] + $security_time_overhead;
         }
 
-        # CM part
+        # CM part and Hulot part (wake up nodes in energy saving mode)
         my $alive_resources_vector_store = $alive_resources_vector;
-        if (is_conf("SCHEDULER_NODE_MANAGER_WAKE_UP_CMD")){
+        if (is_conf("SCHEDULER_NODE_MANAGER_WAKE_UP_CMD") or (get_conf("ENERGY_SAVING_INTERNAL") eq "yes" and is_conf("ENERGY_SAVING_NODE_MANAGER_WAKE_UP_CMD"))){
             foreach my $r (iolib::get_resources_that_can_be_waked_up($base, iolib::get_date($base) + $duration)){
                 vec($alive_resources_vector, $r->{resource_id}, 1) = 1;
             }




More information about the Oar-commits mailing list