You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2018/08/10 10:28:07 UTC
[1/8] storm git commit: STORM-3180 Total executors in Cluster Summary
in main UI page is not exposed even a topology is running
Repository: storm
Updated Branches:
refs/heads/master c9efe3be9 -> 16e500844
STORM-3180 Total executors in Cluster Summary in main UI page is not exposed even a topology is running
* rename the field of /cluster/summary output: totalExecutors to executorsTotal
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/fdfeb141
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/fdfeb141
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/fdfeb141
Branch: refs/heads/master
Commit: fdfeb14166301fed82b045f41934b693e95577c4
Parents: 1828a17
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Mon Aug 6 22:07:53 2018 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Mon Aug 6 22:07:53 2018 +0900
----------------------------------------------------------------------
.../src/main/java/org/apache/storm/daemon/ui/UIHelpers.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/fdfeb141/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java
----------------------------------------------------------------------
diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java
index 4096763..31c5423 100644
--- a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java
+++ b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java
@@ -571,7 +571,7 @@ public class UIHelpers {
result.put("slotsTotal", totalSlots);
result.put("slotsFree", totalSlots - usedSlots);
result.put("tasksTotal", totalTasks);
- result.put("totalExecutors", totalExecutors);
+ result.put("executorsTotal", totalExecutors);
result.put("totalMem", supervisorTotalMemory);
result.put("totalCpu", supervisorTotalCpu);
[3/8] storm git commit: STORM-3181: Fix for completeLatency in
TopologyStats
Posted by ka...@apache.org.
STORM-3181: Fix for completeLatency in TopologyStats
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/66a1aa34
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/66a1aa34
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/66a1aa34
Branch: refs/heads/master
Commit: 66a1aa34141aa6f5b8b04c73935fd140cf47987e
Parents: 73382d9
Author: Govind Menon <go...@gmail.com>
Authored: Tue Aug 7 15:37:56 2018 -0500
Committer: Govind Menon <go...@gmail.com>
Committed: Tue Aug 7 15:37:56 2018 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/storm/daemon/ui/UIHelpers.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/66a1aa34/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java
----------------------------------------------------------------------
diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java
index 4096763..9567239 100644
--- a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java
+++ b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java
@@ -1148,7 +1148,7 @@ public class UIHelpers {
temp.put("window", window);
temp.put("emitted", emittedStatDisplayMap.get(window));
temp.put("transferred", transferred.get(window));
- temp.put("completeLatency", completeLatency.get(window));
+ temp.put("completeLatency", StatsUtil.floatStr(completeLatency.get(getWindowHint(window))));
temp.put("acked", acked.get(window));
temp.put("failed", failed.get(window));
[7/8] storm git commit: Merge branch 'STORM-3181' of
https://github.com/govind-menon/storm into STORM-3181-merge
Posted by ka...@apache.org.
Merge branch 'STORM-3181' of https://github.com/govind-menon/storm into STORM-3181-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/70e379f7
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/70e379f7
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/70e379f7
Branch: refs/heads/master
Commit: 70e379f7beef92ec6292119161ade8f4b3d20bdd
Parents: 44cf25f 66a1aa3
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Aug 10 19:27:24 2018 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Aug 10 19:27:24 2018 +0900
----------------------------------------------------------------------
.../src/main/java/org/apache/storm/daemon/ui/UIHelpers.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/70e379f7/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java
----------------------------------------------------------------------
[2/8] storm git commit: STORM-3182: Removing superfluous topo id
check from owner resource API request
Posted by ka...@apache.org.
STORM-3182: Removing superfluous topo id check from owner resource API request
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ecec9cf5
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ecec9cf5
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ecec9cf5
Branch: refs/heads/master
Commit: ecec9cf52e61ffd889e51309b1bc2c1df99d7366
Parents: 73382d9
Author: Govind Menon <go...@gmail.com>
Authored: Mon Aug 6 15:44:57 2018 -0500
Committer: Govind Menon <go...@gmail.com>
Committed: Mon Aug 6 15:44:57 2018 -0500
----------------------------------------------------------------------
.../org/apache/storm/daemon/ui/filters/AuthorizedUserFilter.java | 2 +-
.../org/apache/storm/daemon/ui/resources/StormApiResource.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/ecec9cf5/storm-webapp/src/main/java/org/apache/storm/daemon/ui/filters/AuthorizedUserFilter.java
----------------------------------------------------------------------
diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/filters/AuthorizedUserFilter.java b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/filters/AuthorizedUserFilter.java
index c094b82..9a4a2a1 100644
--- a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/filters/AuthorizedUserFilter.java
+++ b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/filters/AuthorizedUserFilter.java
@@ -99,7 +99,7 @@ public class AuthorizedUserFilter implements ContainerRequestFilter {
}
@Override
- public void filter(ContainerRequestContext containerRequestContext) throws IOException {
+ public void filter(ContainerRequestContext containerRequestContext) {
AuthNimbusOp annotation = resourceInfo.getResourceMethod().getAnnotation(AuthNimbusOp.class);
if (annotation == null) {
return;
http://git-wip-us.apache.org/repos/asf/storm/blob/ecec9cf5/storm-webapp/src/main/java/org/apache/storm/daemon/ui/resources/StormApiResource.java
----------------------------------------------------------------------
diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/resources/StormApiResource.java b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/resources/StormApiResource.java
index 6b3c014..12a7f0e 100644
--- a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/resources/StormApiResource.java
+++ b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/resources/StormApiResource.java
@@ -194,7 +194,7 @@ public class StormApiResource {
*/
@GET
@Path("/owner-resources/{id}")
- @AuthNimbusOp(value = "getOwnerResourceSummaries", needsTopoId = true)
+ @AuthNimbusOp(value = "getOwnerResourceSummaries")
@Produces("application/json")
public Response getOwnerResource(@PathParam("id") String id,
@QueryParam(callbackParameterName) String callback) throws TException {
[8/8] storm git commit: Merge branch 'STORM-3179' of
https://github.com/govind-menon/storm into STORM-3179-merge
Posted by ka...@apache.org.
Merge branch 'STORM-3179' of https://github.com/govind-menon/storm into STORM-3179-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/16e50084
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/16e50084
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/16e50084
Branch: refs/heads/master
Commit: 16e500844481aaf8179ea786d00030b1f18729b0
Parents: 70e379f bc1078d
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Aug 10 19:27:46 2018 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Aug 10 19:27:46 2018 +0900
----------------------------------------------------------------------
.../org/apache/storm/daemon/ui/UIHelpers.java | 26 +++++++++-----------
1 file changed, 12 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/16e50084/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java
----------------------------------------------------------------------
[4/8] storm git commit: STORM-3179: Fixing getNimbusSummary in Storm
API
Posted by ka...@apache.org.
STORM-3179: Fixing getNimbusSummary in Storm API
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/bc1078d9
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/bc1078d9
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/bc1078d9
Branch: refs/heads/master
Commit: bc1078d9114da5840c133a56ffda5e1d917b023d
Parents: 73382d9
Author: Govind Menon <go...@gmail.com>
Authored: Tue Aug 7 17:38:23 2018 -0500
Committer: Govind Menon <go...@gmail.com>
Committed: Tue Aug 7 17:38:23 2018 -0500
----------------------------------------------------------------------
.../org/apache/storm/daemon/ui/UIHelpers.java | 26 +++++++++-----------
1 file changed, 12 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/bc1078d9/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java
----------------------------------------------------------------------
diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java
index 4096763..8e88042 100644
--- a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java
+++ b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java
@@ -1909,21 +1909,19 @@ public class UIHelpers {
for (NimbusSummary nimbusSummary : nimbusSummaries) {
Map<String, Object> nimbusSummaryMap = new HashMap();
- if (nimbusSeeds.contains(nimbusSummary.get_host() + ":" + String.valueOf(nimbusSummary.get_port()))) {
- nimbusSummaryMap.put("host", nimbusSummary.get_host());
- nimbusSummaryMap.put("port", nimbusSummary.get_port());
- String status = "Not a Leader";
- if (nimbusSummary.is_isLeader()) {
- status = "Leader";
- }
- nimbusSummaryMap.put("status", status);
- nimbusSummaryMap.put("version", nimbusSummary.get_version());
- nimbusSummaryMap.put("nimbusUpTimeSeconds", nimbusSummary.get_uptime_secs());
- nimbusSummaryMap.put("nimbusUpTime", prettyUptimeSec(nimbusSummary.get_uptime_secs()));
- nimbusSummaryMap.put("nimbusLogLink", getNimbusLogLink(nimbusSummary.get_host(), config));
- resultSummaryList.add(nimbusSummaryMap);
- nimbusSeeds.remove(nimbusSummary.get_host() + ":" + String.valueOf(nimbusSummary.get_port()));
+ nimbusSummaryMap.put("host", nimbusSummary.get_host());
+ nimbusSummaryMap.put("port", nimbusSummary.get_port());
+ String status = "Not a Leader";
+ if (nimbusSummary.is_isLeader()) {
+ status = "Leader";
}
+ nimbusSummaryMap.put("status", status);
+ nimbusSummaryMap.put("version", nimbusSummary.get_version());
+ nimbusSummaryMap.put("nimbusUpTimeSeconds", nimbusSummary.get_uptime_secs());
+ nimbusSummaryMap.put("nimbusUpTime", prettyUptimeSec(nimbusSummary.get_uptime_secs()));
+ nimbusSummaryMap.put("nimbusLogLink", getNimbusLogLink(nimbusSummary.get_host(), config));
+ resultSummaryList.add(nimbusSummaryMap);
+ nimbusSeeds.remove(nimbusSummary.get_host() + ":" + String.valueOf(nimbusSummary.get_port()));
}
for (String nimbusSeed : nimbusSeeds) {
[5/8] storm git commit: Merge branch 'STORM-3180' of
https://github.com/HeartSaVioR/storm into STORM-3180-merge
Posted by ka...@apache.org.
Merge branch 'STORM-3180' of https://github.com/HeartSaVioR/storm into STORM-3180-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e270a1ee
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e270a1ee
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e270a1ee
Branch: refs/heads/master
Commit: e270a1eeab20d794dcc60a697c440b65b03aecc2
Parents: c9efe3b fdfeb14
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Aug 10 19:26:33 2018 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Aug 10 19:26:33 2018 +0900
----------------------------------------------------------------------
.../src/main/java/org/apache/storm/daemon/ui/UIHelpers.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[6/8] storm git commit: Merge branch 'STORM-3182' of
https://github.com/govind-menon/storm into STORM-3182-merge
Posted by ka...@apache.org.
Merge branch 'STORM-3182' of https://github.com/govind-menon/storm into STORM-3182-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/44cf25fa
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/44cf25fa
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/44cf25fa
Branch: refs/heads/master
Commit: 44cf25fa9987b8f91f0147580ab245d73de51928
Parents: e270a1e ecec9cf
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Aug 10 19:27:01 2018 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Aug 10 19:27:01 2018 +0900
----------------------------------------------------------------------
.../org/apache/storm/daemon/ui/filters/AuthorizedUserFilter.java | 2 +-
.../org/apache/storm/daemon/ui/resources/StormApiResource.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------