You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by GitBox <gi...@apache.org> on 2021/12/26 22:59:48 UTC
[GitHub] [spark] viirya opened a new pull request #35028: [SPARK-37578][SQL] Update task metrics from ds v2 custom metrics
viirya opened a new pull request #35028:
URL: https://github.com/apache/spark/pull/35028
<!--
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
'core/src/main/resources/error/README.md'.
-->
### What changes were proposed in this pull request?
<!--
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.
-->
This patch proposes to update task metrics from datasource v2 custom metrics.
### Why are the changes needed?
<!--
Please clarify why the changes are needed. For instance,
1. If you propose a new API, clarify the use case for a new API.
2. If you fix a bug, you can clarify why it is a bug.
-->
We have updated task metrics such as `bytesWritten` and `recordsWritten` from built-in data source v2 format e.g. Parquet. For other data source v2 formats, we can define some builtin metric names so Spark can also recognize them and update task metrics.
### Does this PR introduce _any_ user-facing change?
<!--
Note that it means *any* user-facing change including all aspects such as the documentation fix.
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. Some special DS v2 custom metrics are updated to task metrics.
### 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.
-->
Added unit test.
--
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
[GitHub] [spark] cloud-fan commented on a change in pull request #35028: [SPARK-37578][SQL] Update task metrics from ds v2 custom metrics
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on a change in pull request #35028:
URL: https://github.com/apache/spark/pull/35028#discussion_r775720931
##########
File path: sql/core/src/test/scala/org/apache/spark/sql/execution/ui/SQLAppStatusListenerSuite.scala
##########
@@ -900,6 +900,46 @@ class SQLAppStatusListenerSuite extends SharedSparkSession with JsonTestUtils
assert(innerMetric.isDefined)
}
}
+
+ test("SPARK-37578: Update output metrics from Datasource v2") {
+ withTempDir { dir =>
+ val statusStore = spark.sharedState.statusStore
+ val oldCount = statusStore.executionsList().size
Review comment:
then `statusStore.executionsCount()` looks more efficient? It's also used in the code below.
--
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
[GitHub] [spark] viirya commented on a change in pull request #35028: [SPARK-37578][SQL] Update task metrics from ds v2 custom metrics
Posted by GitBox <gi...@apache.org>.
viirya commented on a change in pull request #35028:
URL: https://github.com/apache/spark/pull/35028#discussion_r775721091
##########
File path: sql/core/src/test/scala/org/apache/spark/sql/execution/ui/SQLAppStatusListenerSuite.scala
##########
@@ -900,6 +900,46 @@ class SQLAppStatusListenerSuite extends SharedSparkSession with JsonTestUtils
assert(innerMetric.isDefined)
}
}
+
+ test("SPARK-37578: Update output metrics from Datasource v2") {
+ withTempDir { dir =>
+ val statusStore = spark.sharedState.statusStore
+ val oldCount = statusStore.executionsList().size
Review comment:
Yea, I will change to `executionsCount`.
--
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
[GitHub] [spark] viirya commented on a change in pull request #35028: [SPARK-37578][SQL] Update task metrics from ds v2 custom metrics
Posted by GitBox <gi...@apache.org>.
viirya commented on a change in pull request #35028:
URL: https://github.com/apache/spark/pull/35028#discussion_r775661787
##########
File path: sql/core/src/main/scala/org/apache/spark/sql/execution/metric/CustomMetrics.scala
##########
@@ -52,7 +55,18 @@ object CustomMetrics {
currentMetricsValues: Seq[CustomTaskMetric],
customMetrics: Map[String, SQLMetric]): Unit = {
currentMetricsValues.foreach { metric =>
- customMetrics.get(metric.name()).map(_.set(metric.value()))
+ val metricName = metric.name()
+ val metricValue = metric.value()
+ customMetrics.get(metricName).map(_.set(metricValue))
+
+ if (builtInOutputMetrics.contains(metricName)) {
+ Option(TaskContext.get()).map(_.taskMetrics().outputMetrics).foreach { outputMetrics =>
+ metricName match {
+ case "bytesWritten" => outputMetrics.setBytesWritten(metricValue)
+ case "recordsWritten" => outputMetrics.setRecordsWritten(metricValue)
Review comment:
Yea, I'll add it. 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
[GitHub] [spark] cloud-fan commented on a change in pull request #35028: [SPARK-37578][SQL] Update task metrics from ds v2 custom metrics
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on a change in pull request #35028:
URL: https://github.com/apache/spark/pull/35028#discussion_r775719876
##########
File path: sql/core/src/test/scala/org/apache/spark/sql/execution/ui/SQLAppStatusListenerSuite.scala
##########
@@ -900,6 +900,46 @@ class SQLAppStatusListenerSuite extends SharedSparkSession with JsonTestUtils
assert(innerMetric.isDefined)
}
}
+
+ test("SPARK-37578: Update output metrics from Datasource v2") {
+ withTempDir { dir =>
+ val statusStore = spark.sharedState.statusStore
+ val oldCount = statusStore.executionsList().size
+
+ val bytesWritten = new ArrayBuffer[Long]()
+ val recordsWritten = new ArrayBuffer[Long]()
+
+ val bytesWrittenListener = new SparkListener() {
+ override def onTaskEnd(taskEnd: SparkListenerTaskEnd): Unit = {
+ bytesWritten += taskEnd.taskMetrics.outputMetrics.bytesWritten
+ recordsWritten += taskEnd.taskMetrics.outputMetrics.recordsWritten
+ }
+ }
+ spark.sparkContext.addSparkListener(bytesWrittenListener)
+
+ try {
+ val cls = classOf[CustomMetricsDataSource].getName
+ spark.range(0, 10, 1, 2).select('id as 'i, -'id as 'j).write.format(cls)
+ .option("path", dir.getCanonicalPath).mode("append").save()
+
+ // Wait until the new execution is started and being tracked.
+ eventually(timeout(10.seconds), interval(10.milliseconds)) {
+ assert(statusStore.executionsCount() >= oldCount)
Review comment:
```suggestion
assert(statusStore.executionsCount() > oldCount)
```
--
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
[GitHub] [spark] viirya closed pull request #35028: [SPARK-37578][SQL] Update task metrics from ds v2 custom metrics
Posted by GitBox <gi...@apache.org>.
viirya closed pull request #35028:
URL: https://github.com/apache/spark/pull/35028
--
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
[GitHub] [spark] dongjoon-hyun commented on pull request #35028: [SPARK-37578][SQL] Update task metrics from ds v2 custom metrics
Posted by GitBox <gi...@apache.org>.
dongjoon-hyun commented on pull request #35028:
URL: https://github.com/apache/spark/pull/35028#issuecomment-1002412145
You can ignore Python linter error~
--
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
[GitHub] [spark] cloud-fan commented on a change in pull request #35028: [SPARK-37578][SQL] Update task metrics from ds v2 custom metrics
Posted by GitBox <gi...@apache.org>.
cloud-fan commented on a change in pull request #35028:
URL: https://github.com/apache/spark/pull/35028#discussion_r775719947
##########
File path: sql/core/src/test/scala/org/apache/spark/sql/execution/ui/SQLAppStatusListenerSuite.scala
##########
@@ -900,6 +900,46 @@ class SQLAppStatusListenerSuite extends SharedSparkSession with JsonTestUtils
assert(innerMetric.isDefined)
}
}
+
+ test("SPARK-37578: Update output metrics from Datasource v2") {
+ withTempDir { dir =>
+ val statusStore = spark.sharedState.statusStore
+ val oldCount = statusStore.executionsList().size
Review comment:
is this different from `statusStore.executionsCount()`?
--
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
[GitHub] [spark] viirya commented on pull request #35028: [SPARK-37578][SQL] Update task metrics from ds v2 custom metrics
Posted by GitBox <gi...@apache.org>.
viirya commented on pull request #35028:
URL: https://github.com/apache/spark/pull/35028#issuecomment-1002412561
Yea, thanks @dongjoon-hyun @cloud-fan . Merging to master.
--
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
[GitHub] [spark] dongjoon-hyun commented on a change in pull request #35028: [SPARK-37578][SQL] Update task metrics from ds v2 custom metrics
Posted by GitBox <gi...@apache.org>.
dongjoon-hyun commented on a change in pull request #35028:
URL: https://github.com/apache/spark/pull/35028#discussion_r775659991
##########
File path: sql/core/src/main/scala/org/apache/spark/sql/execution/metric/CustomMetrics.scala
##########
@@ -52,7 +55,18 @@ object CustomMetrics {
currentMetricsValues: Seq[CustomTaskMetric],
customMetrics: Map[String, SQLMetric]): Unit = {
currentMetricsValues.foreach { metric =>
- customMetrics.get(metric.name()).map(_.set(metric.value()))
+ val metricName = metric.name()
+ val metricValue = metric.value()
+ customMetrics.get(metricName).map(_.set(metricValue))
+
+ if (builtInOutputMetrics.contains(metricName)) {
+ Option(TaskContext.get()).map(_.taskMetrics().outputMetrics).foreach { outputMetrics =>
+ metricName match {
+ case "bytesWritten" => outputMetrics.setBytesWritten(metricValue)
+ case "recordsWritten" => outputMetrics.setRecordsWritten(metricValue)
Review comment:
It will break Scala 2.13. We need to handle all cases exhaustively from Scala 2.13+. Could you add the default case?
--
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
[GitHub] [spark] dongjoon-hyun commented on a change in pull request #35028: [SPARK-37578][SQL] Update task metrics from ds v2 custom metrics
Posted by GitBox <gi...@apache.org>.
dongjoon-hyun commented on a change in pull request #35028:
URL: https://github.com/apache/spark/pull/35028#discussion_r775660374
##########
File path: sql/core/src/main/scala/org/apache/spark/sql/execution/metric/CustomMetrics.scala
##########
@@ -17,13 +17,16 @@
package org.apache.spark.sql.execution.metric
+import org.apache.spark.TaskContext
import org.apache.spark.sql.connector.metric.{CustomMetric, CustomTaskMetric}
object CustomMetrics {
private[spark] val V2_CUSTOM = "v2Custom"
private[spark] val NUM_ROWS_PER_UPDATE = 100
+ private[spark] val builtInOutputMetrics = Set("bytesWritten", "recordsWritten")
Review comment:
`builtInOutputMetrics` -> `BUILTIN_OUTPUT_METRICS`?
--
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
[GitHub] [spark] viirya commented on pull request #35028: [SPARK-37578][SQL] Update task metrics from ds v2 custom metrics
Posted by GitBox <gi...@apache.org>.
viirya commented on pull request #35028:
URL: https://github.com/apache/spark/pull/35028#issuecomment-1002357614
@cloud-fan Thanks. Any more comments?
--
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
[GitHub] [spark] dongjoon-hyun commented on a change in pull request #35028: [SPARK-37578][SQL] Update task metrics from ds v2 custom metrics
Posted by GitBox <gi...@apache.org>.
dongjoon-hyun commented on a change in pull request #35028:
URL: https://github.com/apache/spark/pull/35028#discussion_r775659991
##########
File path: sql/core/src/main/scala/org/apache/spark/sql/execution/metric/CustomMetrics.scala
##########
@@ -52,7 +55,18 @@ object CustomMetrics {
currentMetricsValues: Seq[CustomTaskMetric],
customMetrics: Map[String, SQLMetric]): Unit = {
currentMetricsValues.foreach { metric =>
- customMetrics.get(metric.name()).map(_.set(metric.value()))
+ val metricName = metric.name()
+ val metricValue = metric.value()
+ customMetrics.get(metricName).map(_.set(metricValue))
+
+ if (builtInOutputMetrics.contains(metricName)) {
+ Option(TaskContext.get()).map(_.taskMetrics().outputMetrics).foreach { outputMetrics =>
+ metricName match {
+ case "bytesWritten" => outputMetrics.setBytesWritten(metricValue)
+ case "recordsWritten" => outputMetrics.setRecordsWritten(metricValue)
Review comment:
Could you add the default `no-op` case?
--
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
[GitHub] [spark] viirya commented on a change in pull request #35028: [SPARK-37578][SQL] Update task metrics from ds v2 custom metrics
Posted by GitBox <gi...@apache.org>.
viirya commented on a change in pull request #35028:
URL: https://github.com/apache/spark/pull/35028#discussion_r775720527
##########
File path: sql/core/src/test/scala/org/apache/spark/sql/execution/ui/SQLAppStatusListenerSuite.scala
##########
@@ -900,6 +900,46 @@ class SQLAppStatusListenerSuite extends SharedSparkSession with JsonTestUtils
assert(innerMetric.isDefined)
}
}
+
+ test("SPARK-37578: Update output metrics from Datasource v2") {
+ withTempDir { dir =>
+ val statusStore = spark.sharedState.statusStore
+ val oldCount = statusStore.executionsList().size
Review comment:
It is the same, I think.
--
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
[GitHub] [spark] viirya commented on pull request #35028: [SPARK-37578][SQL] Update task metrics from ds v2 custom metrics
Posted by GitBox <gi...@apache.org>.
viirya commented on pull request #35028:
URL: https://github.com/apache/spark/pull/35028#issuecomment-1001697262
cc @cloud-fan
--
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
[GitHub] [spark] viirya commented on pull request #35028: [SPARK-37578][SQL] Update task metrics from ds v2 custom metrics
Posted by GitBox <gi...@apache.org>.
viirya commented on pull request #35028:
URL: https://github.com/apache/spark/pull/35028#issuecomment-1002411719
All tests in GA are passed. It only failed on Python lint check.
--
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