You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tz...@apache.org on 2017/12/18 07:25:43 UTC
[1/3] flink git commit: [hotfix] [javadoc] Fix typo in
StreamExecutionEnvironment javadoc
Repository: flink
Updated Branches:
refs/heads/release-1.4 57de25d89 -> f638deddb
[hotfix] [javadoc] Fix typo in StreamExecutionEnvironment javadoc
This closes #5164.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/0e27e208
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/0e27e208
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/0e27e208
Branch: refs/heads/release-1.4
Commit: 0e27e20886df635fcfb4845d1979dcbeccc5f279
Parents: 57de25d
Author: Matrix42 <93...@qq.com>
Authored: Wed Dec 13 23:59:07 2017 +0800
Committer: Tzu-Li (Gordon) Tai <tz...@apache.org>
Committed: Sun Dec 17 23:23:48 2017 -0800
----------------------------------------------------------------------
.../streaming/api/environment/StreamExecutionEnvironment.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/0e27e208/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironment.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironment.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironment.java
index cc45ddc..355d277 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironment.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/environment/StreamExecutionEnvironment.java
@@ -439,7 +439,7 @@ public abstract class StreamExecutionEnvironment {
* from operations on {@link org.apache.flink.streaming.api.datastream.KeyedStream}) is maintained
* (heap, managed memory, externally), and where state snapshots/checkpoints are stored, both for
* the key/value state, and for checkpointed functions (implementing the interface
- * {@link org.apache.flink.streaming.api.checkpoint.Checkpointed}).
+ * {@link org.apache.flink.streaming.api.checkpoint.CheckpointedFunction}).
*
* <p>The {@link org.apache.flink.runtime.state.memory.MemoryStateBackend} for example
* maintains the state in heap memory, as objects. It is lightweight without extra dependencies,
[2/3] flink git commit: [FLINK-8249] [kinesis] Fix setting region on
KinesisProducerConfiguration
Posted by tz...@apache.org.
[FLINK-8249] [kinesis] Fix setting region on KinesisProducerConfiguration
This closes #5160.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/dbbaa9a4
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/dbbaa9a4
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/dbbaa9a4
Branch: refs/heads/release-1.4
Commit: dbbaa9a4a761a22e402f08745775ce357dddac06
Parents: 0e27e20
Author: eskabetxe <bo...@boto.pro>
Authored: Wed Dec 13 12:43:27 2017 +0100
Committer: Tzu-Li (Gordon) Tai <tz...@apache.org>
Committed: Sun Dec 17 23:23:55 2017 -0800
----------------------------------------------------------------------
.../connectors/kinesis/util/KinesisConfigUtil.java | 1 +
.../connectors/kinesis/util/KinesisConfigUtilTest.java | 10 ++++++++++
2 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/dbbaa9a4/flink-connectors/flink-connector-kinesis/src/main/java/org/apache/flink/streaming/connectors/kinesis/util/KinesisConfigUtil.java
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-kinesis/src/main/java/org/apache/flink/streaming/connectors/kinesis/util/KinesisConfigUtil.java b/flink-connectors/flink-connector-kinesis/src/main/java/org/apache/flink/streaming/connectors/kinesis/util/KinesisConfigUtil.java
index cadde8d..6c91206 100644
--- a/flink-connectors/flink-connector-kinesis/src/main/java/org/apache/flink/streaming/connectors/kinesis/util/KinesisConfigUtil.java
+++ b/flink-connectors/flink-connector-kinesis/src/main/java/org/apache/flink/streaming/connectors/kinesis/util/KinesisConfigUtil.java
@@ -191,6 +191,7 @@ public class KinesisConfigUtil {
}
KinesisProducerConfiguration kpc = KinesisProducerConfiguration.fromProperties(config);
+ kpc.setRegion(config.getProperty(AWSConfigConstants.AWS_REGION));
kpc.setCredentialsProvider(AWSUtil.getCredentialsProvider(config));
http://git-wip-us.apache.org/repos/asf/flink/blob/dbbaa9a4/flink-connectors/flink-connector-kinesis/src/test/java/org/apache/flink/streaming/connectors/kinesis/util/KinesisConfigUtilTest.java
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-kinesis/src/test/java/org/apache/flink/streaming/connectors/kinesis/util/KinesisConfigUtilTest.java b/flink-connectors/flink-connector-kinesis/src/test/java/org/apache/flink/streaming/connectors/kinesis/util/KinesisConfigUtilTest.java
index b52dce2..053b0c3 100644
--- a/flink-connectors/flink-connector-kinesis/src/test/java/org/apache/flink/streaming/connectors/kinesis/util/KinesisConfigUtilTest.java
+++ b/flink-connectors/flink-connector-kinesis/src/test/java/org/apache/flink/streaming/connectors/kinesis/util/KinesisConfigUtilTest.java
@@ -131,6 +131,16 @@ public class KinesisConfigUtilTest {
assertEquals("2", replacedConfig.getProperty(KinesisConfigUtil.COLLECTION_MAX_COUNT));
}
+ @Test
+ public void testCorrectlySetRegionInProducerConfiguration() {
+ String region = "us-east-1";
+ Properties testConfig = new Properties();
+ testConfig.setProperty(AWSConfigConstants.AWS_REGION, region);
+ KinesisProducerConfiguration kpc = KinesisConfigUtil.getValidatedProducerConfiguration(testConfig);
+
+ assertEquals("incorrect region", region, kpc.getRegion());
+ }
+
// ----------------------------------------------------------------------
// validateAwsConfiguration() tests
// ----------------------------------------------------------------------
[3/3] flink git commit: [hotfix] [doc] Fix typo in TaskManager and
EnvironmentInformation doc
Posted by tz...@apache.org.
[hotfix] [doc] Fix typo in TaskManager and EnvironmentInformation doc
This closes #5135.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/f638dedd
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/f638dedd
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/f638dedd
Branch: refs/heads/release-1.4
Commit: f638deddb78bc236606cacf19b2f9f973d447b25
Parents: dbbaa9a
Author: Cristian <me...@cristian.io>
Authored: Thu Dec 7 11:00:00 2017 -0800
Committer: Tzu-Li (Gordon) Tai <tz...@apache.org>
Committed: Sun Dec 17 23:24:30 2017 -0800
----------------------------------------------------------------------
.../org/apache/flink/runtime/util/EnvironmentInformation.java | 2 +-
.../org/apache/flink/runtime/taskmanager/TaskManager.scala | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/f638dedd/flink-runtime/src/main/java/org/apache/flink/runtime/util/EnvironmentInformation.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/util/EnvironmentInformation.java b/flink-runtime/src/main/java/org/apache/flink/runtime/util/EnvironmentInformation.java
index a2a64cf..e700256 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/util/EnvironmentInformation.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/util/EnvironmentInformation.java
@@ -259,7 +259,7 @@ public class EnvironmentInformation {
}
/**
- * Logs a information about the environment, like code revision, current user, java version,
+ * Logs information about the environment, like code revision, current user, Java version,
* and JVM parameters.
*
* @param log The logger to log the information to.
http://git-wip-us.apache.org/repos/asf/flink/blob/f638dedd/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala
index f948df4..9979618 100644
--- a/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala
+++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala
@@ -585,8 +585,8 @@ class TaskManager(
config.getMaxRegistrationPause().toMilliseconds,
TimeUnit.MILLISECONDS))
- // schedule (with our timeout s delay) a check triggers a new registration
- // attempt, if we are not registered by then
+ // schedule a check to trigger a new registration attempt if not registered
+ // by the timeout
scheduledTaskManagerRegistration = Option(context.system.scheduler.scheduleOnce(
timeout,
self,
@@ -1898,7 +1898,7 @@ object TaskManager {
}
/**
- * Starts and runs the TaskManager. with all its components trying to bind to
+ * Starts and runs the TaskManager with all its components trying to bind to
* a port in the specified range.
*
* @param taskManagerHostname The hostname/address of the interface where the actor system