tszerszen commented on a change in pull request #13743:
URL: https://github.com/apache/beam/pull/13743#discussion_r563316167
##########
File path:
runners/spark/src/main/java/org/apache/beam/runners/spark/SparkPipelineRunner.java
##########
@@ -213,6 +299,118 @@ public PortablePipelineResult run(RunnerApi.Pipeline
pipeline, JobInfo jobInfo)
result);
metricsPusher.start();
+ if (eventLoggingListener != null) {
+ HashMap<String, String> driverLogs = new HashMap<String, String>();
+ MetricResults metricResults = result.metrics();
+ for (MetricResult<DistributionResult> distributionResultMetricResult :
Review comment:
Thank you, they were add in the last commit.
##########
File path:
runners/spark/src/main/java/org/apache/beam/runners/spark/SparkPipelineOptions.java
##########
@@ -34,6 +34,12 @@
*/
public interface SparkPipelineOptions extends SparkCommonPipelineOptions {
+ @Description("The directory to save Spark History Server logs")
+ @Default.String("/tmp/spark-events/")
Review comment:
Ok, I've done it.
##########
File path:
runners/spark/src/main/java/org/apache/beam/runners/spark/SparkPipelineRunner.java
##########
@@ -123,10 +140,79 @@ public PortablePipelineResult run(RunnerApi.Pipeline
pipeline, JobInfo jobInfo)
"Will stage {} files. (Enable logging at DEBUG level to see which
files will be staged.)",
pipelineOptions.getFilesToStage().size());
LOG.debug("Staging files: {}", pipelineOptions.getFilesToStage());
-
PortablePipelineResult result;
final JavaSparkContext jsc =
SparkContextFactory.getSparkContext(pipelineOptions);
+ EventLoggingListener eventLoggingListener;
+ String jobId = jobInfo.jobId();
+ String jobName = jobInfo.jobName();
+ Long startTime = jsc.startTime();
+ String sparkUser = jsc.sparkUser();
+ String sparkMaster = "";
+ String sparkExecutorID = "";
+ Tuple2<String, String>[] sparkConfList = jsc.getConf().getAll();
+ for (Tuple2<String, String> sparkConf : sparkConfList) {
+ if (sparkConf._1().equals("spark.master")) {
+ sparkMaster = sparkConf._2();
+ } else if (sparkConf._1().equals("spark.executor.id")) {
+ sparkExecutorID = sparkConf._2();
+ }
+ }
+ try {
+ URI eventLogDirectory = new URI(pipelineOptions.getSparkHistoryDir());
+ File eventLogDirectoryFile = new File(eventLogDirectory.getPath());
+ if (eventLogDirectoryFile.exists() &&
eventLogDirectoryFile.isDirectory()) {
+ eventLoggingListener =
+ new EventLoggingListener(
+ jobId,
+ new scala.Option<String>() {
+ @Override
+ public boolean isEmpty() {
+ return false;
+ }
+
+ @Override
+ public String get() {
+ return jobName;
+ }
+
+ @Override
+ public Object productElement(int i) {
+ return null;
+ }
+
+ @Override
+ public int productArity() {
+ return 0;
+ }
+
+ @Override
+ public boolean canEqual(Object o) {
+ return false;
+ }
+ },
+ eventLogDirectory,
+ jsc.getConf(),
+ jsc.hadoopConfiguration());
+ } else {
+ eventLoggingListener = null;
+ }
+ } catch (URISyntaxException e) {
+ e.printStackTrace();
+ eventLoggingListener = null;
+ }
+ if (eventLoggingListener != null) {
Review comment:
Ok, the code will throw an exception if eventLogEnabled is true.
##########
File path:
runners/spark/src/main/java/org/apache/beam/runners/spark/SparkPipelineRunner.java
##########
@@ -123,10 +140,79 @@ public PortablePipelineResult run(RunnerApi.Pipeline
pipeline, JobInfo jobInfo)
"Will stage {} files. (Enable logging at DEBUG level to see which
files will be staged.)",
pipelineOptions.getFilesToStage().size());
LOG.debug("Staging files: {}", pipelineOptions.getFilesToStage());
-
PortablePipelineResult result;
final JavaSparkContext jsc =
SparkContextFactory.getSparkContext(pipelineOptions);
+ EventLoggingListener eventLoggingListener;
+ String jobId = jobInfo.jobId();
+ String jobName = jobInfo.jobName();
+ Long startTime = jsc.startTime();
Review comment:
I'll change it to Instant.now().getMillis()
##########
File path:
runners/spark/src/main/java/org/apache/beam/runners/spark/SparkPipelineRunner.java
##########
@@ -123,10 +140,79 @@ public PortablePipelineResult run(RunnerApi.Pipeline
pipeline, JobInfo jobInfo)
"Will stage {} files. (Enable logging at DEBUG level to see which
files will be staged.)",
pipelineOptions.getFilesToStage().size());
LOG.debug("Staging files: {}", pipelineOptions.getFilesToStage());
-
PortablePipelineResult result;
final JavaSparkContext jsc =
SparkContextFactory.getSparkContext(pipelineOptions);
+ EventLoggingListener eventLoggingListener;
+ String jobId = jobInfo.jobId();
+ String jobName = jobInfo.jobName();
+ Long startTime = jsc.startTime();
Review comment:
I'll change it to `Instant.now().getMillis()`
##########
File path:
runners/spark/src/main/java/org/apache/beam/runners/spark/SparkPipelineOptions.java
##########
@@ -34,6 +34,12 @@
*/
public interface SparkPipelineOptions extends SparkCommonPipelineOptions {
+ @Description("The directory to save Spark History Server logs")
+ @Default.String("/tmp/spark-events/")
Review comment:
It doesn't matter, however for consistency I think it would be good to
configure it in such a way.
##########
File path:
runners/spark/src/main/java/org/apache/beam/runners/spark/SparkPipelineRunner.java
##########
@@ -123,10 +140,79 @@ public PortablePipelineResult run(RunnerApi.Pipeline
pipeline, JobInfo jobInfo)
"Will stage {} files. (Enable logging at DEBUG level to see which
files will be staged.)",
pipelineOptions.getFilesToStage().size());
LOG.debug("Staging files: {}", pipelineOptions.getFilesToStage());
-
PortablePipelineResult result;
final JavaSparkContext jsc =
SparkContextFactory.getSparkContext(pipelineOptions);
+ EventLoggingListener eventLoggingListener;
+ String jobId = jobInfo.jobId();
+ String jobName = jobInfo.jobName();
+ Long startTime = jsc.startTime();
+ String sparkUser = jsc.sparkUser();
+ String sparkMaster = "";
+ String sparkExecutorID = "";
+ Tuple2<String, String>[] sparkConfList = jsc.getConf().getAll();
+ for (Tuple2<String, String> sparkConf : sparkConfList) {
+ if (sparkConf._1().equals("spark.master")) {
+ sparkMaster = sparkConf._2();
+ } else if (sparkConf._1().equals("spark.executor.id")) {
+ sparkExecutorID = sparkConf._2();
Review comment:
For now I don't know, do you have an idea? Or could you refer someone
who could help?
##########
File path:
runners/spark/src/main/java/org/apache/beam/runners/spark/SparkPipelineRunner.java
##########
@@ -123,10 +140,79 @@ public PortablePipelineResult run(RunnerApi.Pipeline
pipeline, JobInfo jobInfo)
"Will stage {} files. (Enable logging at DEBUG level to see which
files will be staged.)",
pipelineOptions.getFilesToStage().size());
LOG.debug("Staging files: {}", pipelineOptions.getFilesToStage());
-
PortablePipelineResult result;
final JavaSparkContext jsc =
SparkContextFactory.getSparkContext(pipelineOptions);
+ EventLoggingListener eventLoggingListener;
+ String jobId = jobInfo.jobId();
+ String jobName = jobInfo.jobName();
+ Long startTime = jsc.startTime();
+ String sparkUser = jsc.sparkUser();
+ String sparkMaster = "";
+ String sparkExecutorID = "";
+ Tuple2<String, String>[] sparkConfList = jsc.getConf().getAll();
+ for (Tuple2<String, String> sparkConf : sparkConfList) {
+ if (sparkConf._1().equals("spark.master")) {
+ sparkMaster = sparkConf._2();
+ } else if (sparkConf._1().equals("spark.executor.id")) {
+ sparkExecutorID = sparkConf._2();
+ }
+ }
+ try {
+ URI eventLogDirectory = new URI(pipelineOptions.getSparkHistoryDir());
+ File eventLogDirectoryFile = new File(eventLogDirectory.getPath());
+ if (eventLogDirectoryFile.exists() &&
eventLogDirectoryFile.isDirectory()) {
+ eventLoggingListener =
+ new EventLoggingListener(
+ jobId,
+ new scala.Option<String>() {
Review comment:
I have an error `Cannot inherit from final scala.Some` when I use
scala.Some instead of an scala.Option.
##########
File path: runners/spark/job-server/build.gradle
##########
@@ -73,6 +73,8 @@ runShadow {
args +=
["--clean-artifacts-per-job=${project.property('cleanArtifactsPerJob')}"]
if (project.hasProperty('sparkMasterUrl'))
args += ["--spark-master-url=${project.property('sparkMasterUrl')}"]
+ if (project.hasProperty('sparkHistoryDir'))
Review comment:
Pipeline options are coded across all SDKs, therefore two extra options
require to change pipeline options in Python SDK, Java SDK, Go SDK. My
proposition is to keep it that way, and change every SDKs pipeline options
gradually in other smaller PRs. Could we do it in such a way or do you insist
on doing all these changes here in this PR?
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
[email protected]
