[SPARK-41244][UI] Introducing a Protobuf serializer for UI data on KV store #38779
There are no files selected for viewing
This file contains hidden or 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 file contains hidden or 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 file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -532,7 +532,12 @@ | |
| <groupId>org.apache.commons</groupId> | ||
| <artifactId>commons-crypto</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>com.google.protobuf</groupId> | ||
| <artifactId>protobuf-java</artifactId> | ||
| <version>${protobuf.version}</version> | ||
| <scope>compile</scope> | ||
| </dependency> | ||
| </dependencies> | ||
| <build> | ||
| <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory> | ||
|
|
@@ -616,6 +621,48 @@ | |
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
|
Contributor
There was a problem hiding this comment. SPARK-40593 and SPARK-41215 do some work to support Spark 3.4 to be compiled on CentOS6&7. I think the core module needs similar work, but may not be in this pr
Contributor
There was a problem hiding this comment. @WolverineJiang Are you interested in solving this problem after PR merge? Just like what you did in SPARK-41215 There was a problem hiding this comment.
More than willing, I'll start in a few days. |
||
| <artifactId>maven-shade-plugin</artifactId> | ||
|
Contributor
There was a problem hiding this comment. @gengliangwang It actually conflicts with parent pom.xml which causes the jetty can not be shaded into spark-core. The current master branch can not start Spark UI, see error message:
Member
Author
There was a problem hiding this comment. @ulysses-you Thanks for reporting it. Do you know how to fix it?
Contributor
There was a problem hiding this comment. maybe should add
Member
There was a problem hiding this comment. Ya, I also saw this when I build distributions. Thank you, @pan3793 ! |
||
| <configuration> | ||
| <shadedArtifactAttached>false</shadedArtifactAttached> | ||
| <shadeTestJar>true</shadeTestJar> | ||
| <artifactSet> | ||
| <includes> | ||
| <include>com.google.protobuf:*</include> | ||
| </includes> | ||
| </artifactSet> | ||
| <relocations> | ||
| <relocation> | ||
| <pattern>com.google.protobuf</pattern> | ||
| <shadedPattern>${spark.shade.packageName}.spark-core.protobuf</shadedPattern> | ||
| <includes> | ||
| <include>com.google.protobuf.**</include> | ||
| </includes> | ||
| </relocation> | ||
| </relocations> | ||
| </configuration> | ||
| </plugin> | ||
| <plugin> | ||
| <groupId>com.github.os72</groupId> | ||
| <artifactId>protoc-jar-maven-plugin</artifactId> | ||
| <version>${protoc-jar-maven-plugin.version}</version> | ||
| <executions> | ||
| <execution> | ||
| <phase>generate-sources</phase> | ||
| <goals> | ||
| <goal>run</goal> | ||
| </goals> | ||
| <configuration> | ||
| <protocArtifact>com.google.protobuf:protoc:${protobuf.version}</protocArtifact> | ||
| <protocVersion>${protobuf.version}</protocVersion> | ||
| <inputDirectories> | ||
| <include>src/main/protobuf</include> | ||
| </inputDirectories> | ||
| </configuration> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
|
|
||
|
|
||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| /* | ||
| * 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. | ||
| */ | ||
|
|
||
| syntax = "proto3"; | ||
| package org.apache.spark.status.protobuf; | ||
|
|
||
| enum JobExecutionStatus { | ||
| UNSPECIFIED = 0; | ||
| RUNNING = 1; | ||
| SUCCEEDED = 2; | ||
| FAILED = 3; | ||
| UNKNOWN = 4; | ||
| } | ||
|
|
||
| message JobData { | ||
| // All IDs are int64 for extendability, even when they are currently int32 in Spark. | ||
| int64 job_id = 1; | ||
| string name = 2; | ||
| optional string description = 3; | ||
| optional int64 submission_time = 4; | ||
| optional int64 completion_time = 5; | ||
| repeated int64 stage_ids = 6; | ||
| optional string job_group = 7; | ||
| JobExecutionStatus status = 8; | ||
| int32 num_tasks = 9; | ||
| int32 num_active_tasks = 10; | ||
| int32 num_completed_tasks = 11; | ||
| int32 num_skipped_tasks = 12; | ||
| int32 num_failed_tasks = 13; | ||
| int32 num_killed_tasks = 14; | ||
| int32 num_completed_indices = 15; | ||
| int32 num_active_stages = 16; | ||
| int32 num_completed_stages = 17; | ||
| int32 num_skipped_stages = 18; | ||
| int32 num_failed_stages = 19; | ||
| map<string, int32> kill_tasks_summary = 20; | ||
| } | ||
|
|
||
| message JobDataWrapper { | ||
| JobData info = 1; | ||
| repeated int32 skipped_stages = 2; | ||
| optional int64 sql_execution_id = 3; | ||
| } |
This file contains hidden or 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 file contains hidden or 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 file contains hidden or 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 file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| /* | ||
| * 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.status.protobuf | ||
|
|
||
| import collection.JavaConverters._ | ||
| import java.util.Date | ||
|
|
||
| import org.apache.spark.JobExecutionStatus | ||
| import org.apache.spark.status.JobDataWrapper | ||
| import org.apache.spark.status.api.v1.JobData | ||
|
|
||
| object JobDataWrapperSerializer { | ||
| def serialize(j: JobDataWrapper): Array[Byte] = { | ||
| val jobData = serializeJobData(j.info) | ||
| val builder = StoreTypes.JobDataWrapper.newBuilder() | ||
|
Contributor
There was a problem hiding this comment. Where can we find
Member
Author
There was a problem hiding this comment. It is generated during compile time. It should be under |
||
| builder.setInfo(jobData) | ||
| j.skippedStages.foreach(builder.addSkippedStages) | ||
| j.sqlExecutionId.foreach(builder.setSqlExecutionId) | ||
| builder.build().toByteArray | ||
| } | ||
|
|
||
| def deserialize(bytes: Array[Byte]): JobDataWrapper = { | ||
| val wrapper = StoreTypes.JobDataWrapper.parseFrom(bytes) | ||
| val sqlExecutionId = getOptional(wrapper.hasSqlExecutionId, wrapper.getSqlExecutionId) | ||
| new JobDataWrapper( | ||
| deserializeJobData(wrapper.getInfo), | ||
| wrapper.getSkippedStagesList.asScala.map(_.toInt).toSet, | ||
| sqlExecutionId | ||
| ) | ||
| } | ||
|
|
||
| private def getOptional[T](condition: Boolean, result: () => T): Option[T] = if (condition) { | ||
| Some(result()) | ||
| } else { | ||
| None | ||
| } | ||
|
|
||
| private def serializeJobData(jobData: JobData): StoreTypes.JobData = { | ||
| val jobDataBuilder = StoreTypes.JobData.newBuilder() | ||
| jobDataBuilder.setJobId(jobData.jobId.toLong) | ||
| .setName(jobData.name) | ||
| .setStatus(serializeJobExecutionStatus(jobData.status)) | ||
| .setNumTasks(jobData.numTasks) | ||
| .setNumActiveTasks(jobData.numActiveTasks) | ||
| .setNumCompletedTasks(jobData.numCompletedTasks) | ||
| .setNumSkippedTasks(jobData.numSkippedTasks) | ||
| .setNumFailedTasks(jobData.numFailedTasks) | ||
| .setNumKilledTasks(jobData.numKilledTasks) | ||
| .setNumCompletedIndices(jobData.numCompletedIndices) | ||
| .setNumActiveStages(jobData.numActiveStages) | ||
| .setNumCompletedStages(jobData.numCompletedStages) | ||
| .setNumSkippedStages(jobData.numSkippedStages) | ||
| .setNumFailedStages(jobData.numFailedStages) | ||
|
|
||
| jobData.description.foreach(jobDataBuilder.setDescription) | ||
| jobData.submissionTime.foreach { d => | ||
| jobDataBuilder.setSubmissionTime(d.getTime) | ||
| } | ||
| jobData.completionTime.foreach { d => | ||
| jobDataBuilder.setCompletionTime(d.getTime) | ||
| } | ||
| jobData.stageIds.foreach(id => jobDataBuilder.addStageIds(id.toLong)) | ||
| jobData.jobGroup.foreach(jobDataBuilder.setJobGroup) | ||
| jobData.killedTasksSummary.foreach { entry => | ||
| jobDataBuilder.putKillTasksSummary(entry._1, entry._2) | ||
| } | ||
| jobDataBuilder.build() | ||
| } | ||
|
|
||
| private def deserializeJobData(info: StoreTypes.JobData): JobData = { | ||
| val description = getOptional(info.hasDescription, info.getDescription) | ||
| val submissionTime = | ||
| getOptional(info.hasSubmissionTime, () => new Date(info.getSubmissionTime)) | ||
| val completionTime = getOptional(info.hasCompletionTime, () => new Date(info.getCompletionTime)) | ||
| val jobGroup = getOptional(info.hasJobGroup, info.getJobGroup) | ||
| val status = JobExecutionStatus.valueOf(info.getStatus.toString) | ||
|
|
||
| new JobData( | ||
| jobId = info.getJobId.toInt, | ||
| name = info.getName, | ||
| description = description, | ||
| submissionTime = submissionTime, | ||
| completionTime = completionTime, | ||
| stageIds = info.getStageIdsList.asScala.map(_.toInt).toSeq, | ||
| jobGroup = jobGroup, | ||
| status = status, | ||
| numTasks = info.getNumTasks, | ||
| numActiveTasks = info.getNumActiveTasks, | ||
| numCompletedTasks = info.getNumCompletedTasks, | ||
| numSkippedTasks = info.getNumSkippedTasks, | ||
| numFailedTasks = info.getNumFailedTasks, | ||
| numKilledTasks = info.getNumKilledTasks, | ||
| numCompletedIndices = info.getNumCompletedIndices, | ||
| numActiveStages = info.getNumActiveStages, | ||
| numCompletedStages = info.getNumCompletedStages, | ||
| numSkippedStages = info.getNumSkippedStages, | ||
| numFailedStages = info.getNumFailedStages, | ||
| killedTasksSummary = info.getKillTasksSummaryMap.asScala.mapValues(_.toInt).toMap) | ||
| } | ||
|
|
||
| private def serializeJobExecutionStatus(j: JobExecutionStatus): StoreTypes.JobExecutionStatus = { | ||
| StoreTypes.JobExecutionStatus.valueOf(j.toString) | ||
| } | ||
| } | ||
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.