You are viewing a plain text version of this content. The canonical link for it is here.
Posted to github@beam.apache.org by GitBox <gi...@apache.org> on 2021/10/18 19:14:30 UTC
[GitHub] [beam] daria-malkova opened a new pull request #15744: [BEAM-13072] Executor builder
daria-malkova opened a new pull request #15744:
URL: https://github.com/apache/beam/pull/15744
[BEAM-13072] Improving executors architecture by implementing Builder pattern for flexible creation of executor object.
------------------------
Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:
- [ ] [**Choose reviewer(s)**](https://beam.apache.org/contribute/#make-your-change) and mention them in a comment (`R: @username`).
- [ ] Format the pull request title like `[BEAM-XXX] Fixes bug in ApproximateQuantiles`, where you replace `BEAM-XXX` with the appropriate JIRA issue, if applicable. This will automatically link the pull request to the issue.
- [ ] Update `CHANGES.md` with noteworthy changes.
- [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf).
See the [Contributor Guide](https://beam.apache.org/contribute) for more tips on [how to make review process smoother](https://beam.apache.org/contribute/#make-reviewers-job-easier).
`ValidatesRunner` compliance status (on master branch)
--------------------------------------------------------
<table>
<thead>
<tr>
<th>Lang</th>
<th>ULR</th>
<th>Dataflow</th>
<th>Flink</th>
<th>Samza</th>
<th>Spark</th>
<th>Twister2</th>
</tr>
</thead>
<tbody>
<tr>
<td>Go</td>
<td>---</td>
<td>
<a href="https://ci-beam.apache.org/job/beam_PostCommit_Go/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PostCommit_Go/lastCompletedBuild/badge/icon">
</a>
<td>
<a href="https://ci-beam.apache.org/job/beam_PostCommit_Go_VR_Flink/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PostCommit_Go_VR_Flink/lastCompletedBuild/badge/icon">
</a>
</td>
<td>
<a href="https://ci-beam.apache.org/job/beam_PostCommit_Go_VR_Samza/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PostCommit_Go_VR_Samza/lastCompletedBuild/badge/icon">
</a>
</td>
<td>
<a href="https://ci-beam.apache.org/job/beam_PostCommit_Go_VR_Spark/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PostCommit_Go_VR_Spark/lastCompletedBuild/badge/icon">
</a>
</td>
<td>---</td>
</tr>
<tr>
<td>Java</td>
<td>
<a href="https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_ULR/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_ULR/lastCompletedBuild/badge/icon">
</a>
</td>
<td>
<a href="https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Dataflow/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Dataflow/lastCompletedBuild/badge/icon?subject=V1">
</a><br>
<a href="https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Dataflow_Streaming/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Dataflow_Streaming/lastCompletedBuild/badge/icon?subject=V1+Streaming">
</a><br>
<a href="https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Dataflow_Java11/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Dataflow_Java11/lastCompletedBuild/badge/icon?subject=V1+Java+11">
</a><br>
<a href="https://ci-beam.apache.org/job/beam_PostCommit_Java_VR_Dataflow_V2/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PostCommit_Java_VR_Dataflow_V2/lastCompletedBuild/badge/icon?subject=V2">
</a><br>
<a href="https://ci-beam.apache.org/job/beam_PostCommit_Java_VR_Dataflow_V2_Streaming/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PostCommit_Java_VR_Dataflow_V2_Streaming/lastCompletedBuild/badge/icon?subject=V2+Streaming">
</a><br>
</td>
<td>
<a href="https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Flink/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Flink/lastCompletedBuild/badge/icon?subject=Java+8">
</a><br>
<a href="https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Flink_Java11/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Flink_Java11/lastCompletedBuild/badge/icon?subject=Java+11">
</a><br>
<a href="https://ci-beam.apache.org/job/beam_PostCommit_Java_PVR_Flink_Batch/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PostCommit_Java_PVR_Flink_Batch/lastCompletedBuild/badge/icon?subject=Portable">
</a><br>
<a href="https://ci-beam.apache.org/job/beam_PostCommit_Java_PVR_Flink_Streaming/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PostCommit_Java_PVR_Flink_Streaming/lastCompletedBuild/badge/icon?subject=Portable+Streaming">
</a>
</td>
<td>
<a href="https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Samza/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Samza/lastCompletedBuild/badge/icon">
</a><br>
<a href="https://ci-beam.apache.org/job/beam_PostCommit_Java_PVR_Samza/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PostCommit_Java_PVR_Samza/lastCompletedBuild/badge/icon?subject=Portable">
</a>
</td>
<td>
<a href="https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Spark/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Spark/lastCompletedBuild/badge/icon">
</a><br>
<a href="https://ci-beam.apache.org/job/beam_PostCommit_Java_PVR_Spark_Batch/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PostCommit_Java_PVR_Spark_Batch/lastCompletedBuild/badge/icon?subject=Portable">
</a><br>
<a href="https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_SparkStructuredStreaming/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_SparkStructuredStreaming/lastCompletedBuild/badge/icon?subject=Structured+Streaming">
</a>
</td>
<td>
<a href="https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Twister2/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PostCommit_Java_ValidatesRunner_Twister2/lastCompletedBuild/badge/icon">
</a>
</td>
</tr>
<tr>
<td>Python</td>
<td>---</td>
<td>
<a href="https://ci-beam.apache.org/job/beam_PostCommit_Py_VR_Dataflow/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PostCommit_Py_VR_Dataflow/lastCompletedBuild/badge/icon?subject=V1">
</a><br>
<a href="https://ci-beam.apache.org/job/beam_PostCommit_Py_VR_Dataflow_V2/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PostCommit_Py_VR_Dataflow_V2/lastCompletedBuild/badge/icon?subject=V2">
</a><br>
<a href="https://ci-beam.apache.org/job/beam_PostCommit_Py_ValCont/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PostCommit_Py_ValCont/lastCompletedBuild/badge/icon?subject=ValCont">
</a>
</td>
<td>
<a href="https://ci-beam.apache.org/job/beam_PreCommit_Python_PVR_Flink_Cron/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PreCommit_Python_PVR_Flink_Cron/lastCompletedBuild/badge/icon?subject=Portable">
</a><br>
<a href="https://ci-beam.apache.org/job/beam_PostCommit_Python_VR_Flink/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PostCommit_Python_VR_Flink/lastCompletedBuild/badge/icon">
</a>
</td>
<td>
<a href="https://ci-beam.apache.org/job/beam_PostCommit_Python_VR_Samza/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PostCommit_Python_VR_Samza/lastCompletedBuild/badge/icon">
</a>
</td>
<td>
<a href="https://ci-beam.apache.org/job/beam_PostCommit_Python_VR_Spark/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PostCommit_Python_VR_Spark/lastCompletedBuild/badge/icon">
</a>
</td>
<td>---</td>
</tr>
<tr>
<td>XLang</td>
<td>
<a href="https://ci-beam.apache.org/job/beam_PostCommit_XVR_Direct/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PostCommit_XVR_Direct/lastCompletedBuild/badge/icon">
</a>
</td>
<td>
<a href="https://ci-beam.apache.org/job/beam_PostCommit_XVR_Dataflow/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PostCommit_XVR_Dataflow/lastCompletedBuild/badge/icon">
</a>
</td>
<td>
<a href="https://ci-beam.apache.org/job/beam_PostCommit_XVR_Flink/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PostCommit_XVR_Flink/lastCompletedBuild/badge/icon">
</a>
</td>
<td>
<a href="https://ci-beam.apache.org/job/beam_PostCommit_XVR_Samza/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PostCommit_XVR_Samza/lastCompletedBuild/badge/icon">
</a>
</td>
<td>
<a href="https://ci-beam.apache.org/job/beam_PostCommit_XVR_Spark/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PostCommit_XVR_Spark/lastCompletedBuild/badge/icon">
</a>
</td>
<td>---</td>
</tr>
</tbody>
</table>
Examples testing status on various runners
--------------------------------------------------------
<table>
<thead>
<tr>
<th>Lang</th>
<th>ULR</th>
<th>Dataflow</th>
<th>Flink</th>
<th>Samza</th>
<th>Spark</th>
<th>Twister2</th>
</tr>
</thead>
<tbody>
<tr>
<td>Go</td>
<td>---</td>
<td>---</td>
<td>---</td>
<td>---</td>
<td>---</td>
<td>---</td>
<td>---</td>
</tr>
<tr>
<td>Java</td>
<td>---</td>
<td>
<a href="https://ci-beam.apache.org/job/beam_PreCommit_Java_Examples_Dataflow_Cron/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PreCommit_Java_Examples_Dataflow_Cron/lastCompletedBuild/badge/icon?subject=V1">
</a><br>
<a href="https://ci-beam.apache.org/job/beam_PreCommit_Java_Examples_Dataflow_Java11_Cron/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PreCommit_Java_Examples_Dataflow_Java11_Cron/lastCompletedBuild/badge/icon?subject=V1+Java11">
</a><br>
<a href="https://ci-beam.apache.org/job/beam_PostCommit_Java_Examples_Dataflow_V2/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PostCommit_Java_Examples_Dataflow_V2/lastCompletedBuild/badge/icon?subject=V2">
</a><br>
</td>
<td>---</td>
<td>---</td>
<td>---</td>
<td>---</td>
<td>---</td>
</tr>
<tr>
<td>Python</td>
<td>---</td>
<td>---</td>
<td>---</td>
<td>---</td>
<td>---</td>
<td>---</td>
<td>---</td>
</tr>
<tr>
<td>XLang</td>
<td>---</td>
<td>---</td>
<td>---</td>
<td>---</td>
<td>---</td>
<td>---</td>
<td>---</td>
</tr>
</tbody>
</table>
Post-Commit SDK/Transform Integration Tests Status (on master branch)
------------------------------------------------------------------------------------------------
<table>
<thead>
<tr>
<th>Go</th>
<th>Java</th>
<th>Python</th>
</tr>
</thead>
<tbody>
<tr>
<td>
<a href="https://ci-beam.apache.org/job/beam_PostCommit_Go/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PostCommit_Go/lastCompletedBuild/badge/icon">
</a>
</td>
<td>
<a href="https://ci-beam.apache.org/job/beam_PostCommit_Java/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PostCommit_Java/lastCompletedBuild/badge/icon">
</a>
</td>
<td>
<a href="https://ci-beam.apache.org/job/beam_PostCommit_Python36/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PostCommit_Python36/lastCompletedBuild/badge/icon?subject=3.6">
</a><br>
<a href="https://ci-beam.apache.org/job/beam_PostCommit_Python37/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PostCommit_Python37/lastCompletedBuild/badge/icon?subject=3.7">
</a><br>
<a href="https://ci-beam.apache.org/job/beam_PostCommit_Python38/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PostCommit_Python38/lastCompletedBuild/badge/icon?subject=3.8">
</a>
</td>
</tr>
</tbody>
</table>
Pre-Commit Tests Status (on master branch)
------------------------------------------------------------------------------------------------
<table>
<thead>
<tr>
<th>---</th>
<th>Java</th>
<th>Python</th>
<th>Go</th>
<th>Website</th>
<th>Whitespace</th>
<th>Typescript</th>
</tr>
</thead>
<tbody>
<tr>
<td>Non-portable</td>
<td>
<a href="https://ci-beam.apache.org/job/beam_PreCommit_Java_Cron/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PreCommit_Java_Cron/lastCompletedBuild/badge/icon">
</a><br>
</td>
<td>
<a href="https://ci-beam.apache.org/job/beam_PreCommit_Python_Cron/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PreCommit_Python_Cron/lastCompletedBuild/badge/icon?subject=Tests">
</a><br>
<a href="https://ci-beam.apache.org/job/beam_PreCommit_PythonLint_Cron/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PreCommit_PythonLint_Cron/lastCompletedBuild/badge/icon?subject=Lint">
</a><br>
<a href="https://ci-beam.apache.org/job/beam_PreCommit_PythonDocker_Cron/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PreCommit_PythonDocker_Cron/badge/icon?subject=Docker">
</a><br>
<a href="https://ci-beam.apache.org/job/beam_PreCommit_PythonDocs_Cron/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PreCommit_PythonDocs_Cron/badge/icon?subject=Docs">
</a>
</td>
<td>
<a href="https://ci-beam.apache.org/job/beam_PreCommit_Go_Cron/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PreCommit_Go_Cron/lastCompletedBuild/badge/icon">
</a>
</td>
<td>
<a href="https://ci-beam.apache.org/job/beam_PreCommit_Website_Cron/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PreCommit_Website_Cron/lastCompletedBuild/badge/icon">
</a>
</td>
<td>
<a href="https://ci-beam.apache.org/job/beam_PreCommit_Whitespace_Cron/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PreCommit_Whitespace_Cron/lastCompletedBuild/badge/icon">
</a>
</td>
<td>
<a href="https://ci-beam.apache.org/job/beam_PreCommit_Typescript_Cron/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PreCommit_Typescript_Cron/lastCompletedBuild/badge/icon">
</a>
</td>
</tr>
<tr>
<td>Portable</td>
<td>---</td>
<td>
<a href="https://ci-beam.apache.org/job/beam_PreCommit_Portable_Python_Cron/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PreCommit_Portable_Python_Cron/lastCompletedBuild/badge/icon">
</a>
</td>
<td>
<a href="https://ci-beam.apache.org/job/beam_PreCommit_GoPortable_Cron/lastCompletedBuild/">
<img alt="Build Status" src="https://ci-beam.apache.org/job/beam_PreCommit_GoPortable_Cron/lastCompletedBuild/badge/icon">
</a>
</td>
<td>---</td>
<td>---</td>
<td>---</td>
</tr>
</tbody>
</table>
See [.test-infra/jenkins/README](https://github.com/apache/beam/blob/master/.test-infra/jenkins/README.md) for trigger phrase, status and link of all Jenkins jobs.
GitHub Actions Tests Status (on master branch)
------------------------------------------------------------------------------------------------
[](https://github.com/apache/beam/actions?query=workflow%3A%22Build+python+source+distribution+and+wheels%22+branch%3Amaster+event%3Aschedule)
[](https://github.com/apache/beam/actions?query=workflow%3A%22Python+Tests%22+branch%3Amaster+event%3Aschedule)
[](https://github.com/apache/beam/actions?query=workflow%3A%22Java+Tests%22+branch%3Amaster+event%3Aschedule)
See [CI.md](https://github.com/apache/beam/blob/master/CI.md) for more information about GitHub Actions CI.
--
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: github-unsubscribe@beam.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] daria-malkova commented on a change in pull request #15744: [BEAM-13072][Playground] Executor builder
Posted by GitBox <gi...@apache.org>.
daria-malkova commented on a change in pull request #15744:
URL: https://github.com/apache/beam/pull/15744#discussion_r733146487
##########
File path: playground/backend/internal/environment/environment_service.go
##########
@@ -0,0 +1,134 @@
+// 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 environment
+
+import (
+ pb "beam.apache.org/playground/backend/internal/api"
+ "github.com/tkanos/gonfig"
+ "google.golang.org/grpc/grpclog"
+ "os"
+ "strconv"
+ "strings"
+)
+
+const (
+ serverIpKey = "SERVER_IP"
+ serverPortKey = "SERVER_PORT"
+ beamSdkKey = "BEAM_SDK"
+ beamRunner = "BEAM_RUNNER"
+ jdk = "JDK"
+ defaultIp = "localhost"
+ defaultPort = 8080
+ defaultSdk = pb.Sdk_SDK_JAVA
+ executorConfigFolder = "CONFIG_FOLDER"
+ defaultConfigFolder = "./"
+ defaultBeamSdk = "/opt/apache/beam/jars/beam-sdks-java-harness.jar"
+ defaultBeamRunner = "/opt/apache/beam/jars/beam-runners-direct.jar"
+ defaultJDK = "/opt/apache/beam/jars/slf4j-jdk14.jar"
+ jsonExt = ".json"
+)
+
+// Environment operates with environment structures: ServerEnvs, LogWriters, BeamEnvs
+type Environment struct {
+ ServerEnvs ServerEnvs
+ BeamSdkEnvs BeamEnvs
+}
+
+// NewEnvironment is a constructor for Environment.
+// Default values:
+// LogWriters: by default using os.Stdout
+// ServerEnvs: by default using defaultIp and defaultPort from constants
+// BeamEnvs: by default using pb.Sdk_SDK_JAVA
+func NewEnvironment() *Environment {
+ svc := Environment{}
+ svc.ServerEnvs = *getServerEnvsFromOsEnvs()
+ svc.BeamSdkEnvs = *getSdkEnvsFromOsEnvs()
+
+ return &svc
+}
+
+// getServerEnvsFromOsEnvs lookups in os environment variables and takes value for ip and port. If not exists - using default
+func getServerEnvsFromOsEnvs() *ServerEnvs {
+ port := defaultPort
+ ip := getEnv(serverIpKey, defaultIp)
+ if value, present := os.LookupEnv(serverPortKey); present {
+ if converted, err := strconv.Atoi(value); err == nil {
+ port = converted
+ } else {
+ grpclog.Errorf("couldn't convert provided port. Using default %s\n", defaultPort)
+ }
+ }
+ return NewServerEnvs(ip, port)
+}
+
+// getServerEnvsFromOsEnvs lookups in os environment variables and takes value for Apache Beam SDK. If not exists - using default
+func getSdkEnvsFromOsEnvs() *BeamEnvs {
+ sdk := pb.Sdk_SDK_UNSPECIFIED
+ if value, present := os.LookupEnv(beamSdkKey); present {
+
+ switch value {
+ case pb.Sdk_SDK_JAVA.String():
+ sdk = pb.Sdk_SDK_JAVA
+ case pb.Sdk_SDK_GO.String():
+ sdk = pb.Sdk_SDK_GO
+ case pb.Sdk_SDK_PYTHON.String():
+ sdk = pb.Sdk_SDK_PYTHON
+ case pb.Sdk_SDK_SCIO.String():
+ sdk = pb.Sdk_SDK_SCIO
+ }
+ }
+ if sdk == pb.Sdk_SDK_UNSPECIFIED {
+ grpclog.Infof("couldn't get sdk from %s os env, using default: %s", beamSdkKey, defaultSdk)
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: github-unsubscribe@beam.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] damondouglas commented on a change in pull request #15744: [BEAM-13072][Playground] Executor builder
Posted by GitBox <gi...@apache.org>.
damondouglas commented on a change in pull request #15744:
URL: https://github.com/apache/beam/pull/15744#discussion_r731945903
##########
File path: playground/backend/go.mod
##########
@@ -18,6 +18,8 @@ module beam.apache.org/playground/backend
go 1.16
require (
+ github.com/google/uuid v1.3.0
+ github.com/tkanos/gonfig v0.0.0-20210106201359-53e13348de2f
Review comment:
MIT License 👍🏼
--
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: github-unsubscribe@beam.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] pabloem commented on pull request #15744: [BEAM-13072][Playground] Executor builder
Posted by GitBox <gi...@apache.org>.
pabloem commented on pull request #15744:
URL: https://github.com/apache/beam/pull/15744#issuecomment-951188230
please resolve merge conflicts : )
--
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: github-unsubscribe@beam.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] damondouglas commented on a change in pull request #15744: [BEAM-13072][Playground] Executor builder
Posted by GitBox <gi...@apache.org>.
damondouglas commented on a change in pull request #15744:
URL: https://github.com/apache/beam/pull/15744#discussion_r731952297
##########
File path: playground/backend/internal/environment/environment_service.go
##########
@@ -0,0 +1,134 @@
+// 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 environment
+
+import (
+ pb "beam.apache.org/playground/backend/internal/api"
+ "github.com/tkanos/gonfig"
+ "google.golang.org/grpc/grpclog"
+ "os"
+ "strconv"
+ "strings"
+)
+
+const (
+ serverIpKey = "SERVER_IP"
+ serverPortKey = "SERVER_PORT"
+ beamSdkKey = "BEAM_SDK"
+ beamRunner = "BEAM_RUNNER"
+ jdk = "JDK"
+ defaultIp = "localhost"
+ defaultPort = 8080
+ defaultSdk = pb.Sdk_SDK_JAVA
+ executorConfigFolder = "CONFIG_FOLDER"
+ defaultConfigFolder = "./"
+ defaultBeamSdk = "/opt/apache/beam/jars/beam-sdks-java-harness.jar"
+ defaultBeamRunner = "/opt/apache/beam/jars/beam-runners-direct.jar"
+ defaultJDK = "/opt/apache/beam/jars/slf4j-jdk14.jar"
+ jsonExt = ".json"
+)
+
+// Environment operates with environment structures: ServerEnvs, LogWriters, BeamEnvs
+type Environment struct {
+ ServerEnvs ServerEnvs
+ BeamSdkEnvs BeamEnvs
+}
+
+// NewEnvironment is a constructor for Environment.
+// Default values:
+// LogWriters: by default using os.Stdout
+// ServerEnvs: by default using defaultIp and defaultPort from constants
+// BeamEnvs: by default using pb.Sdk_SDK_JAVA
+func NewEnvironment() *Environment {
+ svc := Environment{}
+ svc.ServerEnvs = *getServerEnvsFromOsEnvs()
+ svc.BeamSdkEnvs = *getSdkEnvsFromOsEnvs()
+
+ return &svc
+}
+
+// getServerEnvsFromOsEnvs lookups in os environment variables and takes value for ip and port. If not exists - using default
+func getServerEnvsFromOsEnvs() *ServerEnvs {
+ port := defaultPort
+ ip := getEnv(serverIpKey, defaultIp)
+ if value, present := os.LookupEnv(serverPortKey); present {
+ if converted, err := strconv.Atoi(value); err == nil {
+ port = converted
+ } else {
+ grpclog.Errorf("couldn't convert provided port. Using default %s\n", defaultPort)
+ }
+ }
+ return NewServerEnvs(ip, port)
+}
+
+// getServerEnvsFromOsEnvs lookups in os environment variables and takes value for Apache Beam SDK. If not exists - using default
+func getSdkEnvsFromOsEnvs() *BeamEnvs {
+ sdk := pb.Sdk_SDK_UNSPECIFIED
+ if value, present := os.LookupEnv(beamSdkKey); present {
+
+ switch value {
+ case pb.Sdk_SDK_JAVA.String():
+ sdk = pb.Sdk_SDK_JAVA
+ case pb.Sdk_SDK_GO.String():
+ sdk = pb.Sdk_SDK_GO
+ case pb.Sdk_SDK_PYTHON.String():
+ sdk = pb.Sdk_SDK_PYTHON
+ case pb.Sdk_SDK_SCIO.String():
+ sdk = pb.Sdk_SDK_SCIO
+ }
+ }
+ if sdk == pb.Sdk_SDK_UNSPECIFIED {
+ grpclog.Infof("couldn't get sdk from %s os env, using default: %s", beamSdkKey, defaultSdk)
Review comment:
May we consider returning an error instead?
##########
File path: playground/backend/internal/environment/environment_service.go
##########
@@ -0,0 +1,134 @@
+// 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 environment
+
+import (
+ pb "beam.apache.org/playground/backend/internal/api"
+ "github.com/tkanos/gonfig"
+ "google.golang.org/grpc/grpclog"
+ "os"
+ "strconv"
+ "strings"
+)
+
+const (
+ serverIpKey = "SERVER_IP"
+ serverPortKey = "SERVER_PORT"
+ beamSdkKey = "BEAM_SDK"
+ beamRunner = "BEAM_RUNNER"
+ jdk = "JDK"
+ defaultIp = "localhost"
+ defaultPort = 8080
+ defaultSdk = pb.Sdk_SDK_JAVA
+ executorConfigFolder = "CONFIG_FOLDER"
+ defaultConfigFolder = "./"
+ defaultBeamSdk = "/opt/apache/beam/jars/beam-sdks-java-harness.jar"
+ defaultBeamRunner = "/opt/apache/beam/jars/beam-runners-direct.jar"
+ defaultJDK = "/opt/apache/beam/jars/slf4j-jdk14.jar"
+ jsonExt = ".json"
+)
+
+// Environment operates with environment structures: ServerEnvs, LogWriters, BeamEnvs
+type Environment struct {
+ ServerEnvs ServerEnvs
+ BeamSdkEnvs BeamEnvs
+}
+
+// NewEnvironment is a constructor for Environment.
+// Default values:
+// LogWriters: by default using os.Stdout
+// ServerEnvs: by default using defaultIp and defaultPort from constants
+// BeamEnvs: by default using pb.Sdk_SDK_JAVA
+func NewEnvironment() *Environment {
+ svc := Environment{}
+ svc.ServerEnvs = *getServerEnvsFromOsEnvs()
+ svc.BeamSdkEnvs = *getSdkEnvsFromOsEnvs()
+
+ return &svc
+}
+
+// getServerEnvsFromOsEnvs lookups in os environment variables and takes value for ip and port. If not exists - using default
+func getServerEnvsFromOsEnvs() *ServerEnvs {
+ port := defaultPort
+ ip := getEnv(serverIpKey, defaultIp)
+ if value, present := os.LookupEnv(serverPortKey); present {
+ if converted, err := strconv.Atoi(value); err == nil {
+ port = converted
+ } else {
+ grpclog.Errorf("couldn't convert provided port. Using default %s\n", defaultPort)
+ }
+ }
+ return NewServerEnvs(ip, port)
+}
+
+// getServerEnvsFromOsEnvs lookups in os environment variables and takes value for Apache Beam SDK. If not exists - using default
+func getSdkEnvsFromOsEnvs() *BeamEnvs {
+ sdk := pb.Sdk_SDK_UNSPECIFIED
+ if value, present := os.LookupEnv(beamSdkKey); present {
+
+ switch value {
+ case pb.Sdk_SDK_JAVA.String():
+ sdk = pb.Sdk_SDK_JAVA
+ case pb.Sdk_SDK_GO.String():
+ sdk = pb.Sdk_SDK_GO
+ case pb.Sdk_SDK_PYTHON.String():
+ sdk = pb.Sdk_SDK_PYTHON
+ case pb.Sdk_SDK_SCIO.String():
+ sdk = pb.Sdk_SDK_SCIO
+ }
+ }
+ if sdk == pb.Sdk_SDK_UNSPECIFIED {
+ grpclog.Infof("couldn't get sdk from %s os env, using default: %s", beamSdkKey, defaultSdk)
+ sdk = defaultSdk
+ }
+ executorConfig := readExecutorConfig(sdk)
+ return NewBeamEnvs(sdk, executorConfig)
+}
+
+func readExecutorConfig(apacheBeamSdk pb.Sdk) *ExecutorConfig {
+ executorConfig, _ := getConfigFromJson(apacheBeamSdk)
+ switch apacheBeamSdk {
+ case pb.Sdk_SDK_JAVA:
+ executorConfig.CompileArgs = append(executorConfig.CompileArgs,
+ getEnv(beamSdkKey, defaultBeamSdk))
+ jars := strings.Join([]string{
+ getEnv(beamSdkKey, defaultBeamSdk),
+ getEnv(beamRunner, defaultBeamRunner),
+ getEnv(jdk, defaultJDK),
+ }, ":")
+ executorConfig.RunArgs[1] += jars
+ case pb.Sdk_SDK_GO:
+ case pb.Sdk_SDK_PYTHON:
+ case pb.Sdk_SDK_SCIO:
Review comment:
Should this return an error: "not yet supported"?
--
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: github-unsubscribe@beam.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] daria-malkova commented on a change in pull request #15744: [BEAM-13072][Playground] Executor builder
Posted by GitBox <gi...@apache.org>.
daria-malkova commented on a change in pull request #15744:
URL: https://github.com/apache/beam/pull/15744#discussion_r733148809
##########
File path: playground/backend/internal/environment/environment_service.go
##########
@@ -0,0 +1,134 @@
+// 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 environment
+
+import (
+ pb "beam.apache.org/playground/backend/internal/api"
+ "github.com/tkanos/gonfig"
+ "google.golang.org/grpc/grpclog"
+ "os"
+ "strconv"
+ "strings"
+)
+
+const (
+ serverIpKey = "SERVER_IP"
+ serverPortKey = "SERVER_PORT"
+ beamSdkKey = "BEAM_SDK"
+ beamRunner = "BEAM_RUNNER"
+ jdk = "JDK"
+ defaultIp = "localhost"
+ defaultPort = 8080
+ defaultSdk = pb.Sdk_SDK_JAVA
+ executorConfigFolder = "CONFIG_FOLDER"
+ defaultConfigFolder = "./"
+ defaultBeamSdk = "/opt/apache/beam/jars/beam-sdks-java-harness.jar"
+ defaultBeamRunner = "/opt/apache/beam/jars/beam-runners-direct.jar"
+ defaultJDK = "/opt/apache/beam/jars/slf4j-jdk14.jar"
+ jsonExt = ".json"
+)
+
+// Environment operates with environment structures: ServerEnvs, LogWriters, BeamEnvs
+type Environment struct {
+ ServerEnvs ServerEnvs
+ BeamSdkEnvs BeamEnvs
+}
+
+// NewEnvironment is a constructor for Environment.
+// Default values:
+// LogWriters: by default using os.Stdout
+// ServerEnvs: by default using defaultIp and defaultPort from constants
+// BeamEnvs: by default using pb.Sdk_SDK_JAVA
+func NewEnvironment() *Environment {
+ svc := Environment{}
+ svc.ServerEnvs = *getServerEnvsFromOsEnvs()
+ svc.BeamSdkEnvs = *getSdkEnvsFromOsEnvs()
+
+ return &svc
+}
+
+// getServerEnvsFromOsEnvs lookups in os environment variables and takes value for ip and port. If not exists - using default
+func getServerEnvsFromOsEnvs() *ServerEnvs {
+ port := defaultPort
+ ip := getEnv(serverIpKey, defaultIp)
+ if value, present := os.LookupEnv(serverPortKey); present {
+ if converted, err := strconv.Atoi(value); err == nil {
+ port = converted
+ } else {
+ grpclog.Errorf("couldn't convert provided port. Using default %s\n", defaultPort)
+ }
+ }
+ return NewServerEnvs(ip, port)
+}
+
+// getServerEnvsFromOsEnvs lookups in os environment variables and takes value for Apache Beam SDK. If not exists - using default
+func getSdkEnvsFromOsEnvs() *BeamEnvs {
+ sdk := pb.Sdk_SDK_UNSPECIFIED
+ if value, present := os.LookupEnv(beamSdkKey); present {
+
+ switch value {
+ case pb.Sdk_SDK_JAVA.String():
+ sdk = pb.Sdk_SDK_JAVA
+ case pb.Sdk_SDK_GO.String():
+ sdk = pb.Sdk_SDK_GO
+ case pb.Sdk_SDK_PYTHON.String():
+ sdk = pb.Sdk_SDK_PYTHON
+ case pb.Sdk_SDK_SCIO.String():
+ sdk = pb.Sdk_SDK_SCIO
+ }
+ }
+ if sdk == pb.Sdk_SDK_UNSPECIFIED {
+ grpclog.Infof("couldn't get sdk from %s os env, using default: %s", beamSdkKey, defaultSdk)
+ sdk = defaultSdk
+ }
+ executorConfig := readExecutorConfig(sdk)
+ return NewBeamEnvs(sdk, executorConfig)
+}
+
+func readExecutorConfig(apacheBeamSdk pb.Sdk) *ExecutorConfig {
+ executorConfig, _ := getConfigFromJson(apacheBeamSdk)
+ switch apacheBeamSdk {
+ case pb.Sdk_SDK_JAVA:
+ executorConfig.CompileArgs = append(executorConfig.CompileArgs,
+ getEnv(beamSdkKey, defaultBeamSdk))
+ jars := strings.Join([]string{
+ getEnv(beamSdkKey, defaultBeamSdk),
+ getEnv(beamRunner, defaultBeamRunner),
+ getEnv(jdk, defaultJDK),
+ }, ":")
+ executorConfig.RunArgs[1] += jars
+ case pb.Sdk_SDK_GO:
+ case pb.Sdk_SDK_PYTHON:
+ case pb.Sdk_SDK_SCIO:
Review comment:
Ilya will take a care of it in his PR environment service :)
--
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: github-unsubscribe@beam.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [beam] pabloem merged pull request #15744: [BEAM-13072][Playground] Executor builder
Posted by GitBox <gi...@apache.org>.
pabloem merged pull request #15744:
URL: https://github.com/apache/beam/pull/15744
--
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: github-unsubscribe@beam.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org