Fix #1517, Fix fake data generation bug

littlezhou · Jan 2, 2018 · 397687f · 397687f
1 parent cd00407
commit 397687f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/smart-engine/src/main/java/org/smartdata/server/SmartEngine.java b/smart-engine/src/main/java/org/smartdata/server/SmartEngine.java
@@ -153,7 +153,7 @@ public List<Utilization> getHistUtilization(String resourceName, long granularit
 
     // fake data
     List<Utilization> utils = new ArrayList<>();
-    long ts = end;
+    long ts = begin;
     if (ts % granularity != 0) {
       ts += granularity;
       ts = (ts / granularity) * granularity;

diff --git a/smart-zeppelin/zeppelin-server/src/main/java/org/smartdata/server/rest/ClusterRestApi.java b/smart-zeppelin/zeppelin-server/src/main/java/org/smartdata/server/rest/ClusterRestApi.java
@@ -123,11 +123,12 @@ public Response utilization(@PathParam("resourceName") String resourceName,
     try {
       long now = System.currentTimeMillis();
       long granularity = Long.valueOf(timeGranularity);
+      if (granularity <= 0) {
+        return new JsonResponse<>(Status.BAD_REQUEST,
+            "Invalid time granularity, must larger than 0").build();
+      }
       long tsEnd = Long.valueOf(endTs);
       long tsBegin = Long.valueOf(beginTs);
-      if (granularity == 0) {
-        granularity = 1;
-      }
       if (tsEnd <= 0) {
         tsEnd += now;
       }