You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by "ruanwenjun (via GitHub)" <gi...@apache.org> on 2025/12/03 12:12:43 UTC
[PR] [WIP][SPARK-54553][VOLCANO] Supports receiving podgroup JSON format configurations when using Volcano. [spark]
ruanwenjun opened a new pull request, #53307:
URL: https://github.com/apache/spark/pull/53307
<!--
Thanks for sending a pull request! Here are some tips for you:
1. If this is your first time, please read our contributor guidelines: https://spark.apache.org/contributing.html
2. Ensure you have added or run the appropriate tests for your PR: https://spark.apache.org/developer-tools.html
3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][SPARK-XXXX] Your PR title ...'.
4. Be sure to keep the PR description updated to reflect all changes.
5. Please write your PR title to summarize what this PR proposes.
6. If possible, provide a concise example to reproduce the issue for a faster review.
7. If you want to add a new configuration, please read the guideline first for naming configurations in
'core/src/main/scala/org/apache/spark/internal/config/ConfigEntry.scala'.
8. If you want to add or modify an error type or message, please read the guideline first in
'common/utils/src/main/resources/error/README.md'.
-->
### What changes were proposed in this pull request?
- Add a new config `spark.kubernetes.scheduler.volcano.podGroupTemplateJson` used when use volcano as k8s scheduler.
- This config used to provide the podgroup config by json string.
- If user don't set `podGroupTemplateFile` will use `podGroupTemplateJson`
<!--
Please clarify what changes you are proposing. The purpose of this section is to outline the changes and how this PR fixes the issue.
If possible, please consider writing useful notes for better and faster reviews in your PR. See the examples below.
1. If you refactor some codes with changing classes, showing the class hierarchy will help reviewers.
2. If you fix some SQL features, you can provide some references of other DBMSes.
3. If there is design documentation, please add the link.
4. If there is a discussion in the mailing list, please add the link.
-->
### Why are the changes needed?
- Avoid creating temporary podgroup files to facilitate usage and integration with external platforms such as kyuubi.
### Does this PR introduce _any_ user-facing change?
<!--
Note that it means *any* user-facing change including all aspects such as new features, bug fixes, or other behavior changes. Documentation-only updates are not considered user-facing changes.
If yes, please clarify the previous behavior and the change this PR proposes - provide the console output, description and/or an example to show the behavior difference if possible.
If possible, please also clarify if this is a user-facing change compared to the released Spark versions or within the unreleased branches such as master.
If no, write 'No'.
-->
Yes
### How was this patch tested?
<!--
If tests were added, say they were added here. Please make sure to add some test cases that check the changes thoroughly including negative and positive cases if possible.
If it was tested in a way different from regular unit tests, please clarify how you tested step by step, ideally copy and paste-able, so that other reviewers can test and check, and descendants can verify in the future.
If tests were not added, please describe why they were not added and/or why it was difficult to add.
If benchmark tests were added, please run the benchmarks in GitHub Actions for the consistent environment, and the instructions could accord to: https://spark.apache.org/developer-tools.html#github-workflow-benchmarks.
-->
Test by UT
### Was this patch authored or co-authored using generative AI tooling?
<!--
If generative AI tooling has been used in the process of authoring this patch, please include the
phrase: 'Generated-by: ' followed by the name of the tool and its version.
If no, write 'No'.
Please refer to the [ASF Generative Tooling Guidance](https://www.apache.org/legal/generative-tooling.html) for details.
-->
NO
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-54553][K8S] Supports receiving `Volcano` podgroup JSON format configurations [spark]
Posted by "ruanwenjun (via GitHub)" <gi...@apache.org>.
ruanwenjun commented on code in PR #53307:
URL: https://github.com/apache/spark/pull/53307#discussion_r2608849397
##########
resource-managers/kubernetes/core/volcano/src/main/scala/org/apache/spark/deploy/k8s/features/VolcanoFeatureStep.scala:
##########
@@ -16,15 +16,20 @@
*/
package org.apache.spark.deploy.k8s.features
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory
import io.fabric8.kubernetes.api.model._
import io.fabric8.volcano.api.model.scheduling.v1beta1.{PodGroup, PodGroupSpec}
import io.fabric8.volcano.client.DefaultVolcanoClient
+import org.apache.spark.SparkException
import org.apache.spark.deploy.k8s.{KubernetesConf, KubernetesDriverConf, KubernetesExecutorConf, SparkPod}
import org.apache.spark.internal.Logging
-private[spark] class VolcanoFeatureStep extends KubernetesDriverCustomFeatureConfigStep
- with KubernetesExecutorCustomFeatureConfigStep with Logging {
+private[spark] class VolcanoFeatureStep
+ extends KubernetesDriverCustomFeatureConfigStep
+ with KubernetesExecutorCustomFeatureConfigStep
+ with Logging {
Review Comment:
Done
##########
resource-managers/kubernetes/core/volcano/src/main/scala/org/apache/spark/deploy/k8s/features/VolcanoFeatureStep.scala:
##########
@@ -42,13 +47,15 @@ private[spark] class VolcanoFeatureStep extends KubernetesDriverCustomFeatureCon
override def getAdditionalPreKubernetesResources(): Seq[HasMetadata] = {
if (kubernetesConf.isInstanceOf[KubernetesExecutorConf]) {
- logWarning("VolcanoFeatureStep#getAdditionalPreKubernetesResources() is not supported " +
- "for executor.")
+ logWarning(
+ "VolcanoFeatureStep#getAdditionalPreKubernetesResources() is not supported " +
+ "for executor.")
Review Comment:
Done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-54553][K8S] Supports receiving `Volcano` podgroup JSON format configurations [spark]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on code in PR #53307:
URL: https://github.com/apache/spark/pull/53307#discussion_r2607429685
##########
resource-managers/kubernetes/core/volcano/src/main/scala/org/apache/spark/deploy/k8s/features/VolcanoFeatureStep.scala:
##########
@@ -59,13 +66,42 @@ private[spark] class VolcanoFeatureStep extends KubernetesDriverCustomFeatureCon
if (spec == null) spec = new PodGroupSpec
pg.setSpec(spec)
+ logDebug(s"Volcano PodGroup configuration: $pg")
Seq(pg)
}
+ private def getPodGroupConfigByTemplateFile(
+ volcanoClient: DefaultVolcanoClient): Option[PodGroup] = {
+ kubernetesConf.getOption(POD_GROUP_TEMPLATE_FILE_KEY).map { templateFile =>
+ logDebug("Loading Volcano PodGroup configuration from template file")
+ volcanoClient.podGroups.load(templateFile).item
+ }
+ }
+
+ private def getPodGroupByTemplateJson(volcanoClient: DefaultVolcanoClient): Option[PodGroup] = {
+ kubernetesConf.getOption(POD_GROUP_TEMPLATE_JSON_KEY).map { templateJson =>
+ logDebug("Loading Volcano PodGroup configuration from template json")
+ try {
+ val templateYaml = new ObjectMapper()
+ .writerWithDefaultPrettyPrinter()
+ .writeValueAsString(new ObjectMapper(new YAMLFactory()).readTree(templateJson))
+ volcanoClient
+ .podGroups()
+ .load(new java.io.ByteArrayInputStream(templateYaml.getBytes()))
+ .item()
+ } catch {
+ case e: Exception =>
+ throw new SparkException(
+ f"The ${POD_GROUP_TEMPLATE_JSON_KEY} provided is not validated",
+ e)
+ }
+ }
+ }
+
override def configurePod(pod: SparkPod): SparkPod = {
val k8sPodBuilder = new PodBuilder(pod.pod)
.editMetadata()
- .addToAnnotations(POD_GROUP_ANNOTATION, podGroupName)
+ .addToAnnotations(POD_GROUP_ANNOTATION, podGroupName)
Review Comment:
Please revert this irrelevant style change.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-54553][K8S] Support `spark.kubernetes.scheduler.volcano.podGroupTemplateJson` [spark]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on PR #53307:
URL: https://github.com/apache/spark/pull/53307#issuecomment-3668425466
Merged to master for Apache Spark 4.2.0.
I added you to the Apache Spark contributor group and assigned SPARK-54553 to you.
Welcome to the Apache Spark community and congratulations for your first commit, @ruanwenjun .
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-54553][K8S] Supports receiving `Volcano` podgroup JSON format configurations [spark]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on code in PR #53307:
URL: https://github.com/apache/spark/pull/53307#discussion_r2607428777
##########
resource-managers/kubernetes/core/volcano/src/main/scala/org/apache/spark/deploy/k8s/features/VolcanoFeatureStep.scala:
##########
@@ -59,13 +66,42 @@ private[spark] class VolcanoFeatureStep extends KubernetesDriverCustomFeatureCon
if (spec == null) spec = new PodGroupSpec
pg.setSpec(spec)
+ logDebug(s"Volcano PodGroup configuration: $pg")
Seq(pg)
}
+ private def getPodGroupConfigByTemplateFile(
+ volcanoClient: DefaultVolcanoClient): Option[PodGroup] = {
+ kubernetesConf.getOption(POD_GROUP_TEMPLATE_FILE_KEY).map { templateFile =>
+ logDebug("Loading Volcano PodGroup configuration from template file")
+ volcanoClient.podGroups.load(templateFile).item
+ }
+ }
+
+ private def getPodGroupByTemplateJson(volcanoClient: DefaultVolcanoClient): Option[PodGroup] = {
+ kubernetesConf.getOption(POD_GROUP_TEMPLATE_JSON_KEY).map { templateJson =>
+ logDebug("Loading Volcano PodGroup configuration from template json")
+ try {
+ val templateYaml = new ObjectMapper()
+ .writerWithDefaultPrettyPrinter()
+ .writeValueAsString(new ObjectMapper(new YAMLFactory()).readTree(templateJson))
+ volcanoClient
+ .podGroups()
+ .load(new java.io.ByteArrayInputStream(templateYaml.getBytes()))
+ .item()
+ } catch {
+ case e: Exception =>
+ throw new SparkException(
+ f"The ${POD_GROUP_TEMPLATE_JSON_KEY} provided is not validated",
+ e)
Review Comment:
Let's keep this simple as one-liner.
```scala
throw new SparkException(f"The ${POD_GROUP_TEMPLATE_JSON_KEY} provided is not validated", e)
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-54553][K8S] Supports receiving `Volcano` podgroup JSON format configurations [spark]
Posted by "ruanwenjun (via GitHub)" <gi...@apache.org>.
ruanwenjun commented on code in PR #53307:
URL: https://github.com/apache/spark/pull/53307#discussion_r2609291789
##########
resource-managers/kubernetes/core/volcano/src/main/scala/org/apache/spark/deploy/k8s/features/VolcanoFeatureStep.scala:
##########
@@ -59,9 +65,36 @@ private[spark] class VolcanoFeatureStep extends KubernetesDriverCustomFeatureCon
if (spec == null) spec = new PodGroupSpec
pg.setSpec(spec)
+ logDebug(s"Volcano PodGroup configuration: $pg")
Seq(pg)
}
+ private def getPodGroupConfigByTemplateFile(
+ volcanoClient: DefaultVolcanoClient): Option[PodGroup] = {
+ kubernetesConf.getOption(POD_GROUP_TEMPLATE_FILE_KEY).map { templateFile =>
+ logDebug("Loading Volcano PodGroup configuration from template file")
+ volcanoClient.podGroups.load(templateFile).item
+ }
+ }
+
+ private def getPodGroupByTemplateJson(volcanoClient: DefaultVolcanoClient): Option[PodGroup] = {
+ kubernetesConf.getOption(POD_GROUP_TEMPLATE_JSON_KEY).map { templateJson =>
+ logDebug("Loading Volcano PodGroup configuration from template json")
+ try {
+ val templateYaml = new ObjectMapper()
+ .writerWithDefaultPrettyPrinter()
+ .writeValueAsString(new ObjectMapper(new YAMLFactory()).readTree(templateJson))
+ volcanoClient
+ .podGroups()
+ .load(new ByteArrayInputStream(templateYaml.getBytes()))
+ .item()
+ } catch {
+ case e: Exception =>
Review Comment:
Changed to only catch `JsonParseException` here.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-54553][K8S] Supports receiving `Volcano` podgroup JSON format configurations [spark]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on code in PR #53307:
URL: https://github.com/apache/spark/pull/53307#discussion_r2607431346
##########
resource-managers/kubernetes/core/volcano/src/test/scala/org/apache/spark/deploy/k8s/features/VolcanoFeatureStepSuite.scala:
##########
@@ -46,12 +47,13 @@ class VolcanoFeatureStepSuite extends SparkFunSuite {
step.init(kubernetesConf)
val configuredPod = step.configurePod(SparkPod.initialPod())
val annotations = configuredPod.pod.getMetadata.getAnnotations
- assert(annotations.get("scheduling.k8s.io/group-name") === s"${kubernetesConf.appId}-podgroup")
+ assert(
+ annotations.get("scheduling.k8s.io/group-name") === s"${kubernetesConf.appId}-podgroup")
Review Comment:
Please revert this style change.
##########
resource-managers/kubernetes/core/volcano/src/test/scala/org/apache/spark/deploy/k8s/features/VolcanoFeatureStepSuite.scala:
##########
@@ -46,12 +47,13 @@ class VolcanoFeatureStepSuite extends SparkFunSuite {
step.init(kubernetesConf)
val configuredPod = step.configurePod(SparkPod.initialPod())
val annotations = configuredPod.pod.getMetadata.getAnnotations
- assert(annotations.get("scheduling.k8s.io/group-name") === s"${kubernetesConf.appId}-podgroup")
+ assert(
+ annotations.get("scheduling.k8s.io/group-name") === s"${kubernetesConf.appId}-podgroup")
}
test("SPARK-38455: Support driver podgroup template") {
- val templatePath = new File(
- getClass.getResource("/driver-podgroup-template.yml").getFile).getAbsolutePath
+ val templatePath =
+ new File(getClass.getResource("/driver-podgroup-template.yml").getFile).getAbsolutePath
Review Comment:
Please revert this style change.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-54553][K8S] Supports receiving `Volcano` podgroup JSON format configurations [spark]
Posted by "ruanwenjun (via GitHub)" <gi...@apache.org>.
ruanwenjun commented on PR #53307:
URL: https://github.com/apache/spark/pull/53307#issuecomment-3641217218
Rebase master to fix CI failed issue
```
No space left on device
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-54553][K8S] Supports receiving `Volcano` podgroup JSON format configurations [spark]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on code in PR #53307:
URL: https://github.com/apache/spark/pull/53307#discussion_r2607400046
##########
docs/running-on-kubernetes.md:
##########
Review Comment:
Please don't remove this empty line.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-54553][K8S] Supports receiving `Volcano` podgroup JSON format configurations [spark]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on code in PR #53307:
URL: https://github.com/apache/spark/pull/53307#discussion_r2607411043
##########
resource-managers/kubernetes/core/volcano/src/main/scala/org/apache/spark/deploy/k8s/features/VolcanoFeatureStep.scala:
##########
@@ -16,15 +16,20 @@
*/
package org.apache.spark.deploy.k8s.features
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory
import io.fabric8.kubernetes.api.model._
import io.fabric8.volcano.api.model.scheduling.v1beta1.{PodGroup, PodGroupSpec}
import io.fabric8.volcano.client.DefaultVolcanoClient
+import org.apache.spark.SparkException
import org.apache.spark.deploy.k8s.{KubernetesConf, KubernetesDriverConf, KubernetesExecutorConf, SparkPod}
import org.apache.spark.internal.Logging
-private[spark] class VolcanoFeatureStep extends KubernetesDriverCustomFeatureConfigStep
- with KubernetesExecutorCustomFeatureConfigStep with Logging {
+private[spark] class VolcanoFeatureStep
+ extends KubernetesDriverCustomFeatureConfigStep
+ with KubernetesExecutorCustomFeatureConfigStep
+ with Logging {
Review Comment:
Please revert this style change in order to reduce the diff of this contribution. We usually don't mix the style change and feature change.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-54553][K8S] Supports receiving `Volcano` podgroup JSON format configurations [spark]
Posted by "ruanwenjun (via GitHub)" <gi...@apache.org>.
ruanwenjun commented on code in PR #53307:
URL: https://github.com/apache/spark/pull/53307#discussion_r2608851638
##########
docs/running-on-kubernetes.md:
##########
@@ -2011,6 +1973,17 @@ spec:
queue: default
```
+You have two options to provide the PodGroup template in spark.
Review Comment:
The `podGroupTemplateFile` will be used preferentially, I have documented this.
##########
resource-managers/kubernetes/core/volcano/src/main/scala/org/apache/spark/deploy/k8s/features/VolcanoFeatureStep.scala:
##########
@@ -59,13 +66,42 @@ private[spark] class VolcanoFeatureStep extends KubernetesDriverCustomFeatureCon
if (spec == null) spec = new PodGroupSpec
pg.setSpec(spec)
+ logDebug(s"Volcano PodGroup configuration: $pg")
Seq(pg)
}
+ private def getPodGroupConfigByTemplateFile(
+ volcanoClient: DefaultVolcanoClient): Option[PodGroup] = {
+ kubernetesConf.getOption(POD_GROUP_TEMPLATE_FILE_KEY).map { templateFile =>
+ logDebug("Loading Volcano PodGroup configuration from template file")
+ volcanoClient.podGroups.load(templateFile).item
+ }
+ }
+
+ private def getPodGroupByTemplateJson(volcanoClient: DefaultVolcanoClient): Option[PodGroup] = {
+ kubernetesConf.getOption(POD_GROUP_TEMPLATE_JSON_KEY).map { templateJson =>
+ logDebug("Loading Volcano PodGroup configuration from template json")
+ try {
+ val templateYaml = new ObjectMapper()
+ .writerWithDefaultPrettyPrinter()
+ .writeValueAsString(new ObjectMapper(new YAMLFactory()).readTree(templateJson))
+ volcanoClient
+ .podGroups()
+ .load(new java.io.ByteArrayInputStream(templateYaml.getBytes()))
Review Comment:
Done
##########
resource-managers/kubernetes/core/volcano/src/main/scala/org/apache/spark/deploy/k8s/features/VolcanoFeatureStep.scala:
##########
@@ -59,13 +66,42 @@ private[spark] class VolcanoFeatureStep extends KubernetesDriverCustomFeatureCon
if (spec == null) spec = new PodGroupSpec
pg.setSpec(spec)
+ logDebug(s"Volcano PodGroup configuration: $pg")
Seq(pg)
}
+ private def getPodGroupConfigByTemplateFile(
+ volcanoClient: DefaultVolcanoClient): Option[PodGroup] = {
+ kubernetesConf.getOption(POD_GROUP_TEMPLATE_FILE_KEY).map { templateFile =>
+ logDebug("Loading Volcano PodGroup configuration from template file")
+ volcanoClient.podGroups.load(templateFile).item
+ }
+ }
+
+ private def getPodGroupByTemplateJson(volcanoClient: DefaultVolcanoClient): Option[PodGroup] = {
+ kubernetesConf.getOption(POD_GROUP_TEMPLATE_JSON_KEY).map { templateJson =>
+ logDebug("Loading Volcano PodGroup configuration from template json")
+ try {
+ val templateYaml = new ObjectMapper()
+ .writerWithDefaultPrettyPrinter()
+ .writeValueAsString(new ObjectMapper(new YAMLFactory()).readTree(templateJson))
+ volcanoClient
+ .podGroups()
+ .load(new java.io.ByteArrayInputStream(templateYaml.getBytes()))
+ .item()
+ } catch {
+ case e: Exception =>
+ throw new SparkException(
+ f"The ${POD_GROUP_TEMPLATE_JSON_KEY} provided is not validated",
+ e)
Review Comment:
Done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-54553][K8S] Supports receiving `Volcano` podgroup JSON format configurations [spark]
Posted by "ruanwenjun (via GitHub)" <gi...@apache.org>.
ruanwenjun commented on code in PR #53307:
URL: https://github.com/apache/spark/pull/53307#discussion_r2608852262
##########
resource-managers/kubernetes/core/volcano/src/test/scala/org/apache/spark/deploy/k8s/features/VolcanoFeatureStepSuite.scala:
##########
@@ -46,12 +47,13 @@ class VolcanoFeatureStepSuite extends SparkFunSuite {
step.init(kubernetesConf)
val configuredPod = step.configurePod(SparkPod.initialPod())
val annotations = configuredPod.pod.getMetadata.getAnnotations
- assert(annotations.get("scheduling.k8s.io/group-name") === s"${kubernetesConf.appId}-podgroup")
+ assert(
+ annotations.get("scheduling.k8s.io/group-name") === s"${kubernetesConf.appId}-podgroup")
Review Comment:
Done
##########
resource-managers/kubernetes/core/volcano/src/test/scala/org/apache/spark/deploy/k8s/features/VolcanoFeatureStepSuite.scala:
##########
@@ -46,12 +47,13 @@ class VolcanoFeatureStepSuite extends SparkFunSuite {
step.init(kubernetesConf)
val configuredPod = step.configurePod(SparkPod.initialPod())
val annotations = configuredPod.pod.getMetadata.getAnnotations
- assert(annotations.get("scheduling.k8s.io/group-name") === s"${kubernetesConf.appId}-podgroup")
+ assert(
+ annotations.get("scheduling.k8s.io/group-name") === s"${kubernetesConf.appId}-podgroup")
}
test("SPARK-38455: Support driver podgroup template") {
- val templatePath = new File(
- getClass.getResource("/driver-podgroup-template.yml").getFile).getAbsolutePath
+ val templatePath =
+ new File(getClass.getResource("/driver-podgroup-template.yml").getFile).getAbsolutePath
Review Comment:
Done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-54553][K8S] Supports receiving `Volcano` podgroup JSON format configurations [spark]
Posted by "ruanwenjun (via GitHub)" <gi...@apache.org>.
ruanwenjun commented on code in PR #53307:
URL: https://github.com/apache/spark/pull/53307#discussion_r2610313398
##########
resource-managers/kubernetes/core/volcano/src/main/scala/org/apache/spark/deploy/k8s/features/VolcanoFeatureStep.scala:
##########
@@ -59,9 +65,36 @@ private[spark] class VolcanoFeatureStep extends KubernetesDriverCustomFeatureCon
if (spec == null) spec = new PodGroupSpec
pg.setSpec(spec)
+ logDebug(s"Volcano PodGroup configuration: $pg")
Seq(pg)
}
+ private def getPodGroupConfigByTemplateFile(
+ volcanoClient: DefaultVolcanoClient): Option[PodGroup] = {
+ kubernetesConf.getOption(POD_GROUP_TEMPLATE_FILE_KEY).map { templateFile =>
+ logDebug("Loading Volcano PodGroup configuration from template file")
+ volcanoClient.podGroups.load(templateFile).item
+ }
+ }
+
+ private def getPodGroupByTemplateJson(volcanoClient: DefaultVolcanoClient): Option[PodGroup] = {
+ kubernetesConf.getOption(POD_GROUP_TEMPLATE_JSON_KEY).map { templateJson =>
+ logDebug("Loading Volcano PodGroup configuration from template json")
+ try {
+ val templateYaml = new ObjectMapper()
+ .writerWithDefaultPrettyPrinter()
+ .writeValueAsString(new ObjectMapper(new YAMLFactory()).readTree(templateJson))
+ volcanoClient
+ .podGroups()
+ .load(new ByteArrayInputStream(templateYaml.getBytes()))
+ .item()
+ } catch {
+ case e: Exception =>
Review Comment:
I remove the catch here, do not check the json schema here, keep the logic same with load `podGroupTemplateFile`.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-54553][K8S] Supports receiving `Volcano` podgroup JSON format configurations [spark]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on code in PR #53307:
URL: https://github.com/apache/spark/pull/53307#discussion_r2607412358
##########
resource-managers/kubernetes/core/volcano/src/main/scala/org/apache/spark/deploy/k8s/features/VolcanoFeatureStep.scala:
##########
@@ -42,13 +47,15 @@ private[spark] class VolcanoFeatureStep extends KubernetesDriverCustomFeatureCon
override def getAdditionalPreKubernetesResources(): Seq[HasMetadata] = {
if (kubernetesConf.isInstanceOf[KubernetesExecutorConf]) {
- logWarning("VolcanoFeatureStep#getAdditionalPreKubernetesResources() is not supported " +
- "for executor.")
+ logWarning(
+ "VolcanoFeatureStep#getAdditionalPreKubernetesResources() is not supported " +
+ "for executor.")
Review Comment:
Please revert this style change.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-54553][K8S] Supports receiving `Volcano` podgroup JSON format configurations [spark]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on code in PR #53307:
URL: https://github.com/apache/spark/pull/53307#discussion_r2607430709
##########
resource-managers/kubernetes/core/volcano/src/test/scala/org/apache/spark/deploy/k8s/features/VolcanoFeatureStepSuite.scala:
##########
@@ -34,7 +34,8 @@ class VolcanoFeatureStepSuite extends SparkFunSuite {
val annotations = configuredPod.pod.getMetadata.getAnnotations
- assert(annotations.get("scheduling.k8s.io/group-name") === s"${kubernetesConf.appId}-podgroup")
+ assert(
+ annotations.get("scheduling.k8s.io/group-name") === s"${kubernetesConf.appId}-podgroup")
Review Comment:
Please revert this style change.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-54553][K8S] Supports receiving `Volcano` podgroup JSON format configurations [spark]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on code in PR #53307:
URL: https://github.com/apache/spark/pull/53307#discussion_r2607433040
##########
resource-managers/kubernetes/core/volcano/src/test/scala/org/apache/spark/deploy/k8s/features/VolcanoFeatureStepSuite.scala:
##########
@@ -67,6 +69,34 @@ class VolcanoFeatureStepSuite extends SparkFunSuite {
assert(podGroup.getSpec.getQueue == "driver-queue")
}
+ test("SPARK-38455: Support create driver podgroup by attributes") {
Review Comment:
This is wrong because you need to use your JIRA ID, SPARK-54553.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-54553][K8S] Supports receiving `Volcano` podgroup JSON format configurations [spark]
Posted by "ruanwenjun (via GitHub)" <gi...@apache.org>.
ruanwenjun commented on PR #53307:
URL: https://github.com/apache/spark/pull/53307#issuecomment-3640347506
@dongjoon-hyun Thank you for your prompt response and professional review.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-54553][K8S] Supports receiving `Volcano` podgroup JSON format configurations [spark]
Posted by "ruanwenjun (via GitHub)" <gi...@apache.org>.
ruanwenjun commented on code in PR #53307:
URL: https://github.com/apache/spark/pull/53307#discussion_r2608851973
##########
resource-managers/kubernetes/core/volcano/src/main/scala/org/apache/spark/deploy/k8s/features/VolcanoFeatureStep.scala:
##########
@@ -59,13 +66,42 @@ private[spark] class VolcanoFeatureStep extends KubernetesDriverCustomFeatureCon
if (spec == null) spec = new PodGroupSpec
pg.setSpec(spec)
+ logDebug(s"Volcano PodGroup configuration: $pg")
Seq(pg)
}
+ private def getPodGroupConfigByTemplateFile(
+ volcanoClient: DefaultVolcanoClient): Option[PodGroup] = {
+ kubernetesConf.getOption(POD_GROUP_TEMPLATE_FILE_KEY).map { templateFile =>
+ logDebug("Loading Volcano PodGroup configuration from template file")
+ volcanoClient.podGroups.load(templateFile).item
+ }
+ }
+
+ private def getPodGroupByTemplateJson(volcanoClient: DefaultVolcanoClient): Option[PodGroup] = {
+ kubernetesConf.getOption(POD_GROUP_TEMPLATE_JSON_KEY).map { templateJson =>
+ logDebug("Loading Volcano PodGroup configuration from template json")
+ try {
+ val templateYaml = new ObjectMapper()
+ .writerWithDefaultPrettyPrinter()
+ .writeValueAsString(new ObjectMapper(new YAMLFactory()).readTree(templateJson))
+ volcanoClient
+ .podGroups()
+ .load(new java.io.ByteArrayInputStream(templateYaml.getBytes()))
+ .item()
+ } catch {
+ case e: Exception =>
+ throw new SparkException(
+ f"The ${POD_GROUP_TEMPLATE_JSON_KEY} provided is not validated",
+ e)
+ }
+ }
+ }
+
override def configurePod(pod: SparkPod): SparkPod = {
val k8sPodBuilder = new PodBuilder(pod.pod)
.editMetadata()
- .addToAnnotations(POD_GROUP_ANNOTATION, podGroupName)
+ .addToAnnotations(POD_GROUP_ANNOTATION, podGroupName)
Review Comment:
Done
##########
resource-managers/kubernetes/core/volcano/src/test/scala/org/apache/spark/deploy/k8s/features/VolcanoFeatureStepSuite.scala:
##########
@@ -34,7 +34,8 @@ class VolcanoFeatureStepSuite extends SparkFunSuite {
val annotations = configuredPod.pod.getMetadata.getAnnotations
- assert(annotations.get("scheduling.k8s.io/group-name") === s"${kubernetesConf.appId}-podgroup")
+ assert(
+ annotations.get("scheduling.k8s.io/group-name") === s"${kubernetesConf.appId}-podgroup")
Review Comment:
Done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-54553][K8S] Supports receiving `Volcano` podgroup JSON format configurations [spark]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on code in PR #53307:
URL: https://github.com/apache/spark/pull/53307#discussion_r2607415677
##########
docs/running-on-kubernetes.md:
##########
@@ -2011,6 +1973,17 @@ spec:
queue: default
```
+You have two options to provide the PodGroup template in spark.
Review Comment:
When we have both option, which one wins?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-54553][K8S] Supports receiving `Volcano` podgroup JSON format configurations [spark]
Posted by "ruanwenjun (via GitHub)" <gi...@apache.org>.
ruanwenjun commented on PR #53307:
URL: https://github.com/apache/spark/pull/53307#issuecomment-3652637296
@dongjoon-hyun Hi Dongjoon, could you please review this again? Please let me know if there’s anything else I need to do.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-54553][K8S] Support `spark.kubernetes.scheduler.volcano.podGroupTemplateJson` [spark]
Posted by "ruanwenjun (via GitHub)" <gi...@apache.org>.
ruanwenjun commented on PR #53307:
URL: https://github.com/apache/spark/pull/53307#issuecomment-3669960562
@dongjoon-hyun Thanks
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-54553][K8S] Supports receiving `Volcano` podgroup JSON format configurations [spark]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on code in PR #53307:
URL: https://github.com/apache/spark/pull/53307#discussion_r2607424708
##########
resource-managers/kubernetes/core/volcano/src/main/scala/org/apache/spark/deploy/k8s/features/VolcanoFeatureStep.scala:
##########
@@ -59,13 +66,42 @@ private[spark] class VolcanoFeatureStep extends KubernetesDriverCustomFeatureCon
if (spec == null) spec = new PodGroupSpec
pg.setSpec(spec)
+ logDebug(s"Volcano PodGroup configuration: $pg")
Seq(pg)
}
+ private def getPodGroupConfigByTemplateFile(
+ volcanoClient: DefaultVolcanoClient): Option[PodGroup] = {
+ kubernetesConf.getOption(POD_GROUP_TEMPLATE_FILE_KEY).map { templateFile =>
+ logDebug("Loading Volcano PodGroup configuration from template file")
+ volcanoClient.podGroups.load(templateFile).item
+ }
+ }
+
+ private def getPodGroupByTemplateJson(volcanoClient: DefaultVolcanoClient): Option[PodGroup] = {
+ kubernetesConf.getOption(POD_GROUP_TEMPLATE_JSON_KEY).map { templateJson =>
+ logDebug("Loading Volcano PodGroup configuration from template json")
+ try {
+ val templateYaml = new ObjectMapper()
+ .writerWithDefaultPrettyPrinter()
+ .writeValueAsString(new ObjectMapper(new YAMLFactory()).readTree(templateJson))
+ volcanoClient
+ .podGroups()
+ .load(new java.io.ByteArrayInputStream(templateYaml.getBytes()))
Review Comment:
Please import `java.io.ByteArrayInputStream` properly.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-54553][VOLCANO] Supports receiving podgroup JSON format configurations when using Volcano. [spark]
Posted by "ruanwenjun (via GitHub)" <gi...@apache.org>.
ruanwenjun commented on PR #53307:
URL: https://github.com/apache/spark/pull/53307#issuecomment-3625789012
@dongjoon-hyun Could you please take a look when you have time?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-54553][K8S] Supports receiving `Volcano` podgroup JSON format configurations [spark]
Posted by "ruanwenjun (via GitHub)" <gi...@apache.org>.
ruanwenjun commented on code in PR #53307:
URL: https://github.com/apache/spark/pull/53307#discussion_r2608852684
##########
resource-managers/kubernetes/core/volcano/src/test/scala/org/apache/spark/deploy/k8s/features/VolcanoFeatureStepSuite.scala:
##########
@@ -67,6 +69,34 @@ class VolcanoFeatureStepSuite extends SparkFunSuite {
assert(podGroup.getSpec.getQueue == "driver-queue")
}
+ test("SPARK-38455: Support create driver podgroup by attributes") {
Review Comment:
Done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-54553][K8S] Supports receiving `Volcano` podgroup JSON format configurations [spark]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun commented on code in PR #53307:
URL: https://github.com/apache/spark/pull/53307#discussion_r2608948509
##########
resource-managers/kubernetes/core/volcano/src/main/scala/org/apache/spark/deploy/k8s/features/VolcanoFeatureStep.scala:
##########
@@ -59,9 +65,36 @@ private[spark] class VolcanoFeatureStep extends KubernetesDriverCustomFeatureCon
if (spec == null) spec = new PodGroupSpec
pg.setSpec(spec)
+ logDebug(s"Volcano PodGroup configuration: $pg")
Seq(pg)
}
+ private def getPodGroupConfigByTemplateFile(
+ volcanoClient: DefaultVolcanoClient): Option[PodGroup] = {
+ kubernetesConf.getOption(POD_GROUP_TEMPLATE_FILE_KEY).map { templateFile =>
+ logDebug("Loading Volcano PodGroup configuration from template file")
+ volcanoClient.podGroups.load(templateFile).item
+ }
+ }
+
+ private def getPodGroupByTemplateJson(volcanoClient: DefaultVolcanoClient): Option[PodGroup] = {
+ kubernetesConf.getOption(POD_GROUP_TEMPLATE_JSON_KEY).map { templateJson =>
+ logDebug("Loading Volcano PodGroup configuration from template json")
+ try {
+ val templateYaml = new ObjectMapper()
+ .writerWithDefaultPrettyPrinter()
+ .writeValueAsString(new ObjectMapper(new YAMLFactory()).readTree(templateJson))
+ volcanoClient
+ .podGroups()
+ .load(new ByteArrayInputStream(templateYaml.getBytes()))
+ .item()
+ } catch {
+ case e: Exception =>
Review Comment:
Could you catch a specific exception here instead of `Exception`?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-54553][K8S] Support `spark.kubernetes.scheduler.volcano.podGroupTemplateJson` [spark]
Posted by "dongjoon-hyun (via GitHub)" <gi...@apache.org>.
dongjoon-hyun closed pull request #53307: [SPARK-54553][K8S] Support `spark.kubernetes.scheduler.volcano.podGroupTemplateJson`
URL: https://github.com/apache/spark/pull/53307
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org