Repository: kafka Updated Branches: refs/heads/trunk bbc390018 -> ea8845bbd
KAFKA-5384: Enable topic deletion by default https://cwiki.apache.org/confluence/display/KAFKA/KIP-162+-+Enable+topic+deletion+by+default Author: Gwen Shapira <csh...@gmail.com> Reviewers: Ismael Juma Closes #3241 from gwenshap/KAFKA-5384 Project: http://git-wip-us.apache.org/repos/asf/kafka/repo Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/ea8845bb Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/ea8845bb Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/ea8845bb Branch: refs/heads/trunk Commit: ea8845bbd6a8b0b3b930c637461c8da2fc84c342 Parents: bbc3900 Author: Gwen Shapira <csh...@gmail.com> Authored: Tue Jul 18 08:57:06 2017 -0700 Committer: Gwen Shapira <csh...@gmail.com> Committed: Tue Jul 18 08:57:06 2017 -0700 ---------------------------------------------------------------------- config/server.properties | 3 --- core/src/main/scala/kafka/server/KafkaConfig.scala | 2 +- docs/upgrade.html | 11 +++++++++++ 3 files changed, 12 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kafka/blob/ea8845bb/config/server.properties ---------------------------------------------------------------------- diff --git a/config/server.properties b/config/server.properties index 4a9a550..d6d5eae 100644 --- a/config/server.properties +++ b/config/server.properties @@ -20,9 +20,6 @@ # The id of the broker. This must be set to a unique integer for each broker. broker.id=0 -# Switch to enable topic deletion or not, default value is false -#delete.topic.enable=true - ############################# Socket Server Settings ############################# # The address the socket server listens on. It will get the value returned from http://git-wip-us.apache.org/repos/asf/kafka/blob/ea8845bb/core/src/main/scala/kafka/server/KafkaConfig.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/kafka/server/KafkaConfig.scala b/core/src/main/scala/kafka/server/KafkaConfig.scala index c55b19a..3941e17 100755 --- a/core/src/main/scala/kafka/server/KafkaConfig.scala +++ b/core/src/main/scala/kafka/server/KafkaConfig.scala @@ -179,7 +179,7 @@ object Defaults { /** ********* Transaction Configuration ***********/ val TransactionalIdExpirationMsDefault = 604800000 - val DeleteTopicEnable = false + val DeleteTopicEnable = true val CompressionType = "producer" http://git-wip-us.apache.org/repos/asf/kafka/blob/ea8845bb/docs/upgrade.html ---------------------------------------------------------------------- diff --git a/docs/upgrade.html b/docs/upgrade.html index 98c749c..bfe5419 100644 --- a/docs/upgrade.html +++ b/docs/upgrade.html @@ -19,6 +19,17 @@ <script id="upgrade-template" type="text/x-handlebars-template"> +<h4><a id="upgrade_1_0_0" href="#upgrade_1_0_0"</h4> Upgrading from 0.8.x, 0.9.x, 0.10.0.x, 0.10.1.x, 0.10.2 or 0.11.0.0 to 1.0.0</a></h4> +<p>1.0.0 is fully compatible with 0.11.0.0. The upgrade can be done one broker at a time by simply bringing it down, updating the code, and restarting it. +To upgrade from earlier versions, please review the <a href="#upgrade_11_0_0">0.11.0.0 upgrade instructions</a>. +</p> + +<h5><a id="upgrade_100_notable" href="#upgrade_100_notable">Notable changes in 1.0.0</a></h5> +<ul> + <li>Topic deletion is now enabled by default, since the functionality is now stable. Users who wish to + to retain the previous behavior should set the broker config <code>delete.topic.enable</code> to <code>false</code>. Keep in mind that topic deletion removes data and the operation is not reversible (i.e. there is no "undelete" operation)</li> +</ul> + <h4><a id="upgrade_11_0_0" href="#upgrade_11_0_0">Upgrading from 0.8.x, 0.9.x, 0.10.0.x, 0.10.1.x or 0.10.2.x to 0.11.0.0</a></h4> <p>Kafka 0.11.0.0 introduces a new message format version as well as wire protocol changes. By following the recommended rolling upgrade plan below, you guarantee no downtime during the upgrade. However, please review the <a href="#upgrade_1100_notable">notable changes in 0.11.0.0</a> before upgrading.