Skip to content

Commit

Permalink
Merge branch 'apache:master' into TEZ-4550
Browse files Browse the repository at this point in the history
  • Loading branch information
slfan1989 authored May 5, 2024
2 parents 4d267b8 + 906059a commit b7aa783
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 5 deletions.
2 changes: 1 addition & 1 deletion BUILDING.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ https://cwiki.apache.org/confluence/display/TEZ
Requirements:

* JDK 1.8+
* Maven 3.1 or later
* Maven 3.6.3 or later
* Findbugs 2.0.2 or later (if running findbugs)
* ProtocolBuffer 3.21.1
* Internet connection for first build (to fetch all dependencies)
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1058,7 +1058,7 @@
<configuration>
<rules>
<requireMavenVersion>
<version>[3.0.2,)</version>
<version>[3.6.3,)</version>
</requireMavenVersion>
<requireJavaVersion>
<version>[${maven.compiler.target},)</version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -905,7 +905,7 @@ public TezConfiguration(boolean loadDefaults) {
@ConfigurationProperty
public static final String TEZ_AM_YARN_SCHEDULER_CLASS = TEZ_AM_PREFIX + "yarn.scheduler.class";
public static final String TEZ_AM_YARN_SCHEDULER_CLASS_DEFAULT =
"org.apache.tez.dag.app.rm.YarnTaskSchedulerService";
"org.apache.tez.dag.app.rm.DagAwareYarnTaskScheduler";

/**
* Int value. The AM waits this amount of time when the first DAG is submitted but not all the services are ready.
Expand Down
13 changes: 11 additions & 2 deletions tez-dag/src/main/java/org/apache/tez/client/LocalClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -331,8 +331,17 @@ public void run() {
// Prepare Environment
Path logDir = new Path(userDir, "localmode-log-dir");
Path localDir = new Path(userDir, "localmode-local-dir");
localFs.mkdirs(logDir);
localFs.mkdirs(localDir);

// fail fast if the local directories (on the paths that were used on HDFS) cannot be created
// in this case, user might want to choose a different staging path, which works on the local FS too
if (!localFs.mkdirs(logDir)) {
throw new IOException(
"Unable to create log directory, try to create it manually for further insights: " + logDir);
}
if (!localFs.mkdirs(localDir)) {
throw new IOException(
"Unable to create local directory, try to create it manually for further insights: " + localDir);
}

UserGroupInformation.setConfiguration(conf);
// Add session specific credentials to the AM credentials.
Expand Down

0 comments on commit b7aa783

Please sign in to comment.