[GitHub] spark pull request #20098: [SPARK-22914][DEPLOY] Register history.ui.port
Github user asfgit closed the pull request at: https://github.com/apache/spark/pull/20098 --- - To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org For additional commands, e-mail: reviews-h...@spark.apache.org
[GitHub] spark pull request #20098: [SPARK-22914][DEPLOY] Register history.ui.port
Github user vanzin commented on a diff in the pull request: https://github.com/apache/spark/pull/20098#discussion_r159338937 --- Diff: resource-managers/yarn/src/test/scala/org/apache/spark/deploy/yarn/ApplicationMasterUtilSuite.scala --- @@ -0,0 +1,44 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + *http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.deploy.yarn + +import org.apache.hadoop.yarn.conf.YarnConfiguration +import org.apache.spark.{SparkConf, SparkFunSuite} +import org.apache.spark.internal.Logging +import org.apache.spark.util.ResetSystemProperties +import org.scalatest.Matchers + +class ApplicationMasterUtilSuite extends SparkFunSuite with Matchers with Logging --- End diff -- `Logging` not needed, you're not logging anything. --- - To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org For additional commands, e-mail: reviews-h...@spark.apache.org
[GitHub] spark pull request #20098: [SPARK-22914][DEPLOY] Register history.ui.port
Github user vanzin commented on a diff in the pull request: https://github.com/apache/spark/pull/20098#discussion_r159338996 --- Diff: resource-managers/yarn/src/test/scala/org/apache/spark/deploy/yarn/ApplicationMasterUtilSuite.scala --- @@ -0,0 +1,44 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + *http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.deploy.yarn + +import org.apache.hadoop.yarn.conf.YarnConfiguration +import org.apache.spark.{SparkConf, SparkFunSuite} +import org.apache.spark.internal.Logging +import org.apache.spark.util.ResetSystemProperties +import org.scalatest.Matchers + +class ApplicationMasterUtilSuite extends SparkFunSuite with Matchers with Logging + with ResetSystemProperties { + + test("history url with hadoop and spark substitutions") { +val sparkConf = new SparkConf() +sparkConf.set("spark.yarn.historyServer.address", + "http://${hadoopconf-yarn.resourcemanager.hostname}:${spark.history.ui.port}";) + +val yarnConf = new YarnConfiguration() +yarnConf.set("yarn.resourcemanager.hostname", "rm.host.com") +val appId = "application_123_1" +val attemptId = appId + "_1" + +val shsAddr = ApplicationMasterUtil + .getHistoryServerAddress(sparkConf, yarnConf, appId, attemptId) + +shsAddr shouldEqual "http://rm.host.com:18080/history/application_123_1/application_123_1_1"; --- End diff -- Use `assert(foo === bar)` (and then you also don't need `Matchers`). Also, better to use interpolation to check. e.g. `foo === s"http://$host:$post/history/$appId/$attemptId"`. You can set the history port in `SparkConf` to avoid having to read the default value in some other way. --- - To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org For additional commands, e-mail: reviews-h...@spark.apache.org
[GitHub] spark pull request #20098: [SPARK-22914][DEPLOY] Register history.ui.port
Github user vanzin commented on a diff in the pull request: https://github.com/apache/spark/pull/20098#discussion_r159338897 --- Diff: resource-managers/yarn/src/test/scala/org/apache/spark/deploy/yarn/ApplicationMasterUtilSuite.scala --- @@ -0,0 +1,44 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + *http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.deploy.yarn + +import org.apache.hadoop.yarn.conf.YarnConfiguration +import org.apache.spark.{SparkConf, SparkFunSuite} +import org.apache.spark.internal.Logging +import org.apache.spark.util.ResetSystemProperties +import org.scalatest.Matchers + +class ApplicationMasterUtilSuite extends SparkFunSuite with Matchers with Logging + with ResetSystemProperties { --- End diff -- `ResetSystemProperties` not needed since you're not changing system properties. --- - To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org For additional commands, e-mail: reviews-h...@spark.apache.org
[GitHub] spark pull request #20098: [SPARK-22914][DEPLOY] Register history.ui.port
Github user vanzin commented on a diff in the pull request: https://github.com/apache/spark/pull/20098#discussion_r159338562 --- Diff: resource-managers/yarn/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala --- @@ -836,6 +833,20 @@ object ApplicationMaster extends Logging { } +object ApplicationMasterUtil { --- End diff -- Just add this to the `ApplicationMaster` object instead of creating yet another utils object... and also add `private[spark]` to the method there. --- - To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org For additional commands, e-mail: reviews-h...@spark.apache.org
[GitHub] spark pull request #20098: [SPARK-22914][DEPLOY] Register history.ui.port
Github user vanzin commented on a diff in the pull request: https://github.com/apache/spark/pull/20098#discussion_r159339086 --- Diff: resource-managers/yarn/src/test/scala/org/apache/spark/deploy/yarn/ApplicationMasterUtilSuite.scala --- @@ -0,0 +1,44 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + *http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.deploy.yarn + +import org.apache.hadoop.yarn.conf.YarnConfiguration --- End diff -- These imports will fail style checks. Make sure to run them locally. --- - To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org For additional commands, e-mail: reviews-h...@spark.apache.org
[GitHub] spark pull request #20098: [SPARK-22914][DEPLOY] Register history.ui.port
Github user vanzin commented on a diff in the pull request: https://github.com/apache/spark/pull/20098#discussion_r159339383 --- Diff: resource-managers/yarn/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala --- @@ -836,6 +833,20 @@ object ApplicationMaster extends Logging { } +object ApplicationMasterUtil { + def getHistoryServerAddress( +sparkConf: SparkConf, --- End diff -- Multi-line parameter lists are double-indented. --- - To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org For additional commands, e-mail: reviews-h...@spark.apache.org
[GitHub] spark pull request #20098: [SPARK-22914][DEPLOY] Register history.ui.port
GitHub user gerashegalov opened a pull request: https://github.com/apache/spark/pull/20098 [SPARK-22914][DEPLOY] Register history.ui.port ## What changes were proposed in this pull request? Register spark.history.ui.port as a known spark conf to be used in substitution expressions even if it's not set explicitly. ## How was this patch tested? Added unit test to demonstrate the issue Please review http://spark.apache.org/contributing.html before opening a pull request. You can merge this pull request into a Git repository by running: $ git pull https://github.com/gerashegalov/spark gera/register-SHS-port-conf Alternatively you can review and apply these changes as the patch at: https://github.com/apache/spark/pull/20098.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #20098 commit 04fa7fd63ff86b9e60ebc128cb46c98c3c289fb1 Author: Gera Shegalov Date: 2017-12-27T23:09:41Z [SPARK-22914][DEPLOY] Register history.ui.port --- - To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org For additional commands, e-mail: reviews-h...@spark.apache.org