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/02/26 02:00:00 UTC
[1/2] storm git commit: STORM-1542: Remove profile action retry in
case of non-zero exit code
Repository: storm
Updated Branches:
refs/heads/1.x-branch f99fe5850 -> a24b89678
STORM-1542: Remove profile action retry in case of non-zero exit code
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/8ce34faa
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/8ce34faa
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/8ce34faa
Branch: refs/heads/1.x-branch
Commit: 8ce34faa409895f5e8db3a10fbc89e7371e7210b
Parents: f99fe58
Author: Abhishek Agarwal <ab...@inmobi.com>
Authored: Mon Feb 22 18:09:25 2016 +0530
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Feb 25 16:59:02 2016 -0800
----------------------------------------------------------------------
bin/flight.bash | 4 ++--
storm-core/src/clj/org/apache/storm/daemon/supervisor.clj | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/8ce34faa/bin/flight.bash
----------------------------------------------------------------------
diff --git a/bin/flight.bash b/bin/flight.bash
index 957c9ac..36b98ba 100755
--- a/bin/flight.bash
+++ b/bin/flight.bash
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-JDKPATH="/home/y/share/yjava_jdk/java"
+JDKPATH=$JAVA_HOME
BINPATH="/usr/bin"
USER=`whoami`
@@ -59,7 +59,7 @@ function dump_record {
function jstack_record {
FILENAME=jstack-$1-${NOW}.txt
- $BINPATH/jstack $1 > "$2/${FILENAME}"
+ $BINPATH/jstack $1 > "$2/${FILENAME}" 2>&1
}
function jmap_record {
http://git-wip-us.apache.org/repos/asf/storm/blob/8ce34faa/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj b/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
index d27a609..b504e57 100644
--- a/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
+++ b/storm-core/src/clj/org/apache/storm/daemon/supervisor.clj
@@ -741,7 +741,7 @@
(and stop? (= action ProfileAction/JPROFILE_STOP)) (jprofile-stop profile-cmd worker-pid target-dir))
action-on-exit (fn [exit-code]
(log-message log-prefix " profile-action exited for code: " exit-code)
- (if (and (= exit-code 0) stop?)
+ (if stop?
(delete-topology-profiler-action storm-cluster-state storm-id pro-action)))
command (->> command (map str) (filter (complement empty?)))]
[2/2] storm git commit: add STORM-1542 to CHANGELOG.md
Posted by ka...@apache.org.
add STORM-1542 to CHANGELOG.md
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/a24b8967
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/a24b8967
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/a24b8967
Branch: refs/heads/1.x-branch
Commit: a24b8967844bd5eef5ee7e9c5f385161418cda87
Parents: 8ce34fa
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Thu Feb 25 16:59:43 2016 -0800
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Feb 25 16:59:43 2016 -0800
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/a24b8967/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 473a4d1..aa7bcd2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 1.0.0
+ * STORM-1542: Remove profile action retry in case of non-zero exit code
* STORM-1540: Fix Debug/Sampling for Trident
* STORM-1569: Allowing users to specify the nimbus thrift server queue size.
* STORM-1552: Fix topology event sampling log dir