Changeset 1258 for DCWoRMS/branches/coolemall/src/example/localplugin/Cluster_FCFSBF_ConsolidationPlugin.java

Timestamp:

11/29/13 09:48:39 (11 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/branches/coolemall/src/example/localplugin/Cluster_FCFSBF_ConsolidationPlugin.java (moved) (moved from DCWoRMS/branches/coolemall/src/example/localplugin/FCFSBF_ConsolidationClusterPlugin.java) (6 diffs)

DCWoRMS/branches/coolemall/src/example/localplugin/Cluster_FCFSBF_ConsolidationPlugin.java

@@ -29 +29 @@
 import schedframe.scheduling.tasks.TaskInterface;
 
-public class FCFSBF_ConsolidationClusterPlugin extends BaseLocalSchedulingPlugin {
+public class Cluster_FCFSBF_ConsolidationPlugin extends BaseLocalSchedulingPlugin {
 
-        public FCFSBF_ConsolidationClusterPlugin () {
+        public Cluster_FCFSBF_ConsolidationPlugin () {
         }
 
@@ -54 +54 @@
                                 if (task.getStatus() == DCWormsTags.READY) {
 
-                                        Map<ResourceUnitName, ResourceUnit> choosenResources = null;
-                                        try {
-                                                choosenResources = chooseResourcesForExecution(resourceManager, task);
-                                        } catch (NoSuchFieldException e) {
-                                                // TODO Auto-generated catch block
-                                                e.printStackTrace();
-                                        }
+                                        Map<ResourceUnitName, ResourceUnit> choosenResources =  chooseResourcesForExecution(resourceManager, task);
                                         if (choosenResources  != null) {
                                                 addToSchedulingPlan(plan, task, choosenResources);
@@ -72 +66 @@
         }
         
-        private Map<ResourceUnitName, ResourceUnit> chooseResourcesForExecution(ClusterResourceManager resourceManager, TaskInterface<?> task) throws NoSuchFieldException {
+        private Map<ResourceUnitName, ResourceUnit> chooseResourcesForExecution(ClusterResourceManager resourceManager, TaskInterface<?> task){
 
                 List<Node> nodes = resourceManager.getNodes();
@@ -109 +103 @@
                         }
                         if (memoryRequest != 0) {
-                                Memory memory = new Memory(node.getMemory(), memoryRequest, memoryRequest);
-                                map.put(StandardResourceUnitName.MEMORY, memory);
+                                Memory memory;
+                                try {
+                                        memory = new Memory(node.getMemory(), memoryRequest, memoryRequest);
+                                        map.put(StandardResourceUnitName.MEMORY, memory);
+                                } catch (NoSuchFieldException e) {
+                                        return null;
+                                }
+
                         }
                         return map;
@@ -117 +117 @@
         }
         
-        private List<Node> findSuitableNodes(TaskInterface<?> task, List<Node> nodes) throws NoSuchFieldException{
+        private List<Node> findSuitableNodes(TaskInterface<?> task, List<Node> nodes) {
                 int cpuRequest;
                 try {
@@ -132 +132 @@
                 List<Node> suitableNodes = new ArrayList<Node>();
                 for(Node node: nodes){
-                        if(node.getFreeProcessorsNumber() >= cpuRequest && node.getFreeMemory() >= memoryRequest){
-                                suitableNodes.add(node);
+                        try{
+                                if(node.getFreeProcessorsNumber() >= cpuRequest && node.getFreeMemory() >= memoryRequest){
+                                        suitableNodes.add(node);
+                                }       
+                        } catch (NoSuchFieldException e){
+                                
                         }
                 }