You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampark.apache.org by be...@apache.org on 2024/02/20 15:51:39 UTC
(incubator-streampark) branch dev-2.1.3 updated: [Improve] yarnUtils RM_WEBAPP_HTTPS_ADDRESS param improvement
This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev-2.1.3
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev-2.1.3 by this push:
new 19aa1fd37 [Improve] yarnUtils RM_WEBAPP_HTTPS_ADDRESS param improvement
19aa1fd37 is described below
commit 19aa1fd37ec1df5c20303bf9a81d2d4b2b37c673
Author: benjobs <be...@gmail.com>
AuthorDate: Tue Feb 20 23:51:26 2024 +0800
[Improve] yarnUtils RM_WEBAPP_HTTPS_ADDRESS param improvement
---
.../org/apache/streampark/common/util/YarnUtils.scala | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/streampark-common/src/main/scala/org/apache/streampark/common/util/YarnUtils.scala b/streampark-common/src/main/scala/org/apache/streampark/common/util/YarnUtils.scala
index 7be3bcbf3..e7b7b04b7 100644
--- a/streampark-common/src/main/scala/org/apache/streampark/common/util/YarnUtils.scala
+++ b/streampark-common/src/main/scala/org/apache/streampark/common/util/YarnUtils.scala
@@ -129,13 +129,17 @@ object YarnUtils extends Logger {
if (!getLatest && rmHttpURL != null) {
return rmHttpURL
}
-
synchronized {
val conf = HadoopUtils.hadoopConf
- val useHttps = YarnConfiguration.useHttps(conf)
- val (webConfKey, defaultPort, protocol) = useHttps match {
- case x if x => (YarnConfiguration.RM_WEBAPP_HTTPS_ADDRESS, "8090", "https://")
- case _ => (YarnConfiguration.RM_WEBAPP_ADDRESS, "8088", "http://")
+ val (webConfKey, defaultPort, protocol) = {
+ if (YarnConfiguration.useHttps(conf)) {
+ (
+ YarnConfiguration.RM_WEBAPP_HTTPS_ADDRESS,
+ YarnConfiguration.DEFAULT_RM_WEBAPP_HTTPS_PORT,
+ "https://")
+ } else {
+ (YarnConfiguration.RM_WEBAPP_ADDRESS, YarnConfiguration.DEFAULT_RM_WEBAPP_PORT, "http://")
+ }
}
def findActiveRMId(yarnConf: YarnConfiguration): String = {
@@ -191,7 +195,7 @@ object YarnUtils extends Logger {
rmHttpURL = protocol + Option(conf.get("yarn.web-proxy.address", null)).getOrElse {
val addrKey = if (!HAUtil.isHAEnabled(conf)) webConfKey else getAddressConfKey
- val socketAddr = conf.getSocketAddr(addrKey, s"0.0.0.0:$defaultPort", defaultPort.toInt)
+ val socketAddr = conf.getSocketAddr(addrKey, s"0.0.0.0:$defaultPort", defaultPort)
val address = NetUtils.getConnectAddress(socketAddr)
val resolved = address.getAddress
@@ -205,7 +209,6 @@ object YarnUtils extends Logger {
}
}
}
-
s"$hostName:${address.getPort}"
}
logInfo(s"yarn resourceManager webapp url:$rmHttpURL")