Merge pull request #96 from spodila/fixErrorInTaskSchdlrusgFromTaskSchdlrSvc

Fix scheduling service to call internal versions of TaskScheduler

Author: spodila

fenzo-core/src/main/java/com/netflix/fenzo/TaskScheduler.java

@@ -401,8 +401,7 @@ private EvalResult(List<TaskAssignmentResult> assignmentResults, TaskAssignmentR
     private final ResAllocsEvaluater resAllocsEvaluator;
     private final TaskTracker taskTracker;
     private volatile boolean usingSchedulingService = false;
-    private final IllegalStateException usingSchedSvcExcetption =
-            new IllegalStateException("Invalid call when using task scheduling service");
+    private final String usingSchedSvcMesg = "Invalid call when using task scheduling service";
 
     private TaskScheduler(Builder builder) {
         if(builder.leaseRejectAction ==null)
@@ -600,7 +599,7 @@ public SchedulingResult scheduleOnce(
             List<? extends TaskRequest> requests,
             List<VirtualMachineLease> newLeases) throws IllegalStateException {
         if (usingSchedulingService)
-            throw usingSchedSvcExcetption;
+            throw new IllegalStateException(usingSchedSvcMesg);
         final Iterator<? extends TaskRequest> iterator =
                 requests != null ?
                         requests.iterator() :
@@ -801,7 +800,7 @@ public EvalResult call() throws Exception {
      */
     public Map<String, Map<VMResource, Double[]>> getResourceStatus() throws IllegalStateException {
         if (usingSchedulingService)
-            throw usingSchedSvcExcetption;
+            throw new IllegalStateException(usingSchedSvcMesg);
         return getResourceStatusIntl();
     }
 
@@ -826,7 +825,7 @@ public Map<String, Map<VMResource, Double[]>> getResourceStatus() throws Illegal
      */
     public List<VirtualMachineCurrentState> getVmCurrentStates() throws IllegalStateException {
         if (usingSchedulingService)
-            throw usingSchedSvcExcetption;
+            throw new IllegalStateException(usingSchedSvcMesg);
         return getVmCurrentStatesIntl();
     }
 
@@ -942,7 +941,7 @@ public void expireAllLeases() throws IllegalStateException {
      */
     public Action2<TaskRequest, String> getTaskAssigner() throws IllegalStateException {
         if (usingSchedulingService)
-            throw usingSchedSvcExcetption;
+            throw new IllegalStateException(usingSchedSvcMesg);
         return getTaskAssignerIntl();
     }
 

fenzo-core/src/main/java/com/netflix/fenzo/TaskSchedulingService.java

@@ -169,7 +169,7 @@ private void doPendingActions() {
         final Action1<Map<String, Map<VMResource, Double[]>>> rsAction = resStatusRequest.poll();
         try {
             if (rsAction != null)
-                rsAction.call(taskScheduler.getResourceStatus());
+                rsAction.call(taskScheduler.getResourceStatusIntl());
         } catch (IllegalStateException e) {
             logger.warn("Unexpected when trying to get resource status: " + e.getMessage(), e);
         }