This repository has been archived by the owner on Jan 9, 2020. It is now read-only.
New API for custom labels and annotations. #346
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This APi allows for these labels and annotations to have = and , characters, which is hard to accomplish in the old scheme.
ash211
reviewed
Jun 14, 2017
docs/running-on-kubernetes.md
Outdated
| <td><code>spark.kubernetes.driver.labels</code></td> | ||
| <td>(none)</td> | ||
| <td> | ||
| <i>Deprecated.</i> Use <code>spark.kubernetes.driver.label.<labelKey></code> instead. |
There was a problem hiding this comment.
mention here that this is to support label values with = and , characters
docs/running-on-kubernetes.md
Outdated
| @@ -537,6 +578,7 @@ from the other deployment modes. See the [configuration page](configuration.html | |||
| <td><code>spark.kubernetes.driver.annotations</code></td> | |||
| <td>(none)</td> | |||
| <td> | |||
| <i>Deprecated.</i> Use <code>spark.kubernetes.driver.annotation.<annotationKey></code> instead. | |||
There was a problem hiding this comment.
mention here that this is to support annotation values with = and , characters
docs/running-on-kubernetes.md
Outdated
| @@ -545,6 +587,7 @@ from the other deployment modes. See the [configuration page](configuration.html | |||
| <td><code>spark.kubernetes.executor.labels</code></td> | |||
| <td>(none)</td> | |||
| <td> | |||
| <i>Deprecated.</i> Use <code>spark.kubernetes.executor.label.<labelKey></code> instead. | |||
docs/running-on-kubernetes.md
Outdated
| @@ -554,6 +597,7 @@ from the other deployment modes. See the [configuration page](configuration.html | |||
| <td><code>spark.kubernetes.executor.annotations</code></td> | |||
| <td>(none)</td> | |||
| <td> | |||
| <i>Deprecated.</i> Use <code>spark.kubernetes.executor.annotation.<annotationKey></code> instead. | |||
| @@ -82,17 +82,36 @@ private[spark] class Client( | |||
| def run(): Unit = { | |||
| validateNoDuplicateFileNames(sparkJars) | |||
| validateNoDuplicateFileNames(sparkFiles) | |||
| val parsedCustomLabels = ConfigurationUtils.parseKeyValuePairs( | |||
|
|
|||
| val parsedCustomLabelsDeprecated = ConfigurationUtils.parseKeyValuePairs( | |||
There was a problem hiding this comment.
put driver in the variable name, e.g. parsedDriverCustomLabelsDeprecated
| val allLabels = parsedCustomLabels ++ Map( | ||
| // Remark: getAllWithPrefix strips out the prefix in the returned array. | ||
| val customLabelsFromPrefixConf = sparkConf.getAllWithPrefix(KUBERNETES_DRIVER_LABEL_PREFIX) | ||
| val allCustomLabels = parsedCustomLabelsDeprecated.toSeq ++ customLabelsFromPrefixConf |
| s" operations.") | ||
| val allLabels = parsedCustomLabels ++ Map( | ||
| // Remark: getAllWithPrefix strips out the prefix in the returned array. | ||
| val customLabelsFromPrefixConf = sparkConf.getAllWithPrefix(KUBERNETES_DRIVER_LABEL_PREFIX) |
| s" $SPARK_APP_ID_LABEL is not allowed as it is reserved for Spark bookkeeping" + | ||
| s" operations.") | ||
|
|
||
| val parsedCustomAnnotationsDeprecated = ConfigurationUtils.parseKeyValuePairs( |
There was a problem hiding this comment.
parsedCustomDriverAnnotationsDeprecated
| require(!allCustomAnnotations.map(_._1).contains(SPARK_APP_NAME_ANNOTATION), | ||
| s"Annotation with key $SPARK_APP_NAME_ANNOTATION is not allowed as it is reserved for" + | ||
| s" Spark bookkeeping operations.") | ||
| val allLabels = allCustomLabels.toMap ++ Map( |
There was a problem hiding this comment.
This is getting long -- we should extract out a method that produces both allLabels and allAnnotations (named as driverLabels and driverAnnotations)
| } | ||
| require(!allCustomLabels.map(_._1).contains(SPARK_APP_ID_LABEL), s"Label with key " + | ||
| s" $SPARK_APP_ID_LABEL is not allowed as it is reserved for Spark bookkeeping" + | ||
| s" operations.") |
There was a problem hiding this comment.
also should log a warning when using the deprecated config saying that it's deprecated and should be replaced with the new form (labels and annotations for drivers and executors)
…he-spark-on-k8s/spark into reformat-labels-and-annotations-api
ash211
reviewed
Jun 14, 2017
| .set(KUBERNETES_DRIVER_ANNOTATIONS, | ||
| s"$DEPRECATED_CUSTOM_ANNOTATION_KEY=$DEPRECATED_CUSTOM_ANNOTATION_VALUE") | ||
| .set(s"$KUBERNETES_DRIVER_LABEL_PREFIX$CUSTOM_LABEL_KEY", CUSTOM_LABEL_VALUE) | ||
| .set(s"$KUBERNETES_DRIVER_ANNOTATION_PREFIX$CUSTOM_ANNOTATION_KEY", CUSTOM_ANNOTATION_VALUE) |
There was a problem hiding this comment.
@mccheah is it reasonable to check the executor labels/annotations here too?
There was a problem hiding this comment.
We don't parse those until we hit KubernetesClusterSchedulerBackend.
foxish
pushed a commit
that referenced
this pull request
Jul 24, 2017
* New API for custom labels and annotations. This APi allows for these labels and annotations to have = and , characters, which is hard to accomplish in the old scheme. * Compare correct values in requirements * Use helper method * Address comments. * Fix scalastyle * Use variable * Remove unused import
ifilonenko
pushed a commit
to ifilonenko/spark
that referenced
this pull request
Feb 26, 2019
Update to upstream
puneetloya
pushed a commit
to puneetloya/spark
that referenced
this pull request
Mar 11, 2019
* New API for custom labels and annotations. This APi allows for these labels and annotations to have = and , characters, which is hard to accomplish in the old scheme. * Compare correct values in requirements * Use helper method * Address comments. * Fix scalastyle * Use variable * Remove unused import
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #322.
This APi allows for these labels and annotations to have = and , characters, which is hard to accomplish in the old scheme.