You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2022/04/28 08:34:43 UTC
[flink] branch master updated: [FLINK-27430][tests] Remove unused timeout field
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new 349ae059480 [FLINK-27430][tests] Remove unused timeout field
349ae059480 is described below
commit 349ae059480d9d2db832f9909d94d69869ccf9e5
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Wed Apr 27 17:16:42 2022 +0200
[FLINK-27430][tests] Remove unused timeout field
---
.../runtime/resourcemanager/StandaloneResourceManagerTest.java | 2 +-
.../runtime/resourcemanager/active/ActiveResourceManagerTest.java | 2 +-
.../resourcemanager/utils/MockResourceManagerRuntimeServices.java | 8 ++------
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/StandaloneResourceManagerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/StandaloneResourceManagerTest.java
index 8ab8fb111be..98e09b7158e 100755
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/StandaloneResourceManagerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/StandaloneResourceManagerTest.java
@@ -101,7 +101,7 @@ public class StandaloneResourceManagerTest extends TestLogger {
final MockResourceManagerRuntimeServices rmServices =
new MockResourceManagerRuntimeServices(
- RPC_SERVICE.getTestingRpcService(), TIMEOUT, slotManager);
+ RPC_SERVICE.getTestingRpcService(), slotManager);
final TestingStandaloneResourceManager rm =
new TestingStandaloneResourceManager(
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/active/ActiveResourceManagerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/active/ActiveResourceManagerTest.java
index cc5916b8178..6129f9a34b2 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/active/ActiveResourceManagerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/active/ActiveResourceManagerTest.java
@@ -880,7 +880,7 @@ public class ActiveResourceManagerTest extends TestLogger {
throws Exception {
final TestingRpcService rpcService = RPC_SERVICE_RESOURCE.getTestingRpcService();
final MockResourceManagerRuntimeServices rmServices =
- new MockResourceManagerRuntimeServices(rpcService, TIMEOUT_TIME, slotManager);
+ new MockResourceManagerRuntimeServices(rpcService, slotManager);
final Duration retryInterval =
configuration.get(ResourceManagerOptions.START_WORKER_RETRY_INTERVAL);
final Duration workerRegistrationTimeout =
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/utils/MockResourceManagerRuntimeServices.java b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/utils/MockResourceManagerRuntimeServices.java
index 730d0a2dfdd..8a48020868b 100755
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/utils/MockResourceManagerRuntimeServices.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/utils/MockResourceManagerRuntimeServices.java
@@ -39,7 +39,6 @@ import static org.apache.flink.util.Preconditions.checkNotNull;
public class MockResourceManagerRuntimeServices {
public final RpcService rpcService;
- public final Time timeout;
public final TestingHighAvailabilityServices highAvailabilityServices;
public final HeartbeatServices heartbeatServices;
public final DelegationTokenManager delegationTokenManager;
@@ -47,10 +46,9 @@ public class MockResourceManagerRuntimeServices {
public final JobLeaderIdService jobLeaderIdService;
public final SlotManager slotManager;
- public MockResourceManagerRuntimeServices(RpcService rpcService, Time timeout) {
+ public MockResourceManagerRuntimeServices(RpcService rpcService) {
this(
rpcService,
- timeout,
DeclarativeSlotManagerBuilder.newBuilder(
new ScheduledExecutorServiceAdapter(
new DirectScheduledExecutorService()))
@@ -60,10 +58,8 @@ public class MockResourceManagerRuntimeServices {
.build());
}
- public MockResourceManagerRuntimeServices(
- RpcService rpcService, Time timeout, SlotManager slotManager) {
+ public MockResourceManagerRuntimeServices(RpcService rpcService, SlotManager slotManager) {
this.rpcService = checkNotNull(rpcService);
- this.timeout = checkNotNull(timeout);
this.slotManager = slotManager;
highAvailabilityServices = new TestingHighAvailabilityServices();
rmLeaderElectionService = new TestingLeaderElectionService();