Changeset 555 for DCWoRMS/trunk

Timestamp:

11/06/12 12:52:07 (12 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/trunk/src

Files:

• example/localplugin/BaseLocalSchedulingPlugin.java (modified) (4 diffs)
• schedframe/scheduling/plan/AllocationInterface.java (modified) (2 diffs)
• schedframe/scheduling/plan/impl/Allocation.java (modified) (2 diffs)
• schedframe/scheduling/policy/local/LocalManagementSystem.java (modified) (2 diffs)

DCWoRMS/trunk/src/example/localplugin/BaseLocalSchedulingPlugin.java

@@ -1 +1 @@
 package example.localplugin;
 
+import java.util.HashMap;
 import java.util.Map;
 
@@ -64 +65 @@
                 Allocation allocation = new Allocation();
                 allocation.setProcessesCount(1);
-                allocation.setSpecificResources(choosenResources);
+                allocation.setRequestedResources(choosenResources);
                 
                 ScheduledTask scheduledTask = new ScheduledTask(task);
@@ -79 +80 @@
                 allocation.setProcessesCount(1);
                 allocation.setProviderName(providerName);
+                allocation.setRequestedResources(new HashMap<ResourceUnitName, ResourceUnit>());
                 
                 ScheduledTask scheduledTask = new ScheduledTask(task);
@@ -93 +95 @@
                 allocation.setProcessesCount(1);
                 allocation.setProviderName(null);
+                allocation.setRequestedResources(new HashMap<ResourceUnitName, ResourceUnit>());
                 
                 ScheduledTask scheduledTask = new ScheduledTask(task);

DCWoRMS/trunk/src/schedframe/scheduling/plan/AllocationInterface.java

@@ -111 +111 @@
         public <ProviderInfo> void setProviderInfo(ProviderInfoInterface<ProviderInfo> providerInfo);
         
-        public void setSpecificResources(Map<ResourceUnitName, ResourceUnit> choosenResources);
+        public void setRequestedResources(Map<ResourceUnitName, ResourceUnit> choosenResources);
         
         public Map<ResourceUnitName, ResourceUnit> getRequestedResources();
@@ -119 +119 @@
         public String getProviderName();
         
-        public boolean isProcessing();
+        //public boolean isProcessing();
 }

DCWoRMS/trunk/src/schedframe/scheduling/plan/impl/Allocation.java

@@ -141 +141 @@
 
         protected Map<ResourceUnitName, ResourceUnit> requestedResources;
-        protected boolean isProcessing = false;
+        //protected boolean isProcessing = false;
         protected String providerName;
 
         @Override
-        public void setSpecificResources(
+        public void setRequestedResources(
                         Map<ResourceUnitName, ResourceUnit> choosenResources) {
                 requestedResources = choosenResources;
-                ResourceManagerUtils.setPendingResources(choosenResources);
-                ProcessingElements processingElements = (ProcessingElements)requestedResources.get(StandardResourceUnitName.PE);
-                if(processingElements != null){
-                        isProcessing = true;
-                }       
+                if(choosenResources != null){
+                        ResourceManagerUtils.setPendingResources(choosenResources);
+                        /*ProcessingElements processingElements = (ProcessingElements)requestedResources.get(StandardResourceUnitName.PE);
+                        if(processingElements != null){
+                                isProcessing = true;
+                        }       */
+                }
+
         }
 
@@ -160 +163 @@
         }
 
-        public boolean isProcessing(){
+        /*public boolean isProcessing(){
                 return isProcessing;
-        }
+        }*/
 
         @Override

DCWoRMS/trunk/src/schedframe/scheduling/policy/local/LocalManagementSystem.java

@@ -198 +198 @@
 
                                 AllocationInterface<?> allocation = allocations.get(j);
-                                if (allocation.isProcessing()) {
+                                if (allocation.getRequestedResources() == null || allocation.getRequestedResources().size() > 0) {
                                         ExecTask exec = (ExecTask) task;                                        
                                         executeTask(exec, allocation.getRequestedResources());
@@ -217 +217 @@
                 Executable exec = (Executable)task;
                 boolean allocationStatus = getAllocationManager().allocateResources(choosenResources);
-                if(allocationStatus == false)
+                if(allocationStatus == false){
+                        log.error("Task requires more resources than is availiable at this moment.");
                         return;
+                }
+
                 removeFromQueue(task);