robertwb commented on a change in pull request #11792: URL: https://github.com/apache/beam/pull/11792#discussion_r453100877
########## File path: runners/portability/java/src/main/java/org/apache/beam/runners/portability/testing/TestUniversalRunner.java ########## @@ -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.beam.runners.portability.testing; + +import static org.hamcrest.MatcherAssert.assertThat; + +import com.google.auto.service.AutoService; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; +import org.apache.beam.runners.portability.PortableRunner; +import org.apache.beam.sdk.Pipeline; +import org.apache.beam.sdk.PipelineResult; +import org.apache.beam.sdk.PipelineRunner; +import org.apache.beam.sdk.options.Description; +import org.apache.beam.sdk.options.PipelineOptions; +import org.apache.beam.sdk.options.PipelineOptionsRegistrar; +import org.apache.beam.sdk.options.PortablePipelineOptions; +import org.apache.beam.sdk.runners.PipelineRunnerRegistrar; +import org.apache.beam.sdk.testing.TestPipelineOptions; +import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.base.Charsets; +import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList; +import org.hamcrest.Matchers; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** A {@link PipelineRunner} a {@link Pipeline} against a {@code JobService}. */ +public class TestUniversalRunner extends PipelineRunner<PipelineResult> { + + private static final Logger LOG = LoggerFactory.getLogger(TestUniversalRunner.class); + + private final PipelineOptions options; + + private TestUniversalRunner(PipelineOptions options) { + this.options = options; + } + + /** + * Constructs a runner from the provided options. + * + * @param options Properties which configure the runner. + * @return The newly created runner. + */ + public static TestUniversalRunner fromOptions(PipelineOptions options) { + return new TestUniversalRunner(options); + } + + @Override + public PipelineResult run(Pipeline pipeline) { + try { + Options testOptions = options.as(Options.class); + String endpoint = + "localhost:" + + new String( + Files.readAllBytes(Paths.get(testOptions.getLocalJobServicePortFile())), + Charsets.UTF_8) + .trim(); + + PortablePipelineOptions portableOptions = options.as(PortablePipelineOptions.class); + portableOptions.setJobEndpoint(endpoint); + portableOptions.setRunner(PortableRunner.class); + PortableRunner runner = PortableRunner.fromOptions(portableOptions); + PipelineResult result = runner.run(pipeline); + assertThat( + "Pipeline did not succeed.", + result.waitUntilFinish(), + Matchers.is(PipelineResult.State.DONE)); + return result; + } catch (IOException e) { + throw new RuntimeException(e); + } + } + + public interface Options extends TestPipelineOptions, PortablePipelineOptions { + /** + * A file containing the job service port, since Gradle needs to know this filename statically + * to provide it in Beam testing options. + */ + @Description("File containing local job service port.") Review comment: We already have the plain `jobEndpoint` option, just make (re)setting it conditional on `LocalJobServicePortFile` being set. ########## File path: sdks/python/apache_beam/runners/portability/local_job_service_main.py ########## @@ -99,11 +104,23 @@ def run(argv): options.port_file = os.path.splitext(options.pid_file)[0] + '.port' argv.append('--port_file') argv.append(options.port_file) + + if not options.stdout_file: + raise RuntimeError('--stdout_file must be specified with --background') + stdout_dest = open(options.stdout_file, mode='w') Review comment: No problem. My comment was from something like a mont ago. Thanks for the references. ---------------------------------------------------------------- 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]
