YARN-3269. Yarn.nodemanager.remote-app-log-dir could not be configured to fully qualified path. Contributed by Xuan Gong
This commit is contained in:
parent
d4f7e2507f
commit
d81109e588
@ -83,6 +83,9 @@ Release 2.8.0 - UNRELEASED
|
||||
|
||||
YARN-3351. AppMaster tracking URL is broken in HA. (Anubhav Dhoot via kasha)
|
||||
|
||||
YARN-3269. Yarn.nodemanager.remote-app-log-dir could not be configured to
|
||||
fully qualified path. (Xuan Gong via junping_du)
|
||||
|
||||
Release 2.7.0 - UNRELEASED
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
@ -379,7 +379,7 @@ public LogWriter(final Configuration conf, final Path remoteAppLogFile,
|
||||
userUgi.doAs(new PrivilegedExceptionAction<FSDataOutputStream>() {
|
||||
@Override
|
||||
public FSDataOutputStream run() throws Exception {
|
||||
fc = FileContext.getFileContext(conf);
|
||||
fc = FileContext.getFileContext(remoteAppLogFile.toUri(), conf);
|
||||
fc.setUMask(APP_LOG_FILE_UMASK);
|
||||
return fc.create(
|
||||
remoteAppLogFile,
|
||||
@ -471,7 +471,8 @@ public static class LogReader {
|
||||
|
||||
public LogReader(Configuration conf, Path remoteAppLogFile)
|
||||
throws IOException {
|
||||
FileContext fileContext = FileContext.getFileContext(conf);
|
||||
FileContext fileContext =
|
||||
FileContext.getFileContext(remoteAppLogFile.toUri(), conf);
|
||||
this.fsDataIStream = fileContext.open(remoteAppLogFile);
|
||||
reader =
|
||||
new TFile.Reader(this.fsDataIStream, fileContext.getFileStatus(
|
||||
|
@ -303,7 +303,7 @@ private void uploadLogsForContainers(boolean appFinished) {
|
||||
userUgi.doAs(new PrivilegedExceptionAction<Object>() {
|
||||
@Override
|
||||
public Object run() throws Exception {
|
||||
FileSystem remoteFS = FileSystem.get(conf);
|
||||
FileSystem remoteFS = remoteNodeLogFileForApp.getFileSystem(conf);
|
||||
if (remoteFS.exists(remoteNodeTmpLogFileForApp)) {
|
||||
if (rename) {
|
||||
remoteFS.rename(remoteNodeTmpLogFileForApp, renamedPath);
|
||||
|
@ -176,7 +176,7 @@ private void stopAggregators() {
|
||||
}
|
||||
|
||||
protected FileSystem getFileSystem(Configuration conf) throws IOException {
|
||||
return FileSystem.get(conf);
|
||||
return this.remoteRootLogDir.getFileSystem(conf);
|
||||
}
|
||||
|
||||
void verifyAndCreateRemoteLogDir(Configuration conf) {
|
||||
|
@ -1299,8 +1299,10 @@ private void testLogAggregationService(boolean retentionSizeLimitation)
|
||||
logAggregationContextWithInterval.setRolledLogsIncludePattern(".*");
|
||||
logAggregationContextWithInterval.setRolledLogsExcludePattern("std_final");
|
||||
this.conf.set(YarnConfiguration.NM_LOG_DIRS, localLogDir.getAbsolutePath());
|
||||
//configure YarnConfiguration.NM_REMOTE_APP_LOG_DIR to
|
||||
//have fully qualified path
|
||||
this.conf.set(YarnConfiguration.NM_REMOTE_APP_LOG_DIR,
|
||||
this.remoteRootLogDir.getAbsolutePath());
|
||||
"file://" + this.remoteRootLogDir.getAbsolutePath());
|
||||
this.conf.setLong(
|
||||
YarnConfiguration.NM_LOG_AGGREGATION_ROLL_MONITORING_INTERVAL_SECONDS,
|
||||
3600);
|
||||
|
Loading…
Reference in New Issue
Block a user