Skip to content

Commit 047fd93

Browse files
committed
HDFS-17912. HttpFS: honor HTTPFS_CONFIG when sourcing httpfs-env.sh
hadoop-httpfs.sh sourced httpfs-env.sh from HADOOP_CONF_DIR only, even though HTTPFS_CONFIG is already honored for -Dhttpfs.config.dir in the same script. Use ${HTTPFS_CONFIG:-${HADOOP_CONF_DIR}} so both paths agree. Backward compatible.
1 parent f6182e5 commit 047fd93

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

  • hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/libexec/shellprofile.d

hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/libexec/shellprofile.d/hadoop-httpfs.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ fi
2525
## @replaceable no
2626
function hdfs_subcommand_httpfs
2727
{
28-
if [[ -f "${HADOOP_CONF_DIR}/httpfs-env.sh" ]]; then
28+
if [[ -f "${HTTPFS_CONFIG:-${HADOOP_CONF_DIR}}/httpfs-env.sh" ]]; then
2929
# shellcheck disable=SC1090
30-
. "${HADOOP_CONF_DIR}/httpfs-env.sh"
30+
. "${HTTPFS_CONFIG:-${HADOOP_CONF_DIR}}/httpfs-env.sh"
3131
fi
3232

3333
# shellcheck disable=SC2034

0 commit comments

Comments
 (0)