Skip to content

Commit f22607f

Browse files
author
Donald Hunter
committed
Patches for hadoop distro 'none'
1 parent 1ffef36 commit f22607f

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

api/src/main/resources/deployer_utils.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,10 @@ def update_hadoop_env(env):
6767
logging.debug('Updating environment descriptor')
6868
if env['hadoop_distro'] == 'CDH':
6969
fill_hadoop_env_cdh(tmp_env)
70-
else:
70+
elif env['hadoop_distro'] == 'HDP':
7171
fill_hadoop_env_hdp(tmp_env)
72+
else:
73+
logging.warning('Skipping update_hadoop_env for hadoop distro "%s"', env['hadoop_distro'])
7274
logging.debug('Updated environment descriptor')
7375
for key in tmp_env:
7476
# Dictionary get/put operations are atomic so inherently thread safe and don't need a lock

api/src/main/resources/plugins/base_creator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def __init__(self, config, environment, namespace):
5757
self._namespace = namespace
5858
self._hdfs_client = HDFS(environment['webhdfs_host'],
5959
environment['webhdfs_port'],
60-
'hdfs')
60+
environment['webhdfs_user'])
6161

6262
if 'yarn_resource_manager_host' in environment:
6363
self._yarn_resource_manager = "%s:%s" % (environment['yarn_resource_manager_host'],

0 commit comments

Comments
 (0)