[
https://issues.apache.org/jira/browse/BEAM-5023?focusedWorklogId=129048&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-129048
]
ASF GitHub Bot logged work on BEAM-5023:
----------------------------------------
Author: ASF GitHub Bot
Created on: 31/Jul/18 00:47
Start Date: 31/Jul/18 00:47
Worklog Time Spent: 10m
Work Description: tweise closed pull request #6066: [BEAM-5023] Send
HarnessId in DataClient
URL: https://github.com/apache/beam/pull/6066
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/FnHarness.java
b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/FnHarness.java
index ec3821dfae9..6ba55bca900 100644
--- a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/FnHarness.java
+++ b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/FnHarness.java
@@ -19,8 +19,10 @@
package org.apache.beam.fn.harness;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.ImmutableList;
import java.util.EnumMap;
import java.util.List;
+import org.apache.beam.fn.harness.control.AddHarnessIdInterceptor;
import org.apache.beam.fn.harness.control.BeamFnControlClient;
import org.apache.beam.fn.harness.control.ProcessBundleHandler;
import org.apache.beam.fn.harness.control.RegisterHandler;
@@ -116,6 +118,8 @@ public static void main(
}
OutboundObserverFactory outboundObserverFactory =
HarnessStreamObserverFactories.fromOptions(options);
+ channelFactory =
+
channelFactory.withInterceptors(ImmutableList.of(AddHarnessIdInterceptor.create(id)));
main(
id,
options,
diff --git
a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/control/BeamFnControlClient.java
b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/control/BeamFnControlClient.java
index 09d18b3f5f0..f1145b805a4 100644
---
a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/control/BeamFnControlClient.java
+++
b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/control/BeamFnControlClient.java
@@ -20,7 +20,6 @@
import static com.google.common.base.Throwables.getStackTraceAsString;
-import com.google.common.collect.ImmutableList;
import com.google.common.util.concurrent.Uninterruptibles;
import java.util.EnumMap;
import java.util.Objects;
@@ -79,11 +78,7 @@ public BeamFnControlClient(
this.bufferedInstructions = new LinkedBlockingDeque<>();
this.outboundObserver =
outboundObserverFactory.outboundObserverFor(
- BeamFnControlGrpc.newStub(
- channelFactory
-
.withInterceptors(ImmutableList.of(AddHarnessIdInterceptor.create(id)))
- .forDescriptor(apiServiceDescriptor))
- ::control,
+
BeamFnControlGrpc.newStub(channelFactory.forDescriptor(apiServiceDescriptor))::control,
new InboundObserver());
this.handlers = handlers;
this.onFinish = new CompletableFuture<>();
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
Issue Time Tracking
-------------------
Worklog Id: (was: 129048)
Time Spent: 50m (was: 40m)
> BeamFnDataGrpcClient should pass the worker_id when connecting to the
> RunnerHarness
> -----------------------------------------------------------------------------------
>
> Key: BEAM-5023
> URL: https://issues.apache.org/jira/browse/BEAM-5023
> Project: Beam
> Issue Type: Improvement
> Components: sdk-java-harness
> Reporter: Ankur Goenka
> Assignee: Ankur Goenka
> Priority: Major
> Time Spent: 50m
> Remaining Estimate: 0h
>
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
