Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Finalize Java Prism Runner #32264

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -628,6 +628,7 @@ class BeamModulePlugin implements Plugin<Project> {
def nemo_version = "0.1"
// [bomupgrader] determined by: io.grpc:grpc-netty, consistent with: google_cloud_platform_libraries_bom
def netty_version = "4.1.100.Final"
def nuprocess_version = "2.0.6"
def postgres_version = "42.2.16"
def powermock_version = "2.0.9"
// [bomupgrader] determined by: com.google.protobuf:protobuf-java, consistent with: google_cloud_platform_libraries_bom
Expand Down Expand Up @@ -848,6 +849,7 @@ class BeamModulePlugin implements Plugin<Project> {
netty_tcnative_boringssl_static : "io.netty:netty-tcnative-boringssl-static:2.0.52.Final",
netty_transport : "io.netty:netty-transport:$netty_version",
netty_transport_native_epoll : "io.netty:netty-transport-native-epoll:$netty_version",
nuprocess : "com.zaxxer:nuprocess:$nuprocess_version",
postgres : "org.postgresql:postgresql:$postgres_version",
powermock : "org.powermock:powermock-module-junit4:$powermock_version",
powermock_mockito : "org.powermock:powermock-api-mockito2:$powermock_version",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

class JobServicePipelineResult implements PipelineResult, AutoCloseable {
public class JobServicePipelineResult implements PipelineResult, AutoCloseable {

private static final long POLL_INTERVAL_MS = 3_000;

Expand Down Expand Up @@ -116,7 +116,7 @@ void setTerminalStateFuture(CompletableFuture<State> terminalStateFuture) {
this.terminalStateFuture = terminalStateFuture;
}

CompletableFuture<State> getTerminalStateFuture() {
public CompletableFuture<State> getTerminalStateFuture() {
return this.terminalStateFuture;
}

Expand Down Expand Up @@ -193,6 +193,14 @@ public MetricResults metrics() {

@Override
public void close() {
LOG.info("starting cleanup");
cleanup.run();
LOG.info("finished cleanup");
executorService.shutdown();
try {
boolean ignored = executorService.awaitTermination(3000L, TimeUnit.MILLISECONDS);
} catch (InterruptedException ignore) {
}
LOG.info("shutdown executor service");
}
}
3 changes: 2 additions & 1 deletion runners/prism/java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

plugins { id 'org.apache.beam.module' }

applyJavaNature(
applyPortabilityNature (
automaticModuleName: 'org.apache.beam.runners.prism',
)

Expand All @@ -37,6 +37,7 @@ dependencies {
implementation library.java.slf4j_api
implementation library.java.vendored_grpc_1_60_1
implementation library.java.vendored_guava_32_1_2_jre
implementation library.java.nuprocess

testImplementation library.java.junit
testImplementation library.java.mockito_core
Expand Down

This file was deleted.

This file was deleted.

Loading
Loading