Browse Source

AMBARI-3583 - Requests API should rollup tasks information

tbeerbower 11 năm trước cách đây
mục cha
commit
c7f1fed4b8

+ 1 - 1
ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestResourceProvider.java

@@ -248,7 +248,7 @@ class RequestResourceProvider extends AbstractControllerResourceProvider {
                                    completedTaskCount == taskCount ? HostRoleStatus.COMPLETED :
                                                                      HostRoleStatus.PENDING;
     double progressPercent =
-        (queuedTaskCount * 0.09 + inProgressTaskCount * 0.35 + completedTaskCount / (double) taskCount) * 100.0;
+        ((queuedTaskCount * 0.09 + inProgressTaskCount * 0.35 + completedTaskCount)/(double) taskCount) * 100.0;
 
     setResourceProperty(resource, REQUEST_STATUS_PROPERTY_ID, requestStatus.toString(), requestedPropertyIds);
     setResourceProperty(resource, REQUEST_TASK_CNT_ID, taskCount, requestedPropertyIds);

+ 2 - 2
ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestResourceProviderTest.java

@@ -359,10 +359,10 @@ public class RequestResourceProviderTest {
 
       if (id == 100L) {
         Assert.assertEquals(1, resource.getPropertyValue(RequestResourceProvider.REQUEST_COMPLETED_TASK_CNT_ID));
-        Assert.assertEquals(85.0, resource.getPropertyValue(RequestResourceProvider.REQUEST_PROGRESS_PERCENT_ID));
+        Assert.assertEquals(67.5, resource.getPropertyValue(RequestResourceProvider.REQUEST_PROGRESS_PERCENT_ID));
       } else {
         Assert.assertEquals(0, resource.getPropertyValue(RequestResourceProvider.REQUEST_COMPLETED_TASK_CNT_ID));
-        Assert.assertEquals(43.99999999999999, resource.getPropertyValue(RequestResourceProvider.REQUEST_PROGRESS_PERCENT_ID));
+        Assert.assertEquals(21.999999999999996, resource.getPropertyValue(RequestResourceProvider.REQUEST_PROGRESS_PERCENT_ID));
       }
     }