diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/FileSystemApplicationHistoryStore.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/FileSystemApplicationHistoryStore.java index a2d9140..234fe09 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/FileSystemApplicationHistoryStore.java +++ 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 @@ protected FileSystem getFileSystem(Path path, Configuration conf) throws Excepti } @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)); rootDirPath = new Path(fsWorkingPath, ROOT_DIR_NAME); @@ -131,7 +132,7 @@ public void serviceInit(Configuration conf) throws Exception { LOG.error("Error when initializing FileSystemHistoryStorage", e); throw e; } - super.serviceInit(conf); + super.serviceStart(); } @Override diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestFileSystemApplicationHistoryStore.java 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 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/TestFileSystemApplicationHistoryStore.java +++ 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 @@ @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 void testInitExistingWorkingDirectoryInSafeMode() throws Exception { 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 void testInitNonExistingWorkingDirectoryInSafeMode() throws Exception { 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