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 2018/06/22 15:45:36 UTC
[3/9] flink git commit: [hotfix] Pass CodebaseType via the
MiniClusterResourceConfiguration
[hotfix] Pass CodebaseType via the MiniClusterResourceConfiguration
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/8bb086d4
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/8bb086d4
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/8bb086d4
Branch: refs/heads/master
Commit: 8bb086d4309352cbf111e6031cd65d7f90dba6bc
Parents: 6de6ed4
Author: Till Rohrmann <tr...@apache.org>
Authored: Thu Jun 21 15:02:04 2018 +0200
Committer: Till Rohrmann <tr...@apache.org>
Committed: Fri Jun 22 17:45:04 2018 +0200
----------------------------------------------------------------------
.../jobmanager/JMXJobManagerMetricTest.java | 8 +++----
.../webmonitor/handlers/JarRunHandlerTest.java | 5 ++---
.../webmonitor/history/HistoryServerTest.java | 5 ++---
.../flink/test/util/MiniClusterResource.java | 22 +++-----------------
.../test/example/client/JobRetrievalITCase.java | 5 ++---
5 files changed, 13 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/8bb086d4/flink-metrics/flink-metrics-jmx/src/test/java/org/apache/flink/runtime/jobmanager/JMXJobManagerMetricTest.java
----------------------------------------------------------------------
diff --git a/flink-metrics/flink-metrics-jmx/src/test/java/org/apache/flink/runtime/jobmanager/JMXJobManagerMetricTest.java b/flink-metrics/flink-metrics-jmx/src/test/java/org/apache/flink/runtime/jobmanager/JMXJobManagerMetricTest.java
index 90ba6d4..b7afca9 100644
--- a/flink-metrics/flink-metrics-jmx/src/test/java/org/apache/flink/runtime/jobmanager/JMXJobManagerMetricTest.java
+++ b/flink-metrics/flink-metrics-jmx/src/test/java/org/apache/flink/runtime/jobmanager/JMXJobManagerMetricTest.java
@@ -64,10 +64,10 @@ public class JMXJobManagerMetricTest extends TestLogger {
@ClassRule
public static final MiniClusterResource MINI_CLUSTER_RESOURCE = new MiniClusterResource(
new MiniClusterResourceConfiguration.Builder()
- .setConfiguration(getConfiguration())
- .setNumberSlotsPerTaskManager(1)
- .setNumberTaskManagers(1)
- .build(),
+ .setConfiguration(getConfiguration())
+ .setNumberSlotsPerTaskManager(1)
+ .setNumberTaskManagers(1)
+ .build(),
true);
private static Configuration getConfiguration() {
http://git-wip-us.apache.org/repos/asf/flink/blob/8bb086d4/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarRunHandlerTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarRunHandlerTest.java b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarRunHandlerTest.java
index d26620b..3e8e633 100644
--- a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarRunHandlerTest.java
+++ b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/handlers/JarRunHandlerTest.java
@@ -68,9 +68,8 @@ public class JarRunHandlerTest {
.setConfiguration(config)
.setNumberTaskManagers(1)
.setNumberSlotsPerTaskManager(1)
- .build(),
- TestBaseUtils.CodebaseType.NEW
- );
+ .setCodebaseType(TestBaseUtils.CodebaseType.NEW)
+ .build());
clusterResource.before();
try {
http://git-wip-us.apache.org/repos/asf/flink/blob/8bb086d4/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/history/HistoryServerTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/history/HistoryServerTest.java b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/history/HistoryServerTest.java
index 5d29fbb..4451e6d 100644
--- a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/history/HistoryServerTest.java
+++ b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/history/HistoryServerTest.java
@@ -81,9 +81,8 @@ public class HistoryServerTest extends TestLogger {
.setConfiguration(clusterConfig)
.setNumberTaskManagers(1)
.setNumberSlotsPerTaskManager(1)
- .build(),
- TestBaseUtils.CodebaseType.NEW
- );
+ .setCodebaseType(TestBaseUtils.CodebaseType.NEW)
+ .build());
cluster.before();
}
http://git-wip-us.apache.org/repos/asf/flink/blob/8bb086d4/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/MiniClusterResource.java
----------------------------------------------------------------------
diff --git a/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/MiniClusterResource.java b/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/MiniClusterResource.java
index c412bbf..bbb945f 100644
--- a/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/MiniClusterResource.java
+++ b/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/MiniClusterResource.java
@@ -71,26 +71,10 @@ public class MiniClusterResource extends ExternalResource {
}
public MiniClusterResource(
- final MiniClusterResourceConfiguration miniClusterResourceConfiguration,
- final TestBaseUtils.CodebaseType miniClusterType) {
- this(miniClusterResourceConfiguration, miniClusterType, false);
- }
-
- public MiniClusterResource(
- final MiniClusterResourceConfiguration miniClusterResourceConfiguration,
- final boolean enableClusterClient) {
- this(
- miniClusterResourceConfiguration,
- miniClusterResourceConfiguration.getCodebaseType(),
- enableClusterClient);
- }
-
- private MiniClusterResource(
- final MiniClusterResourceConfiguration miniClusterResourceConfiguration,
- final TestBaseUtils.CodebaseType miniClusterType,
- final boolean enableClusterClient) {
+ final MiniClusterResourceConfiguration miniClusterResourceConfiguration,
+ final boolean enableClusterClient) {
this.miniClusterResourceConfiguration = Preconditions.checkNotNull(miniClusterResourceConfiguration);
- this.miniClusterType = Preconditions.checkNotNull(miniClusterType);
+ this.miniClusterType = miniClusterResourceConfiguration.getCodebaseType();
this.enableClusterClient = enableClusterClient;
}
http://git-wip-us.apache.org/repos/asf/flink/blob/8bb086d4/flink-tests/src/test/java/org/apache/flink/test/example/client/JobRetrievalITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/example/client/JobRetrievalITCase.java b/flink-tests/src/test/java/org/apache/flink/test/example/client/JobRetrievalITCase.java
index 93bec74..66a894f 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/example/client/JobRetrievalITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/example/client/JobRetrievalITCase.java
@@ -58,9 +58,8 @@ public class JobRetrievalITCase extends TestLogger {
new MiniClusterResourceConfiguration.Builder()
.setNumberTaskManagers(1)
.setNumberSlotsPerTaskManager(4)
- .build(),
- TestBaseUtils.CodebaseType.NEW
- );
+ .setCodebaseType(TestBaseUtils.CodebaseType.NEW)
+ .build());
private RestClusterClient<StandaloneClusterId> client;