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 2016/03/18 04:08:40 UTC
[1/3] flink git commit: [hotfix] [docs] Fix typo 'seperate'
Repository: flink
Updated Branches:
refs/heads/master f866de6ec -> 6968d07df
[hotfix] [docs] Fix typo 'seperate'
This closes #1810.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/d1071055
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/d1071055
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/d1071055
Branch: refs/heads/master
Commit: d10710559bf69a6aa39a48ea149d043959d068ac
Parents: f866de6
Author: Andrea Sella <an...@radicalbit.io>
Authored: Thu Mar 17 11:58:59 2016 +0100
Committer: Chiwan Park <ch...@apache.org>
Committed: Fri Mar 18 12:02:29 2016 +0900
----------------------------------------------------------------------
docs/setup/jobmanager_high_availability.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/d1071055/docs/setup/jobmanager_high_availability.md
----------------------------------------------------------------------
diff --git a/docs/setup/jobmanager_high_availability.md b/docs/setup/jobmanager_high_availability.md
index f731d14..ea2a460 100644
--- a/docs/setup/jobmanager_high_availability.md
+++ b/docs/setup/jobmanager_high_availability.md
@@ -78,7 +78,7 @@ In order to start an HA-cluster add the following configuration keys to `conf/fl
<pre>recovery.zookeeper.path.root: /flink # important: customize per cluster</pre>
- **Important**: if you are running multiple Flink HA clusters, you have to manually configure seperate root nodes for each cluster.
+ **Important**: if you are running multiple Flink HA clusters, you have to manually configure separate root nodes for each cluster.
- **State backend and storage directory** (required): JobManager meta data is persisted in the *state backend* and only a pointer to this state is stored in ZooKeeper. Currently, only the file system state backend is supported in HA mode.
@@ -89,7 +89,7 @@ recovery.zookeeper.storageDir: hdfs:///flink/recovery</pre>
The `storageDir` stores all meta data needed to recover a JobManager failure.
-After configuring the masters and the ZooKeeper quorum, you can use the provided cluster startup scripts as usual. They will start an HA-cluster. Keep in mind that the **ZooKeeper quorum has to be running** when you call the scripts and make sure to **configure a seperate ZooKeeper root path** for each HA cluster you are starting.
+After configuring the masters and the ZooKeeper quorum, you can use the provided cluster startup scripts as usual. They will start an HA-cluster. Keep in mind that the **ZooKeeper quorum has to be running** when you call the scripts and make sure to **configure a separate ZooKeeper root path** for each HA cluster you are starting.
#### Example: Standalone Cluster with 2 JobManagers
[3/3] flink git commit: [hotfix] [docs] Fix broken link for time.htm,
changed to event_time.html
Posted by ch...@apache.org.
[hotfix] [docs] Fix broken link for time.htm, changed to event_time.html
This closes #1816.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/6968d07d
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/6968d07d
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/6968d07d
Branch: refs/heads/master
Commit: 6968d07df91a40e9078e5ca39a5f67d3c3267f4a
Parents: f42f4da
Author: smarthi <sm...@apache.org>
Authored: Thu Mar 17 17:17:38 2016 -0400
Committer: Chiwan Park <ch...@apache.org>
Committed: Fri Mar 18 12:07:45 2016 +0900
----------------------------------------------------------------------
docs/apis/streaming/windows.md | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/6968d07d/docs/apis/streaming/windows.md
----------------------------------------------------------------------
diff --git a/docs/apis/streaming/windows.md b/docs/apis/streaming/windows.md
index 8af303b..98466a8 100644
--- a/docs/apis/streaming/windows.md
+++ b/docs/apis/streaming/windows.md
@@ -57,7 +57,7 @@ to defining your own windows.
<p>
Defines a window of 5 seconds, that "tumbles". This means that elements are
grouped according to their timestamp in groups of 5 second duration, and every element belongs to exactly one window.
- The notion of time is specified by the selected TimeCharacteristic (see <a href="{{ site.baseurl }}/apis/streaming/time.html">time</a>).
+ The notion of time is specified by the selected TimeCharacteristic (see <a href="{{ site.baseurl }}/apis/streaming/event_time.html">time</a>).
{% highlight java %}
keyedStream.timeWindow(Time.seconds(5));
{% endhighlight %}
@@ -71,7 +71,7 @@ keyedStream.timeWindow(Time.seconds(5));
Defines a window of 5 seconds, that "slides" by 1 seconds. This means that elements are
grouped according to their timestamp in groups of 5 second duration, and elements can belong to more than
one window (since windows overlap by at most 4 seconds)
- The notion of time is specified by the selected TimeCharacteristic (see <a href="{{ site.baseurl }}/apis/streaming/time.html">time</a>).
+ The notion of time is specified by the selected TimeCharacteristic (see <a href="{{ site.baseurl }}/apis/streaming/event_time.html">time</a>).
{% highlight java %}
keyedStream.timeWindow(Time.seconds(5), Time.seconds(1));
{% endhighlight %}
@@ -127,7 +127,7 @@ keyedStream.countWindow(1000, 100)
<p>
Defines a window of 5 seconds, that "tumbles". This means that elements are
grouped according to their timestamp in groups of 5 second duration, and every element belongs to exactly one window.
- The notion of time is specified by the selected TimeCharacteristic (see <a href="{{ site.baseurl }}/apis/streaming/time.html">time</a>).
+ The notion of time is specified by the selected TimeCharacteristic (see <a href="{{ site.baseurl }}/apis/streaming/event_time.html">time</a>).
{% highlight scala %}
keyedStream.timeWindow(Time.seconds(5))
{% endhighlight %}
@@ -141,7 +141,7 @@ keyedStream.timeWindow(Time.seconds(5))
Defines a window of 5 seconds, that "slides" by 1 seconds. This means that elements are
grouped according to their timestamp in groups of 5 second duration, and elements can belong to more than
one window (since windows overlap by at most 4 seconds)
- The notion of time is specified by the selected TimeCharacteristic (see <a href="{{ site.baseurl }}/apis/streaming/time.html">time</a>).
+ The notion of time is specified by the selected TimeCharacteristic (see <a href="{{ site.baseurl }}/apis/streaming/event_time.html">time</a>).
{% highlight scala %}
keyedStream.timeWindow(Time.seconds(5), Time.seconds(1))
{% endhighlight %}
[2/3] flink git commit: [hotfix] Fix typo 'JobManger'
Posted by ch...@apache.org.
[hotfix] Fix typo 'JobManger'
This closes #1812.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/f42f4da3
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/f42f4da3
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/f42f4da3
Branch: refs/heads/master
Commit: f42f4da34d405e489120a8fb20554003aa6c380b
Parents: d107105
Author: Stefano Baghino <st...@radicalbit.io>
Authored: Thu Mar 17 12:58:12 2016 +0100
Committer: Chiwan Park <ch...@apache.org>
Committed: Fri Mar 18 12:03:02 2016 +0900
----------------------------------------------------------------------
.../org/apache/flink/runtime/jobmanager/JobManager.scala | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/f42f4da3/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala
index 95305f3..518336c 100644
--- a/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala
+++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala
@@ -1858,7 +1858,7 @@ object JobManager {
val webMonitor: Option[WebMonitor] =
if (configuration.getInteger(ConfigConstants.JOB_MANAGER_WEB_PORT_KEY, 0) >= 0) {
- LOG.info("Starting JobManger web frontend")
+ LOG.info("Starting JobManager web frontend")
val leaderRetrievalService = LeaderRetrievalUtils
.createLeaderRetrievalService(configuration)
@@ -2228,7 +2228,7 @@ object JobManager {
*
* @param configuration The configuration for the JobManager
* @param actorSystem The actor system running the JobManager
- * @param jobMangerActorName Optionally the name of the JobManager actor. If none is given,
+ * @param jobManagerActorName Optionally the name of the JobManager actor. If none is given,
* the actor will have the name generated by the actor system.
* @param archiveActorName Optionally the name of the archive actor. If none is given,
* the actor will have the name generated by the actor system.
@@ -2239,7 +2239,7 @@ object JobManager {
def startJobManagerActors(
configuration: Configuration,
actorSystem: ActorSystem,
- jobMangerActorName: Option[String],
+ jobManagerActorName: Option[String],
archiveActorName: Option[String],
jobManagerClass: Class[_ <: JobManager],
archiveClass: Class[_ <: MemoryArchivist])
@@ -2284,7 +2284,7 @@ object JobManager {
savepointStore,
jobRecoveryTimeout)
- val jobManager: ActorRef = jobMangerActorName match {
+ val jobManager: ActorRef = jobManagerActorName match {
case Some(actorName) => actorSystem.actorOf(jobManagerProps, actorName)
case None => actorSystem.actorOf(jobManagerProps)
}