Author: slebresne Date: Wed Sep 14 09:42:28 2016 New Revision: 1760665 URL: http://svn.apache.org/viewvc?rev=1760665&view=rev Log: Don't convert newlines in markdown to <br /> tags, it looks bad
Modified: cassandra/site/publish/community/index.html cassandra/site/publish/doc/3.7/configuration/cassandra_config_file.html cassandra/site/publish/doc/3.7/operating/metrics.html cassandra/site/publish/doc/latest/configuration/cassandra_config_file.html cassandra/site/publish/doc/latest/operating/metrics.html cassandra/site/publish/download/index.html cassandra/site/src/_config.yml Modified: cassandra/site/publish/community/index.html URL: http://svn.apache.org/viewvc/cassandra/site/publish/community/index.html?rev=1760665&r1=1760664&r2=1760665&view=diff ============================================================================== --- cassandra/site/publish/community/index.html (original) +++ cassandra/site/publish/community/index.html Wed Sep 14 09:42:28 2016 @@ -98,13 +98,13 @@ <p>Discussion and questions on Cassandraâs usage and development happens mainly on the following mailing lists:</p> <ul> - <li><a href="http://www.mail-archive.com/user@cassandra.apache.org/">Users</a>: General mailing list for user questions and discussions. This is also where new releases are announced<br /> + <li><a href="http://www.mail-archive.com/user@cassandra.apache.org/">Users</a>: General mailing list for user questions and discussions. This is also where new releases are announced (<a href="mailto:user-subscribe@cassandra.apache.org">subscribe</a> | <a href="mailto:user-unsubscribe@cassandra.apache.org">unsubscribe</a> | <a href="https://lists.apache.org/list.html?u...@cassandra.apache.org">Archives</a>).</li> - <li><a href="http://www.mail-archive.com/dev@cassandra.apache.org/">Developers</a>: Questions and discussions related to Cassandra development<br /> + <li><a href="http://www.mail-archive.com/dev@cassandra.apache.org/">Developers</a>: Questions and discussions related to Cassandra development (<a href="mailto:dev-subscribe@cassandra.apache.org">subscribe</a> | <a href="mailto:dev-unsubscribe@cassandra.apache.org">unsubscribe</a> | <a href="https://lists.apache.org/list.html?d...@cassandra.apache.org">Archives</a>).</li> - <li><a href="http://www.mail-archive.com/commits@cassandra.apache.org/">Commits</a>: Notification on commits done to the source<br /> -repository and on <a href="https://issues.apache.org/jira/browse/CASSANDRA">JIRA</a> updates. This is a fairly noisy mailing list<br /> -mostly useful for Cassandra developers and those who would like to keep close tabs on Cassandraâs development<br /> + <li><a href="http://www.mail-archive.com/commits@cassandra.apache.org/">Commits</a>: Notification on commits done to the source +repository and on <a href="https://issues.apache.org/jira/browse/CASSANDRA">JIRA</a> updates. This is a fairly noisy mailing list +mostly useful for Cassandra developers and those who would like to keep close tabs on Cassandraâs development (<a href="mailto:commits-subscribe@cassandra.apache.org">subscribe</a> | <a href="mailto:commits-unsubscribe@cassandra.apache.org">unsubscribe</a> | <a href="https://lists.apache.org/list.html?commits@cassandra.apache.org">Archives</a>).</li> </ul> @@ -120,29 +120,29 @@ mostly useful for Cassandra developers a <h3 id="stack-overflow">Stack Overflow</h3> -<p>You can also check the <a href="http://stackoverflow.com/questions/tagged/cassandra">Q&A about using Cassandra</a> on Stack<br /> +<p>You can also check the <a href="http://stackoverflow.com/questions/tagged/cassandra">Q&A about using Cassandra</a> on Stack Overflow.</p> <h3 id="news-articles-and-user-groups">News, articles and user groups</h3> -<p>You can find a number of news, articles and use cases, as well a links to Cassandra user groups on the <a href="http://planetcassandra.org/">Planet<br /> +<p>You can find a number of news, articles and use cases, as well a links to Cassandra user groups on the <a href="http://planetcassandra.org/">Planet Cassandra</a> (not endorsed by Apache).</p> <h3 id="dead-trees">Dead Trees</h3> <ul> - <li><a href="http://shop.oreilly.com/product/0636920043041.do">Cassandra: The Definitive Guide, 2nd Edition</a>, by Jeff Carpenter and<br /> + <li><a href="http://shop.oreilly.com/product/0636920043041.do">Cassandra: The Definitive Guide, 2nd Edition</a>, by Jeff Carpenter and Eben Hewitt. Updated for Cassandra 3.0</li> </ul> <h3 id="reporting-bugs">Reporting bugs</h3> -<p>If you encounter a problem with Cassandra, the first places to ask for help are the <a href="#mailing">user mailing list</a><br /> +<p>If you encounter a problem with Cassandra, the first places to ask for help are the <a href="#mailing">user mailing list</a> and the <code class="highlighter-rouge">#cassandra</code> <a href="#irc">IRC channel</a>.</p> -<p>If, after having asked for help, you suspect that you have found a bug in Cassandra, you should report it by opening a<br /> -ticket through the <a href="https://issues.apache.org/jira/browse/CASSANDRA">Apache Cassandra JIRA</a>. Please provide as much<br /> -details as you can on your problem, and donât forget to indicate which version of Cassandra you are running and on which<br /> +<p>If, after having asked for help, you suspect that you have found a bug in Cassandra, you should report it by opening a +ticket through the <a href="https://issues.apache.org/jira/browse/CASSANDRA">Apache Cassandra JIRA</a>. Please provide as much +details as you can on your problem, and donât forget to indicate which version of Cassandra you are running and on which environment.</p> </div> Modified: cassandra/site/publish/doc/3.7/configuration/cassandra_config_file.html URL: http://svn.apache.org/viewvc/cassandra/site/publish/doc/3.7/configuration/cassandra_config_file.html?rev=1760665&r1=1760664&r2=1760665&view=diff ============================================================================== --- cassandra/site/publish/doc/3.7/configuration/cassandra_config_file.html (original) +++ cassandra/site/publish/doc/3.7/configuration/cassandra_config_file.html Wed Sep 14 09:42:28 2016 @@ -242,7 +242,7 @@ <li class="toctree-l3"><a class="reference internal" href="#request-timeout-in-ms"><code class="docutils literal"><span class="pre">request_timeout_in_ms</span></code></a></li> <li class="toctree-l3"><a class="reference internal" href="#slow-query-log-timeout-in-ms"><code class="docutils literal"><span class="pre">slow_query_log_timeout_in_ms</span></code></a></li> <li class="toctree-l3"><a class="reference internal" href="#cross-node-timeout"><code class="docutils literal"><span class="pre">cross_node_timeout</span></code></a></li> -<li class="toctree-l3"><a class="reference internal" href="#streaming-keep-alive-period-in-secs"><code class="docutils literal"><span class="pre">streaming_keep_alive_period_in_secs</span></code></a></li> +<li class="toctree-l3"><a class="reference internal" href="#streaming-socket-timeout-in-ms"><code class="docutils literal"><span class="pre">streaming_socket_timeout_in_ms</span></code></a></li> <li class="toctree-l3"><a class="reference internal" href="#phi-convict-threshold"><code class="docutils literal"><span class="pre">phi_convict_threshold</span></code></a></li> <li class="toctree-l3"><a class="reference internal" href="#endpoint-snitch"><code class="docutils literal"><span class="pre">endpoint_snitch</span></code></a></li> <li class="toctree-l3"><a class="reference internal" href="#dynamic-snitch-update-interval-in-ms"><code class="docutils literal"><span class="pre">dynamic_snitch_update_interval_in_ms</span></code></a></li> @@ -1398,16 +1398,16 @@ already-timed-out requests.</p> and the times are synchronized between the nodes.</p> <p><em>Default Value:</em> false</p> </div> -<div class="section" id="streaming-keep-alive-period-in-secs"> -<h2><code class="docutils literal"><span class="pre">streaming_keep_alive_period_in_secs</span></code><a class="headerlink" href="#streaming-keep-alive-period-in-secs" title="Permalink to this headline">¶</a></h2> +<div class="section" id="streaming-socket-timeout-in-ms"> +<h2><code class="docutils literal"><span class="pre">streaming_socket_timeout_in_ms</span></code><a class="headerlink" href="#streaming-socket-timeout-in-ms" title="Permalink to this headline">¶</a></h2> <p><em>This option is commented out by default.</em></p> -<p>Set keep-alive period for streaming -This node will send a keep-alive message periodically with this period. -If the node does not receive a keep-alive message from the peer for -2 keep-alive cycles the stream session times out and fail -Default value is 300s (5 minutes), which means stalled stream -times out in 10 minutes by default</p> -<p><em>Default Value:</em> 300</p> +<p>Set socket timeout for streaming operation. +The stream session is failed if no data/ack is received by any of the participants +within that period, which means this should also be sufficient to stream a large +sstable or rebuild table indexes. +Default value is 86400000ms, which means stale streams timeout after 24 hours. +A value of zero means stream sockets should never time out.</p> +<p><em>Default Value:</em> 86400000</p> </div> <div class="section" id="phi-convict-threshold"> <h2><code class="docutils literal"><span class="pre">phi_convict_threshold</span></code><a class="headerlink" href="#phi-convict-threshold" title="Permalink to this headline">¶</a></h2> Modified: cassandra/site/publish/doc/3.7/operating/metrics.html URL: http://svn.apache.org/viewvc/cassandra/site/publish/doc/3.7/operating/metrics.html?rev=1760665&r1=1760664&r2=1760665&view=diff ============================================================================== --- cassandra/site/publish/doc/3.7/operating/metrics.html (original) +++ cassandra/site/publish/doc/3.7/operating/metrics.html Wed Sep 14 09:42:28 2016 @@ -647,63 +647,39 @@ specific type.</p> <col width="65%" /> </colgroup> <thead valign="bottom"> -<tr class="row-odd"><th class="head"><p class="first last">Name</p> -</th> -<th class="head"><p class="first last">Type</p> -</th> -<th class="head"><p class="first last">Description</p> -</th> +<tr class="row-odd"><th class="head">Name</th> +<th class="head">Type</th> +<th class="head">Description</th> </tr> </thead> <tbody valign="top"> -<tr class="row-even"><td><p class="first last">Timeouts</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of timeouts encountered.</p> -</td> -</tr> -<tr class="row-odd"><td><p class="first last">Failures</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of transaction failures encountered.</p> -</td> -</tr> -<tr class="row-even"><td><p class="first last"> </p> -</td> -<td><p class="first last">Latency</p> -</td> -<td><p class="first last">Transaction read latency.</p> -</td> -</tr> -<tr class="row-odd"><td><p class="first last">Unavailables</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of unavailable exceptions encountered.</p> -</td> -</tr> -<tr class="row-even"><td><p class="first last">UnfinishedCommit</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of transactions that were committed on read.</p> -</td> -</tr> -<tr class="row-odd"><td><p class="first last">ConditionNotMet</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of transaction preconditions did not match current values.</p> -</td> -</tr> -<tr class="row-even"><td><p class="first last">ContentionHistogram</p> -</td> -<td><p class="first last">Histogram</p> -</td> -<td><p class="first last">How many contended reads were encountered</p> -</td> +<tr class="row-even"><td>Timeouts</td> +<td>Counter</td> +<td>Number of timeouts encountered.</td> +</tr> +<tr class="row-odd"><td>Failures</td> +<td>Counter</td> +<td>Number of transaction failures encountered.</td> +</tr> +<tr class="row-even"><td> </td> +<td>Latency</td> +<td>Transaction read latency.</td> +</tr> +<tr class="row-odd"><td>Unavailables</td> +<td>Counter</td> +<td>Number of unavailable exceptions encountered.</td> +</tr> +<tr class="row-even"><td>UnfinishedCommit</td> +<td>Counter</td> +<td>Number of transactions that were committed on read.</td> +</tr> +<tr class="row-odd"><td>ConditionNotMet</td> +<td>Counter</td> +<td>Number of transaction preconditions did not match current values.</td> +</tr> +<tr class="row-even"><td>ContentionHistogram</td> +<td>Histogram</td> +<td>How many contended reads were encountered</td> </tr> </tbody> </table> @@ -722,56 +698,35 @@ specific type.</p> <col width="65%" /> </colgroup> <thead valign="bottom"> -<tr class="row-odd"><th class="head"><p class="first last">Name</p> -</th> -<th class="head"><p class="first last">Type</p> -</th> -<th class="head"><p class="first last">Description</p> -</th> +<tr class="row-odd"><th class="head">Name</th> +<th class="head">Type</th> +<th class="head">Description</th> </tr> </thead> <tbody valign="top"> -<tr class="row-even"><td><p class="first last">Timeouts</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of timeouts encountered.</p> -</td> -</tr> -<tr class="row-odd"><td><p class="first last">Failures</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of transaction failures encountered.</p> -</td> -</tr> -<tr class="row-even"><td><p class="first last"> </p> -</td> -<td><p class="first last">Latency</p> -</td> -<td><p class="first last">Transaction write latency.</p> -</td> -</tr> -<tr class="row-odd"><td><p class="first last">UnfinishedCommit</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of transactions that were committed on write.</p> -</td> -</tr> -<tr class="row-even"><td><p class="first last">ConditionNotMet</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of transaction preconditions did not match current values.</p> -</td> -</tr> -<tr class="row-odd"><td><p class="first last">ContentionHistogram</p> -</td> -<td><p class="first last">Histogram</p> -</td> -<td><p class="first last">How many contended writes were encountered</p> -</td> +<tr class="row-even"><td>Timeouts</td> +<td>Counter</td> +<td>Number of timeouts encountered.</td> +</tr> +<tr class="row-odd"><td>Failures</td> +<td>Counter</td> +<td>Number of transaction failures encountered.</td> +</tr> +<tr class="row-even"><td> </td> +<td>Latency</td> +<td>Transaction write latency.</td> +</tr> +<tr class="row-odd"><td>UnfinishedCommit</td> +<td>Counter</td> +<td>Number of transactions that were committed on write.</td> +</tr> +<tr class="row-even"><td>ConditionNotMet</td> +<td>Counter</td> +<td>Number of transaction preconditions did not match current values.</td> +</tr> +<tr class="row-odd"><td>ContentionHistogram</td> +<td>Histogram</td> +<td>How many contended writes were encountered</td> </tr> </tbody> </table> @@ -790,42 +745,27 @@ specific type.</p> <col width="64%" /> </colgroup> <thead valign="bottom"> -<tr class="row-odd"><th class="head"><p class="first last">Name</p> -</th> -<th class="head"><p class="first last">Type</p> -</th> -<th class="head"><p class="first last">Description</p> -</th> +<tr class="row-odd"><th class="head">Name</th> +<th class="head">Type</th> +<th class="head">Description</th> </tr> </thead> <tbody valign="top"> -<tr class="row-even"><td><p class="first last">Timeouts</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of timeouts encountered.</p> -</td> -</tr> -<tr class="row-odd"><td><p class="first last">Failures</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of read failures encountered.</p> -</td> -</tr> -<tr class="row-even"><td><p class="first last"> </p> -</td> -<td><p class="first last">Latency</p> -</td> -<td><p class="first last">Read latency.</p> -</td> -</tr> -<tr class="row-odd"><td><p class="first last">Unavailables</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of unavailable exceptions encountered.</p> -</td> +<tr class="row-even"><td>Timeouts</td> +<td>Counter</td> +<td>Number of timeouts encountered.</td> +</tr> +<tr class="row-odd"><td>Failures</td> +<td>Counter</td> +<td>Number of read failures encountered.</td> +</tr> +<tr class="row-even"><td> </td> +<td>Latency</td> +<td>Read latency.</td> +</tr> +<tr class="row-odd"><td>Unavailables</td> +<td>Counter</td> +<td>Number of unavailable exceptions encountered.</td> </tr> </tbody> </table> @@ -844,42 +784,27 @@ specific type.</p> <col width="64%" /> </colgroup> <thead valign="bottom"> -<tr class="row-odd"><th class="head"><p class="first last">Name</p> -</th> -<th class="head"><p class="first last">Type</p> -</th> -<th class="head"><p class="first last">Description</p> -</th> +<tr class="row-odd"><th class="head">Name</th> +<th class="head">Type</th> +<th class="head">Description</th> </tr> </thead> <tbody valign="top"> -<tr class="row-even"><td><p class="first last">Timeouts</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of timeouts encountered.</p> -</td> -</tr> -<tr class="row-odd"><td><p class="first last">Failures</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of range query failures encountered.</p> -</td> -</tr> -<tr class="row-even"><td><p class="first last"> </p> -</td> -<td><p class="first last">Latency</p> -</td> -<td><p class="first last">Range query latency.</p> -</td> -</tr> -<tr class="row-odd"><td><p class="first last">Unavailables</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of unavailable exceptions encountered.</p> -</td> +<tr class="row-even"><td>Timeouts</td> +<td>Counter</td> +<td>Number of timeouts encountered.</td> +</tr> +<tr class="row-odd"><td>Failures</td> +<td>Counter</td> +<td>Number of range query failures encountered.</td> +</tr> +<tr class="row-even"><td> </td> +<td>Latency</td> +<td>Range query latency.</td> +</tr> +<tr class="row-odd"><td>Unavailables</td> +<td>Counter</td> +<td>Number of unavailable exceptions encountered.</td> </tr> </tbody> </table> @@ -898,42 +823,27 @@ specific type.</p> <col width="64%" /> </colgroup> <thead valign="bottom"> -<tr class="row-odd"><th class="head"><p class="first last">Name</p> -</th> -<th class="head"><p class="first last">Type</p> -</th> -<th class="head"><p class="first last">Description</p> -</th> +<tr class="row-odd"><th class="head">Name</th> +<th class="head">Type</th> +<th class="head">Description</th> </tr> </thead> <tbody valign="top"> -<tr class="row-even"><td><p class="first last">Timeouts</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of timeouts encountered.</p> -</td> -</tr> -<tr class="row-odd"><td><p class="first last">Failures</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of write failures encountered.</p> -</td> -</tr> -<tr class="row-even"><td><p class="first last"> </p> -</td> -<td><p class="first last">Latency</p> -</td> -<td><p class="first last">Write latency.</p> -</td> -</tr> -<tr class="row-odd"><td><p class="first last">Unavailables</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of unavailable exceptions encountered.</p> -</td> +<tr class="row-even"><td>Timeouts</td> +<td>Counter</td> +<td>Number of timeouts encountered.</td> +</tr> +<tr class="row-odd"><td>Failures</td> +<td>Counter</td> +<td>Number of write failures encountered.</td> +</tr> +<tr class="row-even"><td> </td> +<td>Latency</td> +<td>Write latency.</td> +</tr> +<tr class="row-odd"><td>Unavailables</td> +<td>Counter</td> +<td>Number of unavailable exceptions encountered.</td> </tr> </tbody> </table> @@ -952,54 +862,33 @@ specific type.</p> <col width="72%" /> </colgroup> <tbody valign="top"> -<tr class="row-odd"><td><p class="first last">Timeouts</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of timeouts encountered.</p> -</td> -</tr> -<tr class="row-even"><td><p class="first last">Failures</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of transaction failures encountered.</p> -</td> -</tr> -<tr class="row-odd"><td><p class="first last">Unavailables</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of unavailable exceptions encountered.</p> -</td> -</tr> -<tr class="row-even"><td><p class="first last">ViewReplicasAttempted</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Total number of attempted view replica writes.</p> -</td> -</tr> -<tr class="row-odd"><td><p class="first last">ViewReplicasSuccess</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Total number of succeded view replica writes.</p> -</td> -</tr> -<tr class="row-even"><td><p class="first last">ViewPendingMutations</p> -</td> -<td><p class="first last">Gauge<Long></p> -</td> -<td><p class="first last">ViewReplicasAttempted - ViewReplicasSuccess.</p> -</td> -</tr> -<tr class="row-odd"><td><p class="first last">ViewWriteLatency</p> -</td> -<td><p class="first last">Timer</p> -</td> -<td><p class="first last">Time between when mutation is applied to base table and when CL.ONE is achieved on view.</p> -</td> +<tr class="row-odd"><td>Timeouts</td> +<td>Counter</td> +<td>Number of timeouts encountered.</td> +</tr> +<tr class="row-even"><td>Failures</td> +<td>Counter</td> +<td>Number of transaction failures encountered.</td> +</tr> +<tr class="row-odd"><td>Unavailables</td> +<td>Counter</td> +<td>Number of unavailable exceptions encountered.</td> +</tr> +<tr class="row-even"><td>ViewReplicasAttempted</td> +<td>Counter</td> +<td>Total number of attempted view replica writes.</td> +</tr> +<tr class="row-odd"><td>ViewReplicasSuccess</td> +<td>Counter</td> +<td>Total number of succeded view replica writes.</td> +</tr> +<tr class="row-even"><td>ViewPendingMutations</td> +<td>Gauge<Long></td> +<td>ViewReplicasAttempted - ViewReplicasSuccess.</td> +</tr> +<tr class="row-odd"><td>ViewWriteLatency</td> +<td>Timer</td> +<td>Time between when mutation is applied to base table and when CL.ONE is achieved on view.</td> </tr> </tbody> </table> Modified: cassandra/site/publish/doc/latest/configuration/cassandra_config_file.html URL: http://svn.apache.org/viewvc/cassandra/site/publish/doc/latest/configuration/cassandra_config_file.html?rev=1760665&r1=1760664&r2=1760665&view=diff ============================================================================== --- cassandra/site/publish/doc/latest/configuration/cassandra_config_file.html (original) +++ cassandra/site/publish/doc/latest/configuration/cassandra_config_file.html Wed Sep 14 09:42:28 2016 @@ -242,7 +242,7 @@ <li class="toctree-l3"><a class="reference internal" href="#request-timeout-in-ms"><code class="docutils literal"><span class="pre">request_timeout_in_ms</span></code></a></li> <li class="toctree-l3"><a class="reference internal" href="#slow-query-log-timeout-in-ms"><code class="docutils literal"><span class="pre">slow_query_log_timeout_in_ms</span></code></a></li> <li class="toctree-l3"><a class="reference internal" href="#cross-node-timeout"><code class="docutils literal"><span class="pre">cross_node_timeout</span></code></a></li> -<li class="toctree-l3"><a class="reference internal" href="#streaming-keep-alive-period-in-secs"><code class="docutils literal"><span class="pre">streaming_keep_alive_period_in_secs</span></code></a></li> +<li class="toctree-l3"><a class="reference internal" href="#streaming-socket-timeout-in-ms"><code class="docutils literal"><span class="pre">streaming_socket_timeout_in_ms</span></code></a></li> <li class="toctree-l3"><a class="reference internal" href="#phi-convict-threshold"><code class="docutils literal"><span class="pre">phi_convict_threshold</span></code></a></li> <li class="toctree-l3"><a class="reference internal" href="#endpoint-snitch"><code class="docutils literal"><span class="pre">endpoint_snitch</span></code></a></li> <li class="toctree-l3"><a class="reference internal" href="#dynamic-snitch-update-interval-in-ms"><code class="docutils literal"><span class="pre">dynamic_snitch_update_interval_in_ms</span></code></a></li> @@ -1398,16 +1398,16 @@ already-timed-out requests.</p> and the times are synchronized between the nodes.</p> <p><em>Default Value:</em> false</p> </div> -<div class="section" id="streaming-keep-alive-period-in-secs"> -<h2><code class="docutils literal"><span class="pre">streaming_keep_alive_period_in_secs</span></code><a class="headerlink" href="#streaming-keep-alive-period-in-secs" title="Permalink to this headline">¶</a></h2> +<div class="section" id="streaming-socket-timeout-in-ms"> +<h2><code class="docutils literal"><span class="pre">streaming_socket_timeout_in_ms</span></code><a class="headerlink" href="#streaming-socket-timeout-in-ms" title="Permalink to this headline">¶</a></h2> <p><em>This option is commented out by default.</em></p> -<p>Set keep-alive period for streaming -This node will send a keep-alive message periodically with this period. -If the node does not receive a keep-alive message from the peer for -2 keep-alive cycles the stream session times out and fail -Default value is 300s (5 minutes), which means stalled stream -times out in 10 minutes by default</p> -<p><em>Default Value:</em> 300</p> +<p>Set socket timeout for streaming operation. +The stream session is failed if no data/ack is received by any of the participants +within that period, which means this should also be sufficient to stream a large +sstable or rebuild table indexes. +Default value is 86400000ms, which means stale streams timeout after 24 hours. +A value of zero means stream sockets should never time out.</p> +<p><em>Default Value:</em> 86400000</p> </div> <div class="section" id="phi-convict-threshold"> <h2><code class="docutils literal"><span class="pre">phi_convict_threshold</span></code><a class="headerlink" href="#phi-convict-threshold" title="Permalink to this headline">¶</a></h2> Modified: cassandra/site/publish/doc/latest/operating/metrics.html URL: http://svn.apache.org/viewvc/cassandra/site/publish/doc/latest/operating/metrics.html?rev=1760665&r1=1760664&r2=1760665&view=diff ============================================================================== --- cassandra/site/publish/doc/latest/operating/metrics.html (original) +++ cassandra/site/publish/doc/latest/operating/metrics.html Wed Sep 14 09:42:28 2016 @@ -647,63 +647,39 @@ specific type.</p> <col width="65%" /> </colgroup> <thead valign="bottom"> -<tr class="row-odd"><th class="head"><p class="first last">Name</p> -</th> -<th class="head"><p class="first last">Type</p> -</th> -<th class="head"><p class="first last">Description</p> -</th> +<tr class="row-odd"><th class="head">Name</th> +<th class="head">Type</th> +<th class="head">Description</th> </tr> </thead> <tbody valign="top"> -<tr class="row-even"><td><p class="first last">Timeouts</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of timeouts encountered.</p> -</td> -</tr> -<tr class="row-odd"><td><p class="first last">Failures</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of transaction failures encountered.</p> -</td> -</tr> -<tr class="row-even"><td><p class="first last"> </p> -</td> -<td><p class="first last">Latency</p> -</td> -<td><p class="first last">Transaction read latency.</p> -</td> -</tr> -<tr class="row-odd"><td><p class="first last">Unavailables</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of unavailable exceptions encountered.</p> -</td> -</tr> -<tr class="row-even"><td><p class="first last">UnfinishedCommit</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of transactions that were committed on read.</p> -</td> -</tr> -<tr class="row-odd"><td><p class="first last">ConditionNotMet</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of transaction preconditions did not match current values.</p> -</td> -</tr> -<tr class="row-even"><td><p class="first last">ContentionHistogram</p> -</td> -<td><p class="first last">Histogram</p> -</td> -<td><p class="first last">How many contended reads were encountered</p> -</td> +<tr class="row-even"><td>Timeouts</td> +<td>Counter</td> +<td>Number of timeouts encountered.</td> +</tr> +<tr class="row-odd"><td>Failures</td> +<td>Counter</td> +<td>Number of transaction failures encountered.</td> +</tr> +<tr class="row-even"><td> </td> +<td>Latency</td> +<td>Transaction read latency.</td> +</tr> +<tr class="row-odd"><td>Unavailables</td> +<td>Counter</td> +<td>Number of unavailable exceptions encountered.</td> +</tr> +<tr class="row-even"><td>UnfinishedCommit</td> +<td>Counter</td> +<td>Number of transactions that were committed on read.</td> +</tr> +<tr class="row-odd"><td>ConditionNotMet</td> +<td>Counter</td> +<td>Number of transaction preconditions did not match current values.</td> +</tr> +<tr class="row-even"><td>ContentionHistogram</td> +<td>Histogram</td> +<td>How many contended reads were encountered</td> </tr> </tbody> </table> @@ -722,56 +698,35 @@ specific type.</p> <col width="65%" /> </colgroup> <thead valign="bottom"> -<tr class="row-odd"><th class="head"><p class="first last">Name</p> -</th> -<th class="head"><p class="first last">Type</p> -</th> -<th class="head"><p class="first last">Description</p> -</th> +<tr class="row-odd"><th class="head">Name</th> +<th class="head">Type</th> +<th class="head">Description</th> </tr> </thead> <tbody valign="top"> -<tr class="row-even"><td><p class="first last">Timeouts</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of timeouts encountered.</p> -</td> -</tr> -<tr class="row-odd"><td><p class="first last">Failures</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of transaction failures encountered.</p> -</td> -</tr> -<tr class="row-even"><td><p class="first last"> </p> -</td> -<td><p class="first last">Latency</p> -</td> -<td><p class="first last">Transaction write latency.</p> -</td> -</tr> -<tr class="row-odd"><td><p class="first last">UnfinishedCommit</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of transactions that were committed on write.</p> -</td> -</tr> -<tr class="row-even"><td><p class="first last">ConditionNotMet</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of transaction preconditions did not match current values.</p> -</td> -</tr> -<tr class="row-odd"><td><p class="first last">ContentionHistogram</p> -</td> -<td><p class="first last">Histogram</p> -</td> -<td><p class="first last">How many contended writes were encountered</p> -</td> +<tr class="row-even"><td>Timeouts</td> +<td>Counter</td> +<td>Number of timeouts encountered.</td> +</tr> +<tr class="row-odd"><td>Failures</td> +<td>Counter</td> +<td>Number of transaction failures encountered.</td> +</tr> +<tr class="row-even"><td> </td> +<td>Latency</td> +<td>Transaction write latency.</td> +</tr> +<tr class="row-odd"><td>UnfinishedCommit</td> +<td>Counter</td> +<td>Number of transactions that were committed on write.</td> +</tr> +<tr class="row-even"><td>ConditionNotMet</td> +<td>Counter</td> +<td>Number of transaction preconditions did not match current values.</td> +</tr> +<tr class="row-odd"><td>ContentionHistogram</td> +<td>Histogram</td> +<td>How many contended writes were encountered</td> </tr> </tbody> </table> @@ -790,42 +745,27 @@ specific type.</p> <col width="64%" /> </colgroup> <thead valign="bottom"> -<tr class="row-odd"><th class="head"><p class="first last">Name</p> -</th> -<th class="head"><p class="first last">Type</p> -</th> -<th class="head"><p class="first last">Description</p> -</th> +<tr class="row-odd"><th class="head">Name</th> +<th class="head">Type</th> +<th class="head">Description</th> </tr> </thead> <tbody valign="top"> -<tr class="row-even"><td><p class="first last">Timeouts</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of timeouts encountered.</p> -</td> -</tr> -<tr class="row-odd"><td><p class="first last">Failures</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of read failures encountered.</p> -</td> -</tr> -<tr class="row-even"><td><p class="first last"> </p> -</td> -<td><p class="first last">Latency</p> -</td> -<td><p class="first last">Read latency.</p> -</td> -</tr> -<tr class="row-odd"><td><p class="first last">Unavailables</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of unavailable exceptions encountered.</p> -</td> +<tr class="row-even"><td>Timeouts</td> +<td>Counter</td> +<td>Number of timeouts encountered.</td> +</tr> +<tr class="row-odd"><td>Failures</td> +<td>Counter</td> +<td>Number of read failures encountered.</td> +</tr> +<tr class="row-even"><td> </td> +<td>Latency</td> +<td>Read latency.</td> +</tr> +<tr class="row-odd"><td>Unavailables</td> +<td>Counter</td> +<td>Number of unavailable exceptions encountered.</td> </tr> </tbody> </table> @@ -844,42 +784,27 @@ specific type.</p> <col width="64%" /> </colgroup> <thead valign="bottom"> -<tr class="row-odd"><th class="head"><p class="first last">Name</p> -</th> -<th class="head"><p class="first last">Type</p> -</th> -<th class="head"><p class="first last">Description</p> -</th> +<tr class="row-odd"><th class="head">Name</th> +<th class="head">Type</th> +<th class="head">Description</th> </tr> </thead> <tbody valign="top"> -<tr class="row-even"><td><p class="first last">Timeouts</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of timeouts encountered.</p> -</td> -</tr> -<tr class="row-odd"><td><p class="first last">Failures</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of range query failures encountered.</p> -</td> -</tr> -<tr class="row-even"><td><p class="first last"> </p> -</td> -<td><p class="first last">Latency</p> -</td> -<td><p class="first last">Range query latency.</p> -</td> -</tr> -<tr class="row-odd"><td><p class="first last">Unavailables</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of unavailable exceptions encountered.</p> -</td> +<tr class="row-even"><td>Timeouts</td> +<td>Counter</td> +<td>Number of timeouts encountered.</td> +</tr> +<tr class="row-odd"><td>Failures</td> +<td>Counter</td> +<td>Number of range query failures encountered.</td> +</tr> +<tr class="row-even"><td> </td> +<td>Latency</td> +<td>Range query latency.</td> +</tr> +<tr class="row-odd"><td>Unavailables</td> +<td>Counter</td> +<td>Number of unavailable exceptions encountered.</td> </tr> </tbody> </table> @@ -898,42 +823,27 @@ specific type.</p> <col width="64%" /> </colgroup> <thead valign="bottom"> -<tr class="row-odd"><th class="head"><p class="first last">Name</p> -</th> -<th class="head"><p class="first last">Type</p> -</th> -<th class="head"><p class="first last">Description</p> -</th> +<tr class="row-odd"><th class="head">Name</th> +<th class="head">Type</th> +<th class="head">Description</th> </tr> </thead> <tbody valign="top"> -<tr class="row-even"><td><p class="first last">Timeouts</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of timeouts encountered.</p> -</td> -</tr> -<tr class="row-odd"><td><p class="first last">Failures</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of write failures encountered.</p> -</td> -</tr> -<tr class="row-even"><td><p class="first last"> </p> -</td> -<td><p class="first last">Latency</p> -</td> -<td><p class="first last">Write latency.</p> -</td> -</tr> -<tr class="row-odd"><td><p class="first last">Unavailables</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of unavailable exceptions encountered.</p> -</td> +<tr class="row-even"><td>Timeouts</td> +<td>Counter</td> +<td>Number of timeouts encountered.</td> +</tr> +<tr class="row-odd"><td>Failures</td> +<td>Counter</td> +<td>Number of write failures encountered.</td> +</tr> +<tr class="row-even"><td> </td> +<td>Latency</td> +<td>Write latency.</td> +</tr> +<tr class="row-odd"><td>Unavailables</td> +<td>Counter</td> +<td>Number of unavailable exceptions encountered.</td> </tr> </tbody> </table> @@ -952,54 +862,33 @@ specific type.</p> <col width="72%" /> </colgroup> <tbody valign="top"> -<tr class="row-odd"><td><p class="first last">Timeouts</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of timeouts encountered.</p> -</td> -</tr> -<tr class="row-even"><td><p class="first last">Failures</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of transaction failures encountered.</p> -</td> -</tr> -<tr class="row-odd"><td><p class="first last">Unavailables</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Number of unavailable exceptions encountered.</p> -</td> -</tr> -<tr class="row-even"><td><p class="first last">ViewReplicasAttempted</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Total number of attempted view replica writes.</p> -</td> -</tr> -<tr class="row-odd"><td><p class="first last">ViewReplicasSuccess</p> -</td> -<td><p class="first last">Counter</p> -</td> -<td><p class="first last">Total number of succeded view replica writes.</p> -</td> -</tr> -<tr class="row-even"><td><p class="first last">ViewPendingMutations</p> -</td> -<td><p class="first last">Gauge<Long></p> -</td> -<td><p class="first last">ViewReplicasAttempted - ViewReplicasSuccess.</p> -</td> -</tr> -<tr class="row-odd"><td><p class="first last">ViewWriteLatency</p> -</td> -<td><p class="first last">Timer</p> -</td> -<td><p class="first last">Time between when mutation is applied to base table and when CL.ONE is achieved on view.</p> -</td> +<tr class="row-odd"><td>Timeouts</td> +<td>Counter</td> +<td>Number of timeouts encountered.</td> +</tr> +<tr class="row-even"><td>Failures</td> +<td>Counter</td> +<td>Number of transaction failures encountered.</td> +</tr> +<tr class="row-odd"><td>Unavailables</td> +<td>Counter</td> +<td>Number of unavailable exceptions encountered.</td> +</tr> +<tr class="row-even"><td>ViewReplicasAttempted</td> +<td>Counter</td> +<td>Total number of attempted view replica writes.</td> +</tr> +<tr class="row-odd"><td>ViewReplicasSuccess</td> +<td>Counter</td> +<td>Total number of succeded view replica writes.</td> +</tr> +<tr class="row-even"><td>ViewPendingMutations</td> +<td>Gauge<Long></td> +<td>ViewReplicasAttempted - ViewReplicasSuccess.</td> +</tr> +<tr class="row-odd"><td>ViewWriteLatency</td> +<td>Timer</td> +<td>Time between when mutation is applied to base table and when CL.ONE is achieved on view.</td> </tr> </tbody> </table> Modified: cassandra/site/publish/download/index.html URL: http://svn.apache.org/viewvc/cassandra/site/publish/download/index.html?rev=1760665&r1=1760664&r2=1760665&view=diff ============================================================================== --- cassandra/site/publish/download/index.html (original) +++ cassandra/site/publish/download/index.html Wed Sep 14 09:42:28 2016 @@ -93,8 +93,8 @@ <h3 id="latest-version">Latest version</h3> -<p>Cassandra is moving to a monthly release process called Tick-Tock. <strong>Even-numbered</strong> releases (e.g. 3.2) contain new<br /> -features; <strong>odd-numbered</strong> releases (e.g. 3.3) contain bug fixes only. If a critical bug is found, a patch will be<br /> +<p>Cassandra is moving to a monthly release process called Tick-Tock. <strong>Even-numbered</strong> releases (e.g. 3.2) contain new +features; <strong>odd-numbered</strong> releases (e.g. 3.3) contain bug fixes only. If a critical bug is found, a patch will be released against the most recent bug fix release. Read more about <a href="http://www.planetcassandra.org/blog/cassandra-2-2-3-0-and-beyond/">tick-tock here</a>.</p> <p>Download the latest Cassandra release: <a href="http://www.apache.org/dyn/closer.lua/cassandra/3.7/apache-cassandra-3.7-bin.tar.gz">3.7</a> (<a href="http://www.apache.org/dist/cassandra/3.7/apache-cassandra-3.7-bin.tar.gz.asc">pgp</a>, <a href="http://www.apache.org/dist/cassandra/3.7/apache-cassandra-3.7-bin.tar.gz.md5">md5</a> and <a href="http://www.apache.org/dist/cassandra/3.7/apache-cassandra-3.7-bin.tar.gz.sha1">sha1</a>), released on 2016-06-13.</p> @@ -106,7 +106,7 @@ released against the most recent bug fix <ul> <li>Apache Cassandra 3.0 is supported until <strong>May 2017</strong>. The latest release is <a href="http://www.apache.org/dyn/closer.lua/cassandra/3.0.8/apache-cassandra-3.0.8-bin.tar.gz">3.0.8</a> (<a href="http://www.apache.org/dist/cassandra/3.0.8/apache-cassandra-3.0.8-bin.tar.gz.asc">pgp</a>, <a href="http://www.apache.org/dist/cassandra/3.0.8/apache-cassandra-3.0.8-bin.tar.gz.md5">md5</a> and <a href="http://www.apache.org/dist/cassandra/3.0.8/apache-cassandra-3.0.8-bin.tar.gz.sha1">sha1</a>), released on 2016-07-05.</li> <li>Apache Cassandra 2.2 is supported until <strong>November 2016</strong>. The latest release is <a href="http://www.apache.org/dyn/closer.lua/cassandra/2.2.7/apache-cassandra-2.2.7-bin.tar.gz">2.2.7</a> (<a href="http://www.apache.org/dist/cassandra/2.2.7/apache-cassandra-2.2.7-bin.tar.gz.asc">pgp</a>, <a href="http://www.apache.org/dist/cassandra/2.2.7/apache-cassandra-2.2.7-bin.tar.gz.md5">md5</a> and <a href="http://www.apache.org/dist/cassandra/2.2.7/apache-cassandra-2.2.7-bin.tar.gz.sha1">sha1</a>), released on 2016-07-05.</li> - <li>Apache Cassandra 2.1 is supported until <strong>November 2016</strong> with <strong>critical fixes only</strong>. The latest release is<br /> + <li>Apache Cassandra 2.1 is supported until <strong>November 2016</strong> with <strong>critical fixes only</strong>. The latest release is <a href="http://www.apache.org/dyn/closer.lua/cassandra/2.1.15/apache-cassandra-2.1.15-bin.tar.gz">2.1.15</a> (<a href="http://www.apache.org/dist/cassandra/2.1.15/apache-cassandra-2.1.15-bin.tar.gz.asc">pgp</a>, <a href="http://www.apache.org/dist/cassandra/2.1.15/apache-cassandra-2.1.15-bin.tar.gz.md5">md5</a> and <a href="http://www.apache.org/dist/cassandra/2.1.15/apache-cassandra-2.1.15-bin.tar.gz.sha1">sha1</a>), released on 2016-07-05.</li> </ul> @@ -114,7 +114,7 @@ released against the most recent bug fix <h3 id="debian">Debianâ¢</h3> -<p>The Apache Cassandra project also provide official Debian⢠packages (which are not a product of Debianâ¢). To use those<br /> +<p>The Apache Cassandra project also provide official Debian⢠packages (which are not a product of Debianâ¢). To use those packages, you can use:</p> <div class="highlighter-rouge"><pre class="highlight"><code>deb http://www.apache.org/dist/cassandra/debian <release series> main @@ -125,9 +125,9 @@ deb-src http://www.apache.org/dist/cassa <p>where <code class="highlighter-rouge"><release series></code> is the series you want to install:</p> <ul> - <li>For tick-tock releases, the <code class="highlighter-rouge"><release series></code> is the release number, without dot, and with an appended <code class="highlighter-rouge">x</code>, so <code class="highlighter-rouge">31x</code>,<br /> + <li>For tick-tock releases, the <code class="highlighter-rouge"><release series></code> is the release number, without dot, and with an appended <code class="highlighter-rouge">x</code>, so <code class="highlighter-rouge">31x</code>, <code class="highlighter-rouge">32x</code>, â¦</li> - <li>For older pre-tick-tock releases, the <code class="highlighter-rouge"><release series></code> is the major version number, without dot, and with an<br /> + <li>For older pre-tick-tock releases, the <code class="highlighter-rouge"><release series></code> is the major version number, without dot, and with an appended <code class="highlighter-rouge">x</code>. So currently it can one of <code class="highlighter-rouge">21x</code>, <code class="highlighter-rouge">22x</code> or <code class="highlighter-rouge">30x</code>.</li> </ul> @@ -139,17 +139,17 @@ appended <code class="highlighter-rouge" <p>you will need to add the public key of the current Cassandra ârelease managerâ, here <code class="highlighter-rouge">0353B12C</code>. You can do that with:</p> -<div class="highlighter-rouge"><pre class="highlight"><code>gpg --keyserver pgp.mit.edu --recv-keys <public key> +<div class="language-shell highlighter-rouge"><pre class="highlight"><code>gpg --keyserver pgp.mit.edu --recv-keys <public key> gpg --export --armor <public key> | sudo apt-key add - </code></pre> </div> -<p>where <code class="highlighter-rouge"><public key></code> is the key to add (<code class="highlighter-rouge">0353B12C</code> in the example above). The list of Apache contributors public keys is<br /> +<p>where <code class="highlighter-rouge"><public key></code> is the key to add (<code class="highlighter-rouge">0353B12C</code> in the example above). The list of Apache contributors public keys is available at <a href="https://www.apache.org/dist/cassandra/KEYS">https://www.apache.org/dist/cassandra/KEYS</a>.</p> <p>Once set up, installing is done as usual with:</p> -<div class="highlighter-rouge"><pre class="highlight"><code>sudo apt-get update +<div class="language-shell highlighter-rouge"><pre class="highlight"><code>sudo apt-get update sudo apt-get install cassandra </code></pre> </div> @@ -163,14 +163,14 @@ sudo apt-get install cassandra <h3 id="third-party-distributions-not-endorsed-by-apache">Third party distributions (not endorsed by Apache)</h3> -<p><a href="http://www.planetcassandra.org/cassandra/">DataStax Distribution of Apache Cassandra</a> is available in Linux rpm, deb,<br /> +<p><a href="http://www.planetcassandra.org/cassandra/">DataStax Distribution of Apache Cassandra</a> is available in Linux rpm, deb, and tar packages, a Windows MSI installer, and a Mac OS X binary.</p> <h3 id="source">Source</h3> <p>Development is done in the Apache Git repository. To check out a copy:</p> -<div class="highlighter-rouge"><pre class="highlight"><code>git clone http://git-wip-us.apache.org/repos/asf/cassandra.git +<div class="language-shell highlighter-rouge"><pre class="highlight"><code>git clone http://git-wip-us.apache.org/repos/asf/cassandra.git </code></pre> </div> Modified: cassandra/site/src/_config.yml URL: http://svn.apache.org/viewvc/cassandra/site/src/_config.yml?rev=1760665&r1=1760664&r2=1760665&view=diff ============================================================================== --- cassandra/site/src/_config.yml (original) +++ cassandra/site/src/_config.yml Wed Sep 14 09:42:28 2016 @@ -26,3 +26,4 @@ markdown: kramdown kramdown: input: GFM syntax_highlighter: rouge + hard_wrap: false