This is an automated email from the ASF dual-hosted git repository.
aajisaka pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 1f157f8 HADOOP-17386. Change default fs.s3a.buffer.dir to be under
Yarn container path on yarn applications (#3908)
1f157f8 is described below
commit 1f157f802d2d6142d21482eaa86baf1bef458ed4
Author: monthonk <[email protected]>
AuthorDate: Tue Feb 22 04:50:27 2022 +0000
HADOOP-17386. Change default fs.s3a.buffer.dir to be under Yarn container
path on yarn applications (#3908)
Co-authored-by: Monthon Klongklaew <[email protected]>
Signed-off-by: Akira Ajisaka <[email protected]>
---
.../hadoop-common/src/main/resources/core-default.xml | 7 +++++--
.../src/site/markdown/tools/hadoop-aws/committers.md | 2 +-
.../hadoop-aws/src/site/markdown/tools/hadoop-aws/index.md | 14 ++++++++++----
3 files changed, 16 insertions(+), 7 deletions(-)
diff --git
a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
index 7e20236..a93f7fa 100644
--- a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
+++ b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml
@@ -1617,9 +1617,12 @@
<property>
<name>fs.s3a.buffer.dir</name>
- <value>${hadoop.tmp.dir}/s3a</value>
+ <value>${env.LOCAL_DIRS:-${hadoop.tmp.dir}}/s3a</value>
<description>Comma separated list of directories that will be used to buffer
file
- uploads to.</description>
+ uploads to.
+ Yarn container path will be used as default value on yarn applications,
+ otherwise fall back to hadoop.tmp.dir
+ </description>
</property>
<property>
diff --git
a/hadoop-tools/hadoop-aws/src/site/markdown/tools/hadoop-aws/committers.md
b/hadoop-tools/hadoop-aws/src/site/markdown/tools/hadoop-aws/committers.md
index 989fdd0..b19f30f 100644
--- a/hadoop-tools/hadoop-aws/src/site/markdown/tools/hadoop-aws/committers.md
+++ b/hadoop-tools/hadoop-aws/src/site/markdown/tools/hadoop-aws/committers.md
@@ -546,7 +546,7 @@ Conflict management is left to the execution engine itself.
| Option | Meaning | Default |
|--------|---------|---------|
| `mapreduce.fileoutputcommitter.marksuccessfuljobs` | Write a `_SUCCESS` file
on the successful completion of the job. | `true` |
-| `fs.s3a.buffer.dir` | Local filesystem directory for data being written
and/or staged. | `${hadoop.tmp.dir}/s3a` |
+| `fs.s3a.buffer.dir` | Local filesystem directory for data being written
and/or staged. | `${env.LOCAL_DIRS:-${hadoop.tmp.dir}}/s3a` |
| `fs.s3a.committer.magic.enabled` | Enable "magic committer" support in the
filesystem. | `true` |
| `fs.s3a.committer.abort.pending.uploads` | list and abort all pending
uploads under the destination path when the job is committed or aborted. |
`true` |
| `fs.s3a.committer.threads` | Number of threads in committers for parallel
operations on files. | 8 |
diff --git
a/hadoop-tools/hadoop-aws/src/site/markdown/tools/hadoop-aws/index.md
b/hadoop-tools/hadoop-aws/src/site/markdown/tools/hadoop-aws/index.md
index f390f1d..aa4e13f 100644
--- a/hadoop-tools/hadoop-aws/src/site/markdown/tools/hadoop-aws/index.md
+++ b/hadoop-tools/hadoop-aws/src/site/markdown/tools/hadoop-aws/index.md
@@ -967,9 +967,12 @@ options are covered in [Testing](./testing.md).
<property>
<name>fs.s3a.buffer.dir</name>
- <value>${hadoop.tmp.dir}/s3a</value>
+ <value>${env.LOCAL_DIRS:-${hadoop.tmp.dir}}/s3a</value>
<description>Comma separated list of directories that will be used to buffer
file
- uploads to.</description>
+ uploads to.
+ Yarn container path will be used as default value on yarn applications,
+ otherwise fall back to hadoop.tmp.dir
+ </description>
</property>
<property>
@@ -1746,9 +1749,12 @@ consumed, and so eliminates heap size as the limiting
factor in queued uploads
<property>
<name>fs.s3a.buffer.dir</name>
- <value>${hadoop.tmp.dir}/s3a</value>
+ <value>${env.LOCAL_DIRS:-${hadoop.tmp.dir}}/s3a</value>
<description>Comma separated list of directories that will be used to buffer
file
- uploads to.</description>
+ uploads to.
+ Yarn container path will be used as default value on yarn applications,
+ otherwise fall back to hadoop.tmp.dir
+ </description>
</property>
```
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
