|
@@ -35,7 +35,7 @@ from hadoop.fs import normpath as fs_normpath, SEEK_SET, SEEK_CUR, SEEK_END
|
|
|
from hadoop.fs.hadoopfs import Hdfs
|
|
from hadoop.fs.hadoopfs import Hdfs
|
|
|
from hadoop.fs.exceptions import WebHdfsException
|
|
from hadoop.fs.exceptions import WebHdfsException
|
|
|
from hadoop.fs.webhdfs_types import WebHdfsStat, WebHdfsContentSummary
|
|
from hadoop.fs.webhdfs_types import WebHdfsStat, WebHdfsContentSummary
|
|
|
-from hadoop.hdfs_site import get_nn_sentry_prefixes, get_umask_mode, get_supergroup
|
|
|
|
|
|
|
+from hadoop.hdfs_site import get_nn_sentry_prefixes, get_umask_mode, get_supergroup, get_webhdfs_ssl
|
|
|
|
|
|
|
|
|
|
|
|
|
import hadoop.conf
|
|
import hadoop.conf
|
|
@@ -1006,8 +1006,7 @@ def _get_service_url(hdfs_config):
|
|
|
fs_defaultfs = hdfs_config.FS_DEFAULTFS.get()
|
|
fs_defaultfs = hdfs_config.FS_DEFAULTFS.get()
|
|
|
netloc = Hdfs.urlsplit(fs_defaultfs)[1]
|
|
netloc = Hdfs.urlsplit(fs_defaultfs)[1]
|
|
|
host = netloc.split(':')[0]
|
|
host = netloc.split(':')[0]
|
|
|
- port = hadoop.conf.DEFAULT_NN_HTTP_PORT
|
|
|
|
|
- return "http://%s:%s/webhdfs/v1" % (host, port)
|
|
|
|
|
|
|
+ return "{0}://{1}:{2}/webhdfs/v1".format(get_webhdfs_ssl()["protocol"], host, get_webhdfs_ssl()["port"])
|
|
|
|
|
|
|
|
|
|
|
|
|
def test_fs_configuration(fs_config):
|
|
def test_fs_configuration(fs_config):
|