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 ar...@apache.org on 2014/09/30 01:30:07 UTC
[2/6] git commit: YARN-2606. Application History Server tries to
access hdfs before doing secure login (Mit Desai via jeagles)
YARN-2606. Application History Server tries to access hdfs before doing secure login (Mit Desai via jeagles)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e10eeaab
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e10eeaab
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e10eeaab
Branch: refs/heads/HDFS-6581
Commit: e10eeaabce2a21840cfd5899493c9d2d4fe2e322
Parents: 7f0efe9
Author: Jonathan Eagles <je...@gmail.com>
Authored: Mon Sep 29 16:37:23 2014 -0500
Committer: Jonathan Eagles <je...@gmail.com>
Committed: Mon Sep 29 16:37:23 2014 -0500
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 +++
.../FileSystemApplicationHistoryStore.java | 5 +++--
.../TestFileSystemApplicationHistoryStore.java | 8 ++++----
3 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e10eeaab/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 7fa83be..6f23eee 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -465,6 +465,9 @@ Release 2.6.0 - UNRELEASED
YARN-2608. FairScheduler: Potential deadlocks in loading alloc files and
clock access. (Wei Yan via kasha)
+ YARN-2606. Application History Server tries to access hdfs before doing
+ secure login (Mit Desai via jeagles)
+
Release 2.5.1 - 2014-09-05
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e10eeaab/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/FileSystemApplicationHistoryStore.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/FileSystemApplicationHistoryStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/FileSystemApplicationHistoryStore.java
index 7840dd1..6d76864 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/FileSystemApplicationHistoryStore.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/FileSystemApplicationHistoryStore.java
@@ -115,7 +115,8 @@ public class FileSystemApplicationHistoryStore extends AbstractService
}
@Override
- public void serviceInit(Configuration conf) throws Exception {
+ public void serviceStart() throws Exception {
+ Configuration conf = getConfig();
Path fsWorkingPath =
new Path(conf.get(YarnConfiguration.FS_APPLICATION_HISTORY_STORE_URI,
conf.get("hadoop.tmp.dir") + "/yarn/timeline/generic-history"));
@@ -132,7 +133,7 @@ public class FileSystemApplicationHistoryStore extends AbstractService
LOG.error("Error when initializing FileSystemHistoryStorage", e);
throw e;
}
- super.serviceInit(conf);
+ super.serviceStart();
}
@Override
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e10eeaab/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestFileSystemApplicationHistoryStore.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestFileSystemApplicationHistoryStore.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestFileSystemApplicationHistoryStore.java
index 552a5e5..4ac6f4d 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestFileSystemApplicationHistoryStore.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestFileSystemApplicationHistoryStore.java
@@ -61,10 +61,10 @@ public class TestFileSystemApplicationHistoryStore extends
@Before
public void setup() throws Exception {
fs = new RawLocalFileSystem();
- initStore(fs);
+ initAndStartStore(fs);
}
- private void initStore(final FileSystem fs) throws IOException,
+ private void initAndStartStore(final FileSystem fs) throws IOException,
URISyntaxException {
Configuration conf = new Configuration();
fs.initialize(new URI("/"), conf);
@@ -272,7 +272,7 @@ public class TestFileSystemApplicationHistoryStore extends
doReturn(true).when(fs).isDirectory(any(Path.class));
try {
- initStore(fs);
+ initAndStartStore(fs);
} catch (Exception e) {
Assert.fail("Exception should not be thrown: " + e);
}
@@ -293,7 +293,7 @@ public class TestFileSystemApplicationHistoryStore extends
doThrow(new IOException()).when(fs).mkdirs(any(Path.class));
try {
- initStore(fs);
+ initAndStartStore(fs);
Assert.fail("Exception should have been thrown");
} catch (Exception e) {
// Expected failure