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 2017/05/13 18:12:42 UTC
[1/2] flink git commit: [FLINK-6397] [tests] Reset context
environments after test execution
Repository: flink
Updated Branches:
refs/heads/release-1.3 4eebf21e9 -> 81d520bbf
[FLINK-6397] [tests] Reset context environments after test execution
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/36edac4b
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/36edac4b
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/36edac4b
Branch: refs/heads/release-1.3
Commit: 36edac4b16993459dedf9f76d05f9e96b918c783
Parents: 4eebf21
Author: biao.liub <bi...@alibaba-inc.com>
Authored: Tue May 2 16:07:34 2017 +0800
Committer: zentol <ch...@apache.org>
Committed: Sat May 13 17:51:48 2017 +0200
----------------------------------------------------------------------
.../apache/flink/ml/util/FlinkTestBase.scala | 2 ++
.../test/util/CollectionTestEnvironment.java | 4 ++++
.../flink/test/util/JavaProgramTestBase.java | 9 +++++--
.../test/util/MultipleProgramsTestBase.java | 25 ++++++++++++++++++--
.../CustomDistributionITCase.java | 6 +++++
5 files changed, 42 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/36edac4b/flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/util/FlinkTestBase.scala
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/util/FlinkTestBase.scala b/flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/util/FlinkTestBase.scala
index 3ee7a99..c27a2b5 100644
--- a/flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/util/FlinkTestBase.scala
+++ b/flink-libraries/flink-ml/src/test/scala/org/apache/flink/ml/util/FlinkTestBase.scala
@@ -70,6 +70,8 @@ trait FlinkTestBase extends BeforeAndAfter {
after {
cluster.foreach(c => TestBaseUtils.stopCluster(c, TestBaseUtils.DEFAULT_TIMEOUT))
+
+ TestEnvironment.unsetAsContext()
}
}
http://git-wip-us.apache.org/repos/asf/flink/blob/36edac4b/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/CollectionTestEnvironment.java
----------------------------------------------------------------------
diff --git a/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/CollectionTestEnvironment.java b/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/CollectionTestEnvironment.java
index e56c7e8..fd047e4 100644
--- a/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/CollectionTestEnvironment.java
+++ b/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/CollectionTestEnvironment.java
@@ -60,4 +60,8 @@ public class CollectionTestEnvironment extends CollectionEnvironment {
initializeContextEnvironment(factory);
}
+
+ protected static void unsetAsContext() {
+ resetContextEnvironment();
+ }
}
http://git-wip-us.apache.org/repos/asf/flink/blob/36edac4b/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/JavaProgramTestBase.java
----------------------------------------------------------------------
diff --git a/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/JavaProgramTestBase.java b/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/JavaProgramTestBase.java
index f06cdb7..a17b68f 100644
--- a/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/JavaProgramTestBase.java
+++ b/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/JavaProgramTestBase.java
@@ -97,8 +97,9 @@ public abstract class JavaProgramTestBase extends AbstractTestBase {
@Test
public void testJobWithObjectReuse() throws Exception {
isCollectionExecution = false;
-
+
startCluster();
+
try {
// pre-submit
try {
@@ -109,7 +110,7 @@ public abstract class JavaProgramTestBase extends AbstractTestBase {
e.printStackTrace();
Assert.fail("Pre-submit work caused an error: " + e.getMessage());
}
-
+
// prepare the test environment
TestEnvironment env = new TestEnvironment(this.executor, this.parallelism, false);
env.getConfig().enableObjectReuse();
@@ -143,6 +144,7 @@ public abstract class JavaProgramTestBase extends AbstractTestBase {
}
} finally {
stopCluster();
+ TestEnvironment.unsetAsContext();
}
}
@@ -195,6 +197,7 @@ public abstract class JavaProgramTestBase extends AbstractTestBase {
}
} finally {
stopCluster();
+ TestEnvironment.unsetAsContext();
}
}
@@ -231,6 +234,8 @@ public abstract class JavaProgramTestBase extends AbstractTestBase {
System.err.println(e.getMessage());
e.printStackTrace();
Assert.fail("Error while calling the test program: " + e.getMessage());
+ } finally {
+ CollectionTestEnvironment.unsetAsContext();
}
Assert.assertNotNull("The test program never triggered an execution.", this.latestExecutionResult);
http://git-wip-us.apache.org/repos/asf/flink/blob/36edac4b/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/MultipleProgramsTestBase.java
----------------------------------------------------------------------
diff --git a/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/MultipleProgramsTestBase.java b/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/MultipleProgramsTestBase.java
index ed141d1..468f8c7 100644
--- a/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/MultipleProgramsTestBase.java
+++ b/flink-test-utils-parent/flink-test-utils/src/main/java/org/apache/flink/test/util/MultipleProgramsTestBase.java
@@ -19,7 +19,9 @@
package org.apache.flink.test.util;
import org.apache.flink.runtime.minicluster.LocalFlinkMiniCluster;
+import org.junit.After;
import org.junit.AfterClass;
+import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.runners.Parameterized;
@@ -80,10 +82,16 @@ public class MultipleProgramsTestBase extends TestBaseUtils {
protected final TestExecutionMode mode;
-
public MultipleProgramsTestBase(TestExecutionMode mode) {
this.mode = mode;
-
+ }
+
+ // ------------------------------------------------------------------------
+ // Environment setup & teardown
+ // ------------------------------------------------------------------------
+
+ @Before
+ public void setupEnvironment() {
switch(mode){
case CLUSTER:
new TestEnvironment(cluster, 4, false).setAsContext();
@@ -97,6 +105,19 @@ public class MultipleProgramsTestBase extends TestBaseUtils {
}
}
+ @After
+ public void teardownEnvironment() {
+ switch(mode) {
+ case CLUSTER:
+ case CLUSTER_OBJECT_REUSE:
+ TestEnvironment.unsetAsContext();
+ break;
+ case COLLECTION:
+ CollectionTestEnvironment.unsetAsContext();
+ break;
+ }
+ }
+
// ------------------------------------------------------------------------
// Cluster setup & teardown
// ------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/36edac4b/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/CustomDistributionITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/CustomDistributionITCase.java b/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/CustomDistributionITCase.java
index da92c05..24a09ba 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/CustomDistributionITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/javaApiOperators/CustomDistributionITCase.java
@@ -36,6 +36,7 @@ import org.apache.flink.test.util.TestEnvironment;
import org.apache.flink.util.Collector;
import org.apache.flink.util.TestLogger;
+import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -70,6 +71,11 @@ public class CustomDistributionITCase extends TestLogger {
clusterEnv.setAsContext();
}
+ @After
+ public void cleanup() {
+ TestEnvironment.unsetAsContext();
+ }
+
// ------------------------------------------------------------------------
/**
[2/2] flink git commit: [FLINK-6530] Close response in
DatadogHttpClient
Posted by ch...@apache.org.
[FLINK-6530] Close response in DatadogHttpClient
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/81d520bb
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/81d520bb
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/81d520bb
Branch: refs/heads/release-1.3
Commit: 81d520bbf9bffb6e37f4787ab4bc455f814c3b00
Parents: 36edac4
Author: zentol <ch...@apache.org>
Authored: Sat May 13 17:45:46 2017 +0200
Committer: zentol <ch...@apache.org>
Committed: Sat May 13 18:16:35 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/flink/metrics/datadog/DatadogHttpClient.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/81d520bb/flink-metrics/flink-metrics-datadog/src/main/java/org/apache/flink/metrics/datadog/DatadogHttpClient.java
----------------------------------------------------------------------
diff --git a/flink-metrics/flink-metrics-datadog/src/main/java/org/apache/flink/metrics/datadog/DatadogHttpClient.java b/flink-metrics/flink-metrics-datadog/src/main/java/org/apache/flink/metrics/datadog/DatadogHttpClient.java
index dfbcee1..c94a2b7 100644
--- a/flink-metrics/flink-metrics-datadog/src/main/java/org/apache/flink/metrics/datadog/DatadogHttpClient.java
+++ b/flink-metrics/flink-metrics-datadog/src/main/java/org/apache/flink/metrics/datadog/DatadogHttpClient.java
@@ -64,8 +64,7 @@ public class DatadogHttpClient{
private void validateApiKey() {
Request r = new Request.Builder().url(validateUrl).get().build();
- try {
- Response response = client.newCall(r).execute();
+ try (Response response = client.newCall(r).execute()) {
if (!response.isSuccessful()) {
throw new IllegalArgumentException(
String.format("API key: %s is invalid", apiKey));