From 3b2d2a87bc80bcddf19ca838dc0d3c8575758717 Mon Sep 17 00:00:00 2001 From: Till Rohrmann Date: Mon, 29 Aug 2016 16:35:29 +0200 Subject: [PATCH] [FLINK-4529] [flip-6] Move TaskExecutor, JobMaster and ResourceManager out of the rpc package The TaskExecutor, the JobMaster and the ResourceManager were still contained in the rpc package. With this commit, they will be moved out of this package. Now they are contained in dedicated packages on the o.a.f.runtime level. --- .../runtime/{rpc => }/jobmaster/JobMaster.java | 4 ++-- .../{rpc => }/jobmaster/JobMasterGateway.java | 2 +- .../resourcemanager/JobMasterRegistration.java | 2 +- .../resourcemanager/RegistrationResponse.java | 2 +- .../{rpc => }/resourcemanager/ResourceManager.java | 8 ++++---- .../resourcemanager/ResourceManagerGateway.java | 4 ++-- .../{rpc => }/resourcemanager/SlotAssignment.java | 2 +- .../{rpc => }/resourcemanager/SlotRequest.java | 2 +- .../{rpc => }/taskexecutor/TaskExecutor.java | 2 +- .../taskexecutor/TaskExecutorGateway.java | 2 +- .../TaskExecutorRegistrationSuccess.java | 2 +- .../TaskExecutorToResourceManagerConnection.java | 4 ++-- .../ClusterShutdownITCase.java | 2 +- .../ResourceManagerITCase.java | 2 +- .../ResourceManagerTest.java | 2 +- .../flink/runtime/rpc/akka/AkkaRpcServiceTest.java | 14 -------------- .../{rpc => }/taskexecutor/TaskExecutorTest.java | 4 ++-- 17 files changed, 23 insertions(+), 37 deletions(-) rename flink-runtime/src/main/java/org/apache/flink/runtime/{rpc => }/jobmaster/JobMaster.java (98%) rename flink-runtime/src/main/java/org/apache/flink/runtime/{rpc => }/jobmaster/JobMasterGateway.java (97%) rename flink-runtime/src/main/java/org/apache/flink/runtime/{rpc => }/resourcemanager/JobMasterRegistration.java (95%) rename flink-runtime/src/main/java/org/apache/flink/runtime/{rpc => }/resourcemanager/RegistrationResponse.java (96%) rename flink-runtime/src/main/java/org/apache/flink/runtime/{rpc => }/resourcemanager/ResourceManager.java (94%) rename flink-runtime/src/main/java/org/apache/flink/runtime/{rpc => }/resourcemanager/ResourceManagerGateway.java (96%) rename flink-runtime/src/main/java/org/apache/flink/runtime/{rpc => }/resourcemanager/SlotAssignment.java (94%) rename flink-runtime/src/main/java/org/apache/flink/runtime/{rpc => }/resourcemanager/SlotRequest.java (94%) rename flink-runtime/src/main/java/org/apache/flink/runtime/{rpc => }/taskexecutor/TaskExecutor.java (99%) rename flink-runtime/src/main/java/org/apache/flink/runtime/{rpc => }/taskexecutor/TaskExecutorGateway.java (96%) rename flink-runtime/src/main/java/org/apache/flink/runtime/{rpc => }/taskexecutor/TaskExecutorRegistrationSuccess.java (97%) rename flink-runtime/src/main/java/org/apache/flink/runtime/{rpc => }/taskexecutor/TaskExecutorToResourceManagerConnection.java (98%) rename flink-runtime/src/test/java/org/apache/flink/runtime/{resourcemanager => clusterframework}/ClusterShutdownITCase.java (99%) rename flink-runtime/src/test/java/org/apache/flink/runtime/{resourcemanager => clusterframework}/ResourceManagerITCase.java (99%) rename flink-runtime/src/test/java/org/apache/flink/runtime/{resourcemanager => clusterframework}/ResourceManagerTest.java (99%) rename flink-runtime/src/test/java/org/apache/flink/runtime/{rpc => }/taskexecutor/TaskExecutorTest.java (97%) diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/jobmaster/JobMaster.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobMaster.java similarity index 98% rename from flink-runtime/src/main/java/org/apache/flink/runtime/rpc/jobmaster/JobMaster.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobMaster.java index a046cb8948052..0a6a7ef0938ec 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/jobmaster/JobMaster.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobMaster.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.runtime.rpc.jobmaster; +package org.apache.flink.runtime.jobmaster; import org.apache.flink.api.common.JobID; import org.apache.flink.configuration.Configuration; @@ -26,7 +26,7 @@ import org.apache.flink.runtime.leaderelection.LeaderElectionService; import org.apache.flink.runtime.messages.Acknowledge; import org.apache.flink.runtime.rpc.RpcMethod; -import org.apache.flink.runtime.rpc.resourcemanager.ResourceManagerGateway; +import org.apache.flink.runtime.resourcemanager.ResourceManagerGateway; import org.apache.flink.runtime.rpc.RpcEndpoint; import org.apache.flink.runtime.rpc.RpcService; import org.apache.flink.runtime.taskmanager.TaskExecutionState; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/jobmaster/JobMasterGateway.java b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobMasterGateway.java similarity index 97% rename from flink-runtime/src/main/java/org/apache/flink/runtime/rpc/jobmaster/JobMasterGateway.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobMasterGateway.java index 17a4c3ab75eda..a53e383942744 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/jobmaster/JobMasterGateway.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/jobmaster/JobMasterGateway.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.runtime.rpc.jobmaster; +package org.apache.flink.runtime.jobmaster; import org.apache.flink.runtime.messages.Acknowledge; import org.apache.flink.runtime.rpc.RpcGateway; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/resourcemanager/JobMasterRegistration.java b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/JobMasterRegistration.java similarity index 95% rename from flink-runtime/src/main/java/org/apache/flink/runtime/rpc/resourcemanager/JobMasterRegistration.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/JobMasterRegistration.java index 7a2deae20b0b7..309dcc1762619 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/resourcemanager/JobMasterRegistration.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/JobMasterRegistration.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.runtime.rpc.resourcemanager; +package org.apache.flink.runtime.resourcemanager; import java.io.Serializable; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/resourcemanager/RegistrationResponse.java b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/RegistrationResponse.java similarity index 96% rename from flink-runtime/src/main/java/org/apache/flink/runtime/rpc/resourcemanager/RegistrationResponse.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/RegistrationResponse.java index 8ac9e49ecf1aa..fb6c401a1241e 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/resourcemanager/RegistrationResponse.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/RegistrationResponse.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.runtime.rpc.resourcemanager; +package org.apache.flink.runtime.resourcemanager; import org.apache.flink.runtime.instance.InstanceID; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/resourcemanager/ResourceManager.java b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManager.java similarity index 94% rename from flink-runtime/src/main/java/org/apache/flink/runtime/rpc/resourcemanager/ResourceManager.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManager.java index 6f34465740760..dbd70971ebd22 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/resourcemanager/ResourceManager.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManager.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.runtime.rpc.resourcemanager; +package org.apache.flink.runtime.resourcemanager; import akka.dispatch.Mapper; @@ -25,9 +25,9 @@ import org.apache.flink.runtime.rpc.RpcMethod; import org.apache.flink.runtime.rpc.RpcEndpoint; import org.apache.flink.runtime.rpc.RpcService; -import org.apache.flink.runtime.rpc.jobmaster.JobMaster; -import org.apache.flink.runtime.rpc.jobmaster.JobMasterGateway; -import org.apache.flink.runtime.rpc.taskexecutor.TaskExecutorRegistrationSuccess; +import org.apache.flink.runtime.jobmaster.JobMaster; +import org.apache.flink.runtime.jobmaster.JobMasterGateway; +import org.apache.flink.runtime.taskexecutor.TaskExecutorRegistrationSuccess; import org.apache.flink.util.Preconditions; import scala.concurrent.ExecutionContext; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/resourcemanager/ResourceManagerGateway.java b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManagerGateway.java similarity index 96% rename from flink-runtime/src/main/java/org/apache/flink/runtime/rpc/resourcemanager/ResourceManagerGateway.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManagerGateway.java index afddb01d6b128..10771f52e9234 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/resourcemanager/ResourceManagerGateway.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/ResourceManagerGateway.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.flink.runtime.rpc.resourcemanager; +package org.apache.flink.runtime.resourcemanager; import org.apache.flink.runtime.clusterframework.types.ResourceID; import org.apache.flink.runtime.rpc.RpcGateway; import org.apache.flink.runtime.rpc.RpcTimeout; -import org.apache.flink.runtime.rpc.jobmaster.JobMaster; +import org.apache.flink.runtime.jobmaster.JobMaster; import scala.concurrent.Future; import scala.concurrent.duration.FiniteDuration; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/resourcemanager/SlotAssignment.java b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/SlotAssignment.java similarity index 94% rename from flink-runtime/src/main/java/org/apache/flink/runtime/rpc/resourcemanager/SlotAssignment.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/SlotAssignment.java index 86cd8b76a8cc3..695204d751c6e 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/resourcemanager/SlotAssignment.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/SlotAssignment.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.runtime.rpc.resourcemanager; +package org.apache.flink.runtime.resourcemanager; import java.io.Serializable; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/resourcemanager/SlotRequest.java b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/SlotRequest.java similarity index 94% rename from flink-runtime/src/main/java/org/apache/flink/runtime/rpc/resourcemanager/SlotRequest.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/SlotRequest.java index d8fe2689644ea..eac89a73d315e 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/resourcemanager/SlotRequest.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/resourcemanager/SlotRequest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.runtime.rpc.resourcemanager; +package org.apache.flink.runtime.resourcemanager; import java.io.Serializable; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/taskexecutor/TaskExecutor.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutor.java similarity index 99% rename from flink-runtime/src/main/java/org/apache/flink/runtime/rpc/taskexecutor/TaskExecutor.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutor.java index f201e00c31050..43e8a0105b2fa 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/taskexecutor/TaskExecutor.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutor.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.runtime.rpc.taskexecutor; +package org.apache.flink.runtime.taskexecutor; import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.runtime.clusterframework.types.ResourceID; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/taskexecutor/TaskExecutorGateway.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutorGateway.java similarity index 96% rename from flink-runtime/src/main/java/org/apache/flink/runtime/rpc/taskexecutor/TaskExecutorGateway.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutorGateway.java index b0b21b00eb2c3..6c99706c6f677 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/taskexecutor/TaskExecutorGateway.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutorGateway.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.runtime.rpc.taskexecutor; +package org.apache.flink.runtime.taskexecutor; import org.apache.flink.runtime.rpc.RpcGateway; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/taskexecutor/TaskExecutorRegistrationSuccess.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutorRegistrationSuccess.java similarity index 97% rename from flink-runtime/src/main/java/org/apache/flink/runtime/rpc/taskexecutor/TaskExecutorRegistrationSuccess.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutorRegistrationSuccess.java index 641102dda817a..92857b9d8e018 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/taskexecutor/TaskExecutorRegistrationSuccess.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutorRegistrationSuccess.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.runtime.rpc.taskexecutor; +package org.apache.flink.runtime.taskexecutor; import org.apache.flink.runtime.instance.InstanceID; import org.apache.flink.runtime.rpc.registration.RegistrationResponse; diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/taskexecutor/TaskExecutorToResourceManagerConnection.java b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutorToResourceManagerConnection.java similarity index 98% rename from flink-runtime/src/main/java/org/apache/flink/runtime/rpc/taskexecutor/TaskExecutorToResourceManagerConnection.java rename to flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutorToResourceManagerConnection.java index f398b7d06d6dc..672019d4dfa39 100644 --- a/flink-runtime/src/main/java/org/apache/flink/runtime/rpc/taskexecutor/TaskExecutorToResourceManagerConnection.java +++ b/flink-runtime/src/main/java/org/apache/flink/runtime/taskexecutor/TaskExecutorToResourceManagerConnection.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.runtime.rpc.taskexecutor; +package org.apache.flink.runtime.taskexecutor; import akka.dispatch.OnFailure; import akka.dispatch.OnSuccess; @@ -27,7 +27,7 @@ import org.apache.flink.runtime.rpc.RpcService; import org.apache.flink.runtime.rpc.registration.RegistrationResponse; import org.apache.flink.runtime.rpc.registration.RetryingRegistration; -import org.apache.flink.runtime.rpc.resourcemanager.ResourceManagerGateway; +import org.apache.flink.runtime.resourcemanager.ResourceManagerGateway; import org.slf4j.Logger; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/ClusterShutdownITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/clusterframework/ClusterShutdownITCase.java similarity index 99% rename from flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/ClusterShutdownITCase.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/clusterframework/ClusterShutdownITCase.java index 32c6cac3a9a43..744308cbd2e5a 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/ClusterShutdownITCase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/clusterframework/ClusterShutdownITCase.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.runtime.resourcemanager; +package org.apache.flink.runtime.clusterframework; import akka.actor.ActorSystem; import akka.testkit.JavaTestKit; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/ResourceManagerITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/clusterframework/ResourceManagerITCase.java similarity index 99% rename from flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/ResourceManagerITCase.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/clusterframework/ResourceManagerITCase.java index ce57fe6c718f1..f8d944f43abbb 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/ResourceManagerITCase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/clusterframework/ResourceManagerITCase.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.runtime.resourcemanager; +package org.apache.flink.runtime.clusterframework; import akka.actor.ActorSystem; import akka.testkit.JavaTestKit; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/ResourceManagerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/clusterframework/ResourceManagerTest.java similarity index 99% rename from flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/ResourceManagerTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/clusterframework/ResourceManagerTest.java index 043c81c19b6c7..ca8a07ab1c0c3 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/ResourceManagerTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/clusterframework/ResourceManagerTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.runtime.resourcemanager; +package org.apache.flink.runtime.clusterframework; import akka.actor.ActorSystem; import akka.testkit.JavaTestKit; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rpc/akka/AkkaRpcServiceTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rpc/akka/AkkaRpcServiceTest.java index 2790cf88290b2..f55069e44e5b1 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/rpc/akka/AkkaRpcServiceTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rpc/akka/AkkaRpcServiceTest.java @@ -21,28 +21,14 @@ import akka.actor.ActorSystem; import akka.util.Timeout; import org.apache.flink.core.testutils.OneShotLatch; -import org.apache.flink.configuration.Configuration; import org.apache.flink.runtime.akka.AkkaUtils; -import org.apache.flink.runtime.highavailability.HighAvailabilityServices; -import org.apache.flink.runtime.highavailability.NonHaServices; -import org.apache.flink.runtime.jobgraph.JobGraph; -import org.apache.flink.runtime.rpc.jobmaster.JobMaster; -import org.apache.flink.runtime.rpc.resourcemanager.ResourceManagerGateway; -import org.apache.flink.runtime.rpc.resourcemanager.ResourceManager; import org.apache.flink.util.TestLogger; import org.junit.AfterClass; import org.junit.Test; -import org.mockito.Mockito; -import scala.concurrent.duration.Deadline; -import scala.concurrent.duration.FiniteDuration; - -import java.util.concurrent.ExecutorService; -import java.util.concurrent.ForkJoinPool; import java.util.concurrent.TimeUnit; -import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; public class AkkaRpcServiceTest extends TestLogger { diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rpc/taskexecutor/TaskExecutorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskExecutorTest.java similarity index 97% rename from flink-runtime/src/test/java/org/apache/flink/runtime/rpc/taskexecutor/TaskExecutorTest.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskExecutorTest.java index b831ead5c9a11..d197e6a54ce97 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/rpc/taskexecutor/TaskExecutorTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/taskexecutor/TaskExecutorTest.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.flink.runtime.rpc.taskexecutor; +package org.apache.flink.runtime.taskexecutor; import org.apache.flink.runtime.clusterframework.types.ResourceID; import org.apache.flink.runtime.highavailability.NonHaServices; import org.apache.flink.runtime.highavailability.TestingHighAvailabilityServices; import org.apache.flink.runtime.leaderelection.TestingLeaderRetrievalService; import org.apache.flink.runtime.rpc.TestingRpcService; -import org.apache.flink.runtime.rpc.resourcemanager.ResourceManagerGateway; +import org.apache.flink.runtime.resourcemanager.ResourceManagerGateway; import org.apache.flink.util.TestLogger; import org.junit.Test;