This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/asf-site by this push: new c612cc8 Publishing website 2020/04/01 08:05:11 at commit cf7ca7c c612cc8 is described below commit c612cc8b1eda4f5aa0fa524aa20303cd816d402b Author: jenkins <bui...@apache.org> AuthorDate: Wed Apr 1 08:05:12 2020 +0000 Publishing website 2020/04/01 08:05:11 at commit cf7ca7c --- website/generated-content/css/site.css | 8 +- .../documentation/runners/jet/index.html | 91 ++++++++++++++++++---- website/generated-content/js/language-switch.js | 7 +- 3 files changed, 83 insertions(+), 23 deletions(-) diff --git a/website/generated-content/css/site.css b/website/generated-content/css/site.css index e8d4082..c52a407 100644 --- a/website/generated-content/css/site.css +++ b/website/generated-content/css/site.css @@ -6113,17 +6113,17 @@ div.cap-toggle { See the License for the specific language governing permissions and limitations under the License. */ -nav.language-switcher, nav.runner-switcher { +nav.language-switcher, nav.runner-switcher, nav.version-switcher { margin: 25px 0; } - nav.language-switcher ul, nav.runner-switcher ul { + nav.language-switcher ul, nav.runner-switcher ul, nav.version-switcher ul { display: inline; padding-left: 5px; } - nav.language-switcher ul li, nav.runner-switcher ul li { + nav.language-switcher ul li, nav.runner-switcher ul li, nav.version-switcher ul li { display: inline; cursor: pointer; padding: 10px; background-color: #f8f8f8; } - nav.language-switcher ul li.active, nav.runner-switcher ul li.active { + nav.language-switcher ul li.active, nav.runner-switcher ul li.active, nav.version-switcher ul li.active { background-color: #222c37; color: #fff; } diff --git a/website/generated-content/documentation/runners/jet/index.html b/website/generated-content/documentation/runners/jet/index.html index 747cabb..01cd2e3 100644 --- a/website/generated-content/documentation/runners/jet/index.html +++ b/website/generated-content/documentation/runners/jet/index.html @@ -232,7 +232,7 @@ limitations under the License. <h2 id="overview">Overview</h2> -<p>The Hazelcast Jet Runner can be used to execute Beam pipelines using <a href="https://jet.hazelcast.org/">Hazelcast +<p>The Hazelcast Jet Runner can be used to execute Beam pipelines using <a href="https://jet-start.sh/">Hazelcast Jet</a>.</p> <p>The Jet Runner and Jet are suitable for large scale continuous jobs and provide:</p> @@ -273,23 +273,73 @@ supported capabilities of the Jet Runner.</p> </code></pre></div></div> <h3 id="running-wordcount-on-a-remote-jet-cluster">Running WordCount on a Remote Jet Cluster</h3> -<p>Download latest stable Hazelcast Jet code from <a href="https://jet.hazelcast.org/download/">Hazelcast Website</a> and -start Jet cluster. -The simplest way is to start Jet cluster member using the <code class="highlighter-rouge">jet-start</code> script that comes with Jet distribution. -The members use the <a href="https://docs.hazelcast.org/docs/3.12/manual/html-single/index.html#setting-up-clusters">auto discovery feature</a> +<p>The Beam examples project, when generated from an archetype, comes from a particular released Beam version (that’s what +the <code class="highlighter-rouge">archetypeVersion</code> property is about). Each Beam version that contains the Jet Runner (ie. from 2.14.0 onwards) +uses a certain version of Jet. Because of this, when we start a stand-alone Jet cluster and try to run Beam examples on +it we need to make sure the two are compatible. See following table for which Jet version is recommended for various +Beam versions.</p> + +<table class="table table-bordered"> +<tr> + <th>Beam Version</th> + <th>Compatible Jet Versions</th> +</tr> +<tr> + <td>2.20.0 or newer</td> + <td>4.x</td> +</tr> +<tr> + <td>2.14.0 - 2.19.0</td> + <td>3.x</td> +</tr> +<tr> + <td>2.13.0 or older</td> + <td>N/A</td> +</tr> +</table> + +<p>Download latest Hazelcast Jet version compatible with the Beam you are using from +<a href="https://jet-start.sh/download">Hazelcast Jet Website</a>.</p> + +<nav class="version-switcher"> + <strong>Adapt for:</strong> + <ul> + <li data-type="version-jet3">Hazelcast Jet 3.x</li> + <li data-type="version-jet4">Hazelcast Jet 4.x</li> + </ul> +</nav> + +<p>Once the download has finished you need to start a Jet cluster. The simplest way to do so is to start Jet cluster +members using the <code class="highlighter-rouge">jet-start</code> script that comes with the downloaded Jet distribution. The members use the +<span class="version-jet3"> +<a href="https://docs.hazelcast.org/docs/3.12/manual/html-single/index.html#setting-up-clusters">auto discovery feature</a> +</span> +<span class="version-jet4"> +<a href="https://docs.hazelcast.org/docs/4.0/manual/html-single/#setting-up-clusters">auto discovery feature</a> +</span> to form a cluster. Let’s start up a cluster formed by two members:</p> -<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code> $ cd hazelcast-jet - $ bin/jet-start.sh & - $ bin/jet-start.sh & +<div class="version-jet3 highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ cd hazelcast-jet +$ bin/jet-start.sh & +$ bin/jet-start.sh & +</code></pre></div></div> + +<div class="version-jet4 highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ cd hazelcast-jet +$ bin/jet-start & +$ bin/jet-start & </code></pre></div></div> <p>Check the cluster is up and running:</p> -<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code> $ ./jet.sh cluster + +<div class="version-jet3 highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ bin/jet.sh cluster +</code></pre></div></div> + +<div class="version-jet4 highlighter-rouge"><div class="highlight"><pre class="highlight"><code>$ bin/jet cluster </code></pre></div></div> <p>You should see something like:</p> -<div class="highlighter-rouge"><div class="highlight"><pre class="highlight"><code>State: ACTIVE + +<div class="version-jet3 highlighter-rouge"><div class="highlight"><pre class="highlight"><code>State: ACTIVE Version: 3.0 Size: 2 @@ -298,8 +348,14 @@ ADDRESS UUID [192.168.0.117]:5702 03ecfaa2-be16-41b6-b5cf-eea584d7fb86 </code></pre></div></div> -<p>Download <a href="https://docs.hazelcast.org/docs/jet-management-center/3.0/manual/">Jet Management Center</a> -from the same location and use it to monitor your cluster and later executions.</p> +<div class="version-jet4 highlighter-rouge"><div class="highlight"><pre class="highlight"><code>State: ACTIVE +Version: 4.0 +Size: 2 + +ADDRESS UUID +[192.168.0.117]:5701 b9937bba-32aa-48ba-8e32-423aafed763b +[192.168.0.117]:5702 dfeadfb2-3ba5-4d1c-95e7-71a1a3ca4937 +</code></pre></div></div> <p>Change directory to the Beam Examples project and issue following command to submit and execute your Pipeline on the remote Jet cluster. @@ -332,10 +388,13 @@ cluster runs. The word count job won’t be able to read the data otherwise.</p> <td>Set to <code>JetRunner</code> to run using Jet.</td> </tr> <tr> - <td><code>jetGroupName</code></td> - <td>The name of the Hazelcast Group to join, in essence an ID of the Jet Cluster that will be - used by the Runner. With groups it is possible to create multiple clusters where each cluster has its own - group and doesn't interfere with other clusters.</td> + <td><code><span class="version-jet3">jetGroupName</span><span class="version-jet4">jetClusterName</span></code></td> + <td> + <span class="version-jet3">The name of the Hazelcast Group to join, in essence an ID of the Jet Cluster that + will be used by the Runner. With groups it is possible to create multiple clusters where each cluster has its + own group and doesn't interfere with other clusters.</span> + <span class="version-jet4">The name of the Hazelcast Cluster that will be used by the Runner.</span> + </td> <td><code>jet</code></td> </tr> <tr> diff --git a/website/generated-content/js/language-switch.js b/website/generated-content/js/language-switch.js index 6c30e88..57d8f20 100644 --- a/website/generated-content/js/language-switch.js +++ b/website/generated-content/js/language-switch.js @@ -46,7 +46,7 @@ $(document).ready(function() { /** * @desc Extract language from provided text. * @param string $text - string containing language, e.g language-python. - * @return string - cleaned name of languge, e.g python. + * @return string - cleaned name of language, e.g python. */ "parseName": function(str) { var re = new RegExp(prefix + "(\\w+)"); @@ -69,7 +69,7 @@ $(document).ready(function() { /** * @desc Search next sibling and if it's also a code block, then store it's type and move onto the next element. It will keep - looking untill their is no direct code block decendent left. + looking until there is no direct code block descendant left. * @param object $el - jQuery object, from where to start searching. * @param array $lang - list to hold types, found while searching. * @return array - list of types found. @@ -104,7 +104,7 @@ $(document).ready(function() { if(!isPrefSelected) { pref = this.default; - + $("." + this.wrapper + " li").each(function() { if ($(this).data("type") === pref) { $(this).addClass("active"); @@ -128,4 +128,5 @@ $(document).ready(function() { Switcher({"class-prefix":"language","default":"java"}).render(); Switcher({"class-prefix":"runner","default":"direct"}).render(); Switcher({"class-prefix":"shell","default":"unix"}).render(); + Switcher({"class-prefix":"version"}).render(); });