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 2016/12/18 11:42:56 UTC
[1/3] storm git commit: STORM-2246: Logviewer download link has
urlencoding on part of the URL
Repository: storm
Updated Branches:
refs/heads/master aa0463985 -> 2aa7791d2
STORM-2246: Logviewer download link has urlencoding on part of the URL
Changed the URL format for "Download full file" link under worker logs
from "download/URLENCODED(<filename>)" to "download?file=URLENCODED(<filename>)"
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/74bf25e2
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/74bf25e2
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/74bf25e2
Branch: refs/heads/master
Commit: 74bf25e2f24b36b9aaaede629b5bfc9ef1402334
Parents: f63078c
Author: Arun Mahadevan <ar...@apache.org>
Authored: Tue Dec 13 16:23:35 2016 +0530
Committer: Arun Mahadevan <ar...@apache.org>
Committed: Fri Dec 16 11:19:45 2016 +0530
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/daemon/logviewer.clj | 7 ++++---
storm-core/src/jvm/org/apache/storm/daemon/nimbus/Nimbus.java | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/74bf25e2/storm-core/src/clj/org/apache/storm/daemon/logviewer.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/daemon/logviewer.clj b/storm-core/src/clj/org/apache/storm/daemon/logviewer.clj
index 906acf8..b697dd8 100644
--- a/storm-core/src/clj/org/apache/storm/daemon/logviewer.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/logviewer.clj
@@ -399,7 +399,7 @@
"Next" :enabled (> next-start start))])]]))
(defn- download-link [fname]
- [[:p (link-to (UIHelpers/urlFormat "/download/%s" (to-array [fname])) "Download Full File")]])
+ [[:p (link-to (UIHelpers/urlFormat "/download?file=%s" (to-array [fname])) "Download Full File")]])
(defn- daemon-download-link [fname]
[[:p (link-to (UIHelpers/urlFormat "/daemondownload/%s" (to-array [fname])) "Download Full File")]])
@@ -1097,10 +1097,11 @@
(catch InvalidRequestException ex
(log-error ex)
(ring-response-from-exception ex))))
- (GET "/download/:file" [:as {:keys [servlet-request servlet-response log-root]} file & m]
+ (GET "/download" [:as {:keys [servlet-request servlet-response log-root]} & m]
(try
(.mark logviewer:num-download-log-file-http-requests)
- (let [user (.getUserName http-creds-handler servlet-request)]
+ (let [user (.getUserName http-creds-handler servlet-request)
+ file (URLDecoder/decode (:file m))]
(download-log-file file servlet-request servlet-response user log-root))
(catch InvalidRequestException ex
(log-error ex)
http://git-wip-us.apache.org/repos/asf/storm/blob/74bf25e2/storm-core/src/jvm/org/apache/storm/daemon/nimbus/Nimbus.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/daemon/nimbus/Nimbus.java b/storm-core/src/jvm/org/apache/storm/daemon/nimbus/Nimbus.java
index 7948e16..c2b7d59 100644
--- a/storm-core/src/jvm/org/apache/storm/daemon/nimbus/Nimbus.java
+++ b/storm-core/src/jvm/org/apache/storm/daemon/nimbus/Nimbus.java
@@ -2305,7 +2305,7 @@ public class Nimbus implements Iface, Shutdownable, DaemonCommon {
ret.launchTimeSecs = 0;
}
ret.assignment = state.assignmentInfo(topoId, null);
- ret.beats = OR(heartbeatsCache.get().get(topoId), Collections.emptyMap());
+ ret.beats = OR(heartbeatsCache.get().get(topoId), Collections.<List<Integer>, Map<String, Object>>emptyMap());
ret.allComponents = new HashSet<>(ret.taskToComponent.values());
return ret;
}
[3/3] storm git commit: STORM-2246: CHANGELOG
Posted by ka...@apache.org.
STORM-2246: CHANGELOG
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2aa7791d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2aa7791d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2aa7791d
Branch: refs/heads/master
Commit: 2aa7791d2a02cd746e75763f3779a8956796bf94
Parents: f659dc6
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sun Dec 18 20:37:00 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sun Dec 18 20:42:43 2016 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/2aa7791d/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba43c94..8ddb752 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -185,6 +185,7 @@
* STORM-1769: Added a test to check local nimbus with notifier plugin
## 1.1.0
+ * STORM-2246: Logviewer download link has urlencoding on part of the URL
* STORM-2235: Introduce new option: 'add remote repositories' for dependency resolver
* STORM-2215: validate blobs are present before submitting
* STORM-2170: [Storm SQL] Add built-in socket datasource to runtime
[2/3] storm git commit: Merge branch 'STORM-2246-new' of
https://github.com/arunmahadevan/storm into STORM-2246-merge
Posted by ka...@apache.org.
Merge branch 'STORM-2246-new' of https://github.com/arunmahadevan/storm into STORM-2246-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f659dc62
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f659dc62
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f659dc62
Branch: refs/heads/master
Commit: f659dc621e6ec94f2440af44f4cfb1c4f026497c
Parents: aa04639 74bf25e
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sun Dec 18 20:36:38 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sun Dec 18 20:36:38 2016 +0900
----------------------------------------------------------------------
storm-core/src/clj/org/apache/storm/daemon/logviewer.clj | 7 ++++---
storm-core/src/jvm/org/apache/storm/daemon/nimbus/Nimbus.java | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------