You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2016/01/27 19:50:54 UTC
[1/3] storm git commit: Link to supervisor logs form UI
Repository: storm
Updated Branches:
refs/heads/master ecce1ceb0 -> 195d15174
Link to supervisor logs form UI
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/21f56e91
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/21f56e91
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/21f56e91
Branch: refs/heads/master
Commit: 21f56e91efd4af4a8b2c54d6ba6b50b717f2aca7
Parents: 36f03ed
Author: Yegor Tokmakov <ye...@tokmakov.biz>
Authored: Tue Jan 26 19:58:59 2016 +0100
Committer: Yegor Tokmakov <ye...@tokmakov.biz>
Committed: Tue Jan 26 19:58:59 2016 +0100
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/ui/core.clj | 10 +++++++---
.../src/ui/public/templates/index-page-template.html | 2 +-
2 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/21f56e91/storm-core/src/clj/org/apache/storm/ui/core.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/ui/core.clj b/storm-core/src/clj/org/apache/storm/ui/core.clj
index 1139eb2..d726991 100644
--- a/storm-core/src/clj/org/apache/storm/ui/core.clj
+++ b/storm-core/src/clj/org/apache/storm/ui/core.clj
@@ -149,8 +149,11 @@
(let [fname (logs-filename topology-id port)]
(logviewer-link host fname secure?)))
-(defn nimbus-log-link [host port]
- (url-format "http://%s:%s/daemonlog?file=nimbus.log" host (*STORM-CONF* LOGVIEWER-PORT) port))
+(defn nimbus-log-link [host]
+ (url-format "http://%s:%s/daemonlog?file=nimbus.log" host (*STORM-CONF* LOGVIEWER-PORT)))
+
+(defn supervisor-log-link [host]
+ (url-format "http://%s:%s/daemonlog?file=supervisor.log" host (*STORM-CONF* LOGVIEWER-PORT)))
(defn get-error-time
[error]
@@ -407,7 +410,7 @@
{
"host" (.get_host n)
"port" (.get_port n)
- "nimbusLogLink" (nimbus-log-link (.get_host n) (.get_port n))
+ "nimbusLogLink" (nimbus-log-link (.get_host n))
"status" (if (.is_isLeader n) "Leader" "Not a Leader")
"version" (.get_version n)
"nimbusUpTime" (pretty-uptime-sec uptime)
@@ -431,6 +434,7 @@
"totalCpu" (get (.get_total_resources s) Config/SUPERVISOR_CPU_CAPACITY)
"usedMem" (.get_used_mem s)
"usedCpu" (.get_used_cpu s)
+ "logLink" (supervisor-log-link (.get_host s))
"version" (.get_version s)})
"schedulerDisplayResource" (*STORM-CONF* Config/SCHEDULER_DISPLAY_RESOURCE)}))
http://git-wip-us.apache.org/repos/asf/storm/blob/21f56e91/storm-core/src/ui/public/templates/index-page-template.html
----------------------------------------------------------------------
diff --git a/storm-core/src/ui/public/templates/index-page-template.html b/storm-core/src/ui/public/templates/index-page-template.html
index 5173356..0bd66a9 100644
--- a/storm-core/src/ui/public/templates/index-page-template.html
+++ b/storm-core/src/ui/public/templates/index-page-template.html
@@ -253,7 +253,7 @@
{{#supervisors}}
<tr>
<td>{{id}}</td>
- <td>{{host}}</td>
+ <td><a href="{{logLink}}">{{host}}</a></td>
<td>{{uptime}}</td>
<td>{{slotsTotal}}</td>
<td>{{slotsUsed}}</td>
[3/3] storm git commit: add STORM-1494 to changelog
Posted by pt...@apache.org.
add STORM-1494 to changelog
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/195d1517
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/195d1517
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/195d1517
Branch: refs/heads/master
Commit: 195d15174052a678a430bc8889819c7de5b5cbf1
Parents: c62904e
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Wed Jan 27 13:49:41 2016 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Wed Jan 27 13:49:41 2016 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
storm-core/src/clj/org/apache/storm/cluster.clj | 2 +-
storm-core/src/jvm/org/apache/storm/blobstore/BlobStoreUtils.java | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/195d1517/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f763c4..14cb4a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
## 2.0.0
## 1.0.0
+ * STORM-1494: Add link to supervisor log in Storm UI
* STORM-1496: Nimbus periodically throws blobstore-related exception
* STORM-1484: ignore subproject .classpath & .project file
* STORM-1478: make bolts getComponentConfiguration method cleaner/simpler
http://git-wip-us.apache.org/repos/asf/storm/blob/195d1517/storm-core/src/clj/org/apache/storm/cluster.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/cluster.clj b/storm-core/src/clj/org/apache/storm/cluster.clj
index 5aef266..152423a 100644
--- a/storm-core/src/clj/org/apache/storm/cluster.clj
+++ b/storm-core/src/clj/org/apache/storm/cluster.clj
@@ -339,7 +339,7 @@
(setup-blobstore!
[this key nimbusInfo versionInfo]
(let [path (str (blobstore-path key) "/" (.toHostPortString nimbusInfo) "-" versionInfo)]
- (log-message "setup-path" path)
+ (log-message "setup-path: " path)
(.mkdirs cluster-state (blobstore-path key) acls)
;we delete the node first to ensure the node gets created as part of this session only.
(.delete_node_blobstore cluster-state (str (blobstore-path key)) (.toHostPortString nimbusInfo))
http://git-wip-us.apache.org/repos/asf/storm/blob/195d1517/storm-core/src/jvm/org/apache/storm/blobstore/BlobStoreUtils.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/blobstore/BlobStoreUtils.java b/storm-core/src/jvm/org/apache/storm/blobstore/BlobStoreUtils.java
index 071c4f5..94f0afa 100644
--- a/storm-core/src/jvm/org/apache/storm/blobstore/BlobStoreUtils.java
+++ b/storm-core/src/jvm/org/apache/storm/blobstore/BlobStoreUtils.java
@@ -194,7 +194,7 @@ public class BlobStoreUtils {
}
if (!isSuccess) {
- LOG.error("Could not update the blob with key" + key);
+ LOG.error("Could not update the blob with key: {}", key);
}
return isSuccess;
}
[2/3] storm git commit: Merge branch 'STORM-1494' of
github.com:yegortokmakov/storm
Posted by pt...@apache.org.
Merge branch 'STORM-1494' of github.com:yegortokmakov/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/c62904e5
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/c62904e5
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/c62904e5
Branch: refs/heads/master
Commit: c62904e51a79fe038a377b434b39fb3c2bbd0aa3
Parents: ecce1ce 21f56e9
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Wed Jan 27 13:48:08 2016 -0500
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Wed Jan 27 13:48:08 2016 -0500
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/ui/core.clj | 10 +++++++---
.../src/ui/public/templates/index-page-template.html | 2 +-
2 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------