You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tr...@apache.org on 2017/11/30 16:58:39 UTC
[2/3] flink git commit: [hotfix] Rename
RestfulGateway#requestJobDetails into requestMultipleJobDetails to avoid name
conflicts with JobMasterGateway
[hotfix] Rename RestfulGateway#requestJobDetails into requestMultipleJobDetails to avoid name conflicts with JobMasterGateway
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/dcbc9668
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/dcbc9668
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/dcbc9668
Branch: refs/heads/master
Commit: dcbc9668c7f07e6c60cc3032aeff37ab416a8204
Parents: b0bd65d
Author: Till Rohrmann <tr...@apache.org>
Authored: Tue Nov 7 11:08:40 2017 +0100
Committer: Till Rohrmann <tr...@apache.org>
Committed: Thu Nov 30 17:57:32 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/flink/runtime/akka/AkkaJobManagerGateway.java | 2 +-
.../main/java/org/apache/flink/runtime/dispatcher/Dispatcher.java | 2 +-
.../java/org/apache/flink/runtime/jobmaster/JobMasterGateway.java | 2 +-
.../org/apache/flink/runtime/rest/handler/job/JobIdsHandler.java | 2 +-
.../apache/flink/runtime/rest/handler/job/JobsOverviewHandler.java | 2 +-
.../flink/runtime/rest/handler/legacy/JobsOverviewHandler.java | 2 +-
.../flink/runtime/rest/handler/legacy/metrics/MetricFetcher.java | 2 +-
.../java/org/apache/flink/runtime/webmonitor/RestfulGateway.java | 2 +-
.../runtime/rest/handler/legacy/metrics/MetricFetcherTest.java | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/dcbc9668/flink-runtime/src/main/java/org/apache/flink/runtime/akka/AkkaJobManagerGateway.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/akka/AkkaJobManagerGateway.java b/flink-runtime/src/main/java/org/apache/flink/runtime/akka/AkkaJobManagerGateway.java
index 0a465b9..37a27c7 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/akka/AkkaJobManagerGateway.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/akka/AkkaJobManagerGateway.java
@@ -223,7 +223,7 @@ public class AkkaJobManagerGateway implements JobManagerGateway {
}
@Override
- public CompletableFuture<MultipleJobsDetails> requestJobDetails(Time timeout) {
+ public CompletableFuture<MultipleJobsDetails> requestMultipleJobDetails(Time timeout) {
return FutureUtils.toJava(
jobManagerGateway
.ask(new RequestJobDetails(true, true), FutureUtils.toFiniteDuration(timeout))
http://git-wip-us.apache.org/repos/asf/flink/blob/dcbc9668/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/Dispatcher.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/Dispatcher.java b/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/Dispatcher.java
index 8e33421..b22e7ab 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/Dispatcher.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/Dispatcher.java
@@ -330,7 +330,7 @@ public abstract class Dispatcher extends FencedRpcEndpoint<DispatcherId> impleme
}
@Override
- public CompletableFuture<MultipleJobsDetails> requestJobDetails(Time timeout) {
+ public CompletableFuture<MultipleJobsDetails> requestMultipleJobDetails(Time timeout) {
final int numberJobsRunning = jobManagerRunners.size();
ArrayList<CompletableFuture<JobDetails>> individualJobDetails = new ArrayList<>(numberJobsRunning);
http://git-wip-us.apache.org/repos/asf/flink/blob/dcbc9668/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobMasterGateway.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobMasterGateway.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobMasterGateway.java
index 2c7e438..f469993 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobMasterGateway.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobMasterGateway.java
@@ -42,8 +42,8 @@ import org.apache.flink.runtime.registration.RegistrationResponse;
import org.apache.flink.runtime.resourcemanager.ResourceManagerId;
import org.apache.flink.runtime.rpc.FencedRpcGateway;
import org.apache.flink.runtime.rpc.RpcTimeout;
-import org.apache.flink.runtime.state.internal.InternalKvState;
import org.apache.flink.runtime.state.KeyGroupRange;
+import org.apache.flink.runtime.state.internal.InternalKvState;
import org.apache.flink.runtime.taskexecutor.slot.SlotOffer;
import org.apache.flink.runtime.taskmanager.TaskExecutionState;
import org.apache.flink.runtime.taskmanager.TaskManagerLocation;
http://git-wip-us.apache.org/repos/asf/flink/blob/dcbc9668/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobIdsHandler.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobIdsHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobIdsHandler.java
index 0a510f4..cabeb40 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobIdsHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobIdsHandler.java
@@ -59,7 +59,7 @@ public class JobIdsHandler extends AbstractRestHandler<RestfulGateway, EmptyRequ
@Nonnull HandlerRequest<EmptyRequestBody, EmptyMessageParameters> request,
@Nonnull RestfulGateway gateway) throws RestHandlerException {
- return gateway.requestJobDetails(timeout).thenApply(
+ return gateway.requestMultipleJobDetails(timeout).thenApply(
multipleJobDetails -> new JobIdsWithStatusOverview(
multipleJobDetails
.getJobs()
http://git-wip-us.apache.org/repos/asf/flink/blob/dcbc9668/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobsOverviewHandler.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobsOverviewHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobsOverviewHandler.java
index 7b6be28..94bdbd2 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobsOverviewHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/job/JobsOverviewHandler.java
@@ -55,6 +55,6 @@ public class JobsOverviewHandler extends AbstractRestHandler<RestfulGateway, Emp
@Override
protected CompletableFuture<MultipleJobsDetails> handleRequest(@Nonnull HandlerRequest<EmptyRequestBody, EmptyMessageParameters> request, @Nonnull RestfulGateway gateway) throws RestHandlerException {
- return gateway.requestJobDetails(timeout);
+ return gateway.requestMultipleJobDetails(timeout);
}
}
http://git-wip-us.apache.org/repos/asf/flink/blob/dcbc9668/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/JobsOverviewHandler.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/JobsOverviewHandler.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/JobsOverviewHandler.java
index d2b4a6c..bf8a013 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/JobsOverviewHandler.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/JobsOverviewHandler.java
@@ -68,7 +68,7 @@ public class JobsOverviewHandler extends AbstractJsonRequestHandler {
@Override
public CompletableFuture<String> handleJsonRequest(Map<String, String> pathParams, Map<String, String> queryParams, JobManagerGateway jobManagerGateway) {
if (jobManagerGateway != null) {
- CompletableFuture<MultipleJobsDetails> jobDetailsFuture = jobManagerGateway.requestJobDetails(timeout);
+ CompletableFuture<MultipleJobsDetails> jobDetailsFuture = jobManagerGateway.requestMultipleJobDetails(timeout);
return jobDetailsFuture.thenApplyAsync(
(MultipleJobsDetails result) -> {
http://git-wip-us.apache.org/repos/asf/flink/blob/dcbc9668/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/metrics/MetricFetcher.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/metrics/MetricFetcher.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/metrics/MetricFetcher.java
index 313232f..44a6169 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/metrics/MetricFetcher.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/legacy/metrics/MetricFetcher.java
@@ -106,7 +106,7 @@ public class MetricFetcher<T extends RestfulGateway> {
/*
* Remove all metrics that belong to a job that is not running and no longer archived.
*/
- CompletableFuture<MultipleJobsDetails> jobDetailsFuture = leaderGateway.requestJobDetails(timeout);
+ CompletableFuture<MultipleJobsDetails> jobDetailsFuture = leaderGateway.requestMultipleJobDetails(timeout);
jobDetailsFuture.whenCompleteAsync(
(MultipleJobsDetails jobDetails, Throwable throwable) -> {
http://git-wip-us.apache.org/repos/asf/flink/blob/dcbc9668/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/RestfulGateway.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/RestfulGateway.java b/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/RestfulGateway.java
index d5de8e9..61dca3b 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/RestfulGateway.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/webmonitor/RestfulGateway.java
@@ -66,7 +66,7 @@ public interface RestfulGateway extends RpcGateway {
* @param timeout for the asynchronous operation
* @return Future containing the job details
*/
- CompletableFuture<MultipleJobsDetails> requestJobDetails(
+ CompletableFuture<MultipleJobsDetails> requestMultipleJobDetails(
@RpcTimeout Time timeout);
/**
http://git-wip-us.apache.org/repos/asf/flink/blob/dcbc9668/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/legacy/metrics/MetricFetcherTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/legacy/metrics/MetricFetcherTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/legacy/metrics/MetricFetcherTest.java
index 72d18b0..9562b58 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/legacy/metrics/MetricFetcherTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/handler/legacy/metrics/MetricFetcherTest.java
@@ -81,7 +81,7 @@ public class MetricFetcherTest extends TestLogger {
JobManagerGateway jobManagerGateway = mock(JobManagerGateway.class);
- when(jobManagerGateway.requestJobDetails(any(Time.class)))
+ when(jobManagerGateway.requestMultipleJobDetails(any(Time.class)))
.thenReturn(CompletableFuture.completedFuture(new MultipleJobsDetails(Collections.emptyList())));
when(jobManagerGateway.requestMetricQueryServicePaths(any(Time.class))).thenReturn(
CompletableFuture.completedFuture(Collections.singleton(jmMetricQueryServicePath)));