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 ha...@apache.org on 2017/05/31 22:42:56 UTC
[21/50] [abbrv] hadoop git commit: HDFS-11878. Fix journal missing
log httpServerUrl address in JournalNodeSyncer. Contributed by Hanisha
Koneru.
HDFS-11878. Fix journal missing log httpServerUrl address in JournalNodeSyncer. Contributed by Hanisha Koneru.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4fb41b31
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4fb41b31
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4fb41b31
Branch: refs/heads/YARN-1011
Commit: 4fb41b31dbc109f11898ea6d8fc0bb3e6c20d89b
Parents: 2e41f88
Author: Arpit Agarwal <ar...@apache.org>
Authored: Thu May 25 10:42:24 2017 -0700
Committer: Arpit Agarwal <ar...@apache.org>
Committed: Thu May 25 10:42:24 2017 -0700
----------------------------------------------------------------------
.../hadoop/hdfs/qjournal/server/JournalNodeSyncer.java | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4fb41b31/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNodeSyncer.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNodeSyncer.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNodeSyncer.java
index 73defc2..99bd499 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNodeSyncer.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/qjournal/server/JournalNodeSyncer.java
@@ -285,14 +285,8 @@ public class JournalNodeSyncer {
boolean success = false;
try {
if (remoteJNproxy.httpServerUrl == null) {
- if (response.hasFromURL()) {
- URI uri = URI.create(response.getFromURL());
- remoteJNproxy.httpServerUrl = getHttpServerURI(uri.getScheme(),
- uri.getHost(), uri.getPort());
- } else {
- remoteJNproxy.httpServerUrl = getHttpServerURI("http",
- remoteJNproxy.jnAddr.getHostName(), response.getHttpPort());
- }
+ remoteJNproxy.httpServerUrl = getHttpServerURI("http",
+ remoteJNproxy.jnAddr.getHostName(), response.getHttpPort());
}
String urlPath = GetJournalEditServlet.buildPath(jid, missingLog
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org