You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by br...@apache.org on 2017/05/22 18:54:35 UTC
[1/4] hadoop git commit: HDFS-11849. JournalNode startup failure
exception should be logged in log file. Contributed By Surendra Singh
Lilhore.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 275525574 -> ec2468ced
refs/heads/branch-2.7 8a0e5e3b7 -> cecedcf55
refs/heads/branch-2.8.1 6c93dabea -> c7a0fb571
refs/heads/trunk 2a8fcf0c9 -> 9cab42cc7
HDFS-11849. JournalNode startup failure exception should be logged in log file. Contributed By Surendra Singh Lilhore.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9cab42cc
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9cab42cc
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9cab42cc
Branch: refs/heads/trunk
Commit: 9cab42cc797986081fef184748044f1790a4f039
Parents: 2a8fcf0
Author: Brahma Reddy Battula <br...@apache.org>
Authored: Tue May 23 02:39:19 2017 +0800
Committer: Brahma Reddy Battula <br...@apache.org>
Committed: Tue May 23 02:39:19 2017 +0800
----------------------------------------------------------------------
.../org/apache/hadoop/hdfs/qjournal/server/JournalNode.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9cab42cc/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java
index ab724d5..6056e34 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java
@@ -17,6 +17,8 @@
*/
package org.apache.hadoop.hdfs.qjournal.server;
+import static org.apache.hadoop.util.ExitUtil.terminate;
+
import java.io.File;
import java.io.FileFilter;
import java.io.IOException;
@@ -330,7 +332,12 @@ public class JournalNode implements Tool, Configurable, JournalNodeMXBean {
public static void main(String[] args) throws Exception {
StringUtils.startupShutdownMessage(JournalNode.class, args, LOG);
- System.exit(ToolRunner.run(new JournalNode(), args));
+ try {
+ System.exit(ToolRunner.run(new JournalNode(), args));
+ } catch (Throwable e) {
+ LOG.error("Failed to start journalnode.", e);
+ terminate(-1, e);
+ }
}
public void doPreUpgrade(String journalId) throws IOException {
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[2/4] hadoop git commit: HDFS-11849. JournalNode startup failure
exception should be logged in log file. Contributed By Surendra Singh
Lilhore.
Posted by br...@apache.org.
HDFS-11849. JournalNode startup failure exception should be logged in log file. Contributed By Surendra Singh Lilhore.
(cherry picked from commit 9cab42cc797986081fef184748044f1790a4f039)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ec2468ce
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ec2468ce
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ec2468ce
Branch: refs/heads/branch-2
Commit: ec2468ced1174cfa6a84c539ec3a70c8d9e2eb2c
Parents: 2755255
Author: Brahma Reddy Battula <br...@apache.org>
Authored: Tue May 23 02:39:19 2017 +0800
Committer: Brahma Reddy Battula <br...@apache.org>
Committed: Tue May 23 02:40:11 2017 +0800
----------------------------------------------------------------------
.../org/apache/hadoop/hdfs/qjournal/server/JournalNode.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ec2468ce/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java
index 39a8034..5caccf7 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java
@@ -17,6 +17,8 @@
*/
package org.apache.hadoop.hdfs.qjournal.server;
+import static org.apache.hadoop.util.ExitUtil.terminate;
+
import java.io.File;
import java.io.FileFilter;
import java.io.IOException;
@@ -307,7 +309,12 @@ public class JournalNode implements Tool, Configurable, JournalNodeMXBean {
public static void main(String[] args) throws Exception {
StringUtils.startupShutdownMessage(JournalNode.class, args, LOG);
- System.exit(ToolRunner.run(new JournalNode(), args));
+ try {
+ System.exit(ToolRunner.run(new JournalNode(), args));
+ } catch (Throwable e) {
+ LOG.error("Failed to start journalnode.", e);
+ terminate(-1, e);
+ }
}
public void discardSegments(String journalId, long startTxId)
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[4/4] hadoop git commit: HDFS-11849. JournalNode startup failure
exception should be logged in log file. Contributed By Surendra Singh
Lilhore.
Posted by br...@apache.org.
HDFS-11849. JournalNode startup failure exception should be logged in log file. Contributed By Surendra Singh Lilhore.
(cherry picked from commit 9cab42cc797986081fef184748044f1790a4f039)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/cecedcf5
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/cecedcf5
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/cecedcf5
Branch: refs/heads/branch-2.7
Commit: cecedcf55839f0847f0488bfb708bda2f2ad7346
Parents: 8a0e5e3
Author: Brahma Reddy Battula <br...@apache.org>
Authored: Tue May 23 02:39:19 2017 +0800
Committer: Brahma Reddy Battula <br...@apache.org>
Committed: Tue May 23 02:52:41 2017 +0800
----------------------------------------------------------------------
.../org/apache/hadoop/hdfs/qjournal/server/JournalNode.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/cecedcf5/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java
index 16cf324..e89f7ca 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java
@@ -17,6 +17,8 @@
*/
package org.apache.hadoop.hdfs.qjournal.server;
+import static org.apache.hadoop.util.ExitUtil.terminate;
+
import java.io.File;
import java.io.FileFilter;
import java.io.IOException;
@@ -293,7 +295,12 @@ public class JournalNode implements Tool, Configurable, JournalNodeMXBean {
public static void main(String[] args) throws Exception {
StringUtils.startupShutdownMessage(JournalNode.class, args, LOG);
- System.exit(ToolRunner.run(new JournalNode(), args));
+ try {
+ System.exit(ToolRunner.run(new JournalNode(), args));
+ } catch (Throwable e) {
+ LOG.error("Failed to start journalnode.", e);
+ terminate(-1, e);
+ }
}
public void discardSegments(String journalId, long startTxId)
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[3/4] hadoop git commit: HDFS-11849. JournalNode startup failure
exception should be logged in log file. Contributed By Surendra Singh
Lilhore.
Posted by br...@apache.org.
HDFS-11849. JournalNode startup failure exception should be logged in log file. Contributed By Surendra Singh Lilhore.
(cherry picked from commit 9cab42cc797986081fef184748044f1790a4f039)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c7a0fb57
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c7a0fb57
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c7a0fb57
Branch: refs/heads/branch-2.8.1
Commit: c7a0fb57174864a8e31ee7911b413e0913639462
Parents: 6c93dab
Author: Brahma Reddy Battula <br...@apache.org>
Authored: Tue May 23 02:39:19 2017 +0800
Committer: Brahma Reddy Battula <br...@apache.org>
Committed: Tue May 23 02:44:33 2017 +0800
----------------------------------------------------------------------
.../org/apache/hadoop/hdfs/qjournal/server/JournalNode.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c7a0fb57/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java
index 39a8034..5caccf7 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNode.java
@@ -17,6 +17,8 @@
*/
package org.apache.hadoop.hdfs.qjournal.server;
+import static org.apache.hadoop.util.ExitUtil.terminate;
+
import java.io.File;
import java.io.FileFilter;
import java.io.IOException;
@@ -307,7 +309,12 @@ public class JournalNode implements Tool, Configurable, JournalNodeMXBean {
public static void main(String[] args) throws Exception {
StringUtils.startupShutdownMessage(JournalNode.class, args, LOG);
- System.exit(ToolRunner.run(new JournalNode(), args));
+ try {
+ System.exit(ToolRunner.run(new JournalNode(), args));
+ } catch (Throwable e) {
+ LOG.error("Failed to start journalnode.", e);
+ terminate(-1, e);
+ }
}
public void discardSegments(String journalId, long startTxId)
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org