You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jm...@apache.org on 2014/08/18 22:43:08 UTC

git commit: HBASE-11734 Document changed behavior of hbase.hstore.time.to.purge.deletes (Misty Stanley-Jones)

Repository: hbase
Updated Branches:
  refs/heads/branch-1 bf5eac49a -> 5b2069b7c


HBASE-11734 Document changed behavior of hbase.hstore.time.to.purge.deletes (Misty Stanley-Jones)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5b2069b7
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5b2069b7
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5b2069b7

Branch: refs/heads/branch-1
Commit: 5b2069b7c90d40b462eaac0b36a99ca737688215
Parents: bf5eac4
Author: Jonathan M Hsieh <jm...@apache.org>
Authored: Mon Aug 18 13:31:32 2014 -0700
Committer: Jonathan M Hsieh <jm...@apache.org>
Committed: Mon Aug 18 13:41:50 2014 -0700

----------------------------------------------------------------------
 .../src/main/resources/hbase-default.xml        |  9 ++++++++
 src/main/docbkx/book.xml                        | 24 ++++++++++++++------
 2 files changed, 26 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/5b2069b7/hbase-common/src/main/resources/hbase-default.xml
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/resources/hbase-default.xml b/hbase-common/src/main/resources/hbase-default.xml
index d52233a..e335b1e 100644
--- a/hbase-common/src/main/resources/hbase-default.xml
+++ b/hbase-common/src/main/resources/hbase-default.xml
@@ -715,6 +715,15 @@ possible configurations would overwhelm and obscure the important.
         Do more if wide, small rows.</description>
   </property>
   <property>
+    <name>hbase.hstore.time.to.purge.deletes</name>
+    <value>0</value>
+    <description>The amount of time to delay purging of delete markers with future timestamps. If 
+      unset, or set to 0, all delete markers, including those with future timestamps, are purged 
+      during the next major compaction. Otherwise, a delete marker is kept until the major compaction 
+      which occurs after the marker's timestamp plus the value of this setting, in milliseconds.
+    </description>
+  </property>
+  <property>
     <name>hbase.storescanner.parallel.seek.enable</name>
     <value>false</value>
     <description>

http://git-wip-us.apache.org/repos/asf/hbase/blob/5b2069b7/src/main/docbkx/book.xml
----------------------------------------------------------------------
diff --git a/src/main/docbkx/book.xml b/src/main/docbkx/book.xml
index 0facd31..163bea3 100644
--- a/src/main/docbkx/book.xml
+++ b/src/main/docbkx/book.xml
@@ -811,13 +811,23 @@ htable.put(put);
             list.</para>
           <para>Also see <xref
               linkend="keyvalue" /> for more information on the internal KeyValue format. </para>
-          <para>Delete markers are purged during the major compaction of store, unless the
-            KEEP_DELETED_CELLS is set in the column family. In some scenarios, users want to keep
-            the deletes for a time and you can set the delete TTL:
-            hbase.hstore.time.to.purge.deletes in the configuration. If this delete TTL is not set,
-            or set to 0, all delete markers including those with future timestamp are purged during
-            the later major compaction. Otherwise, a delete marker is kept until the major
-            compaction after marker's timestamp + delete TTL. </para>
+          <para>Delete markers are purged during the next major compaction of the store, unless the
+              <option>KEEP_DELETED_CELLS</option> option is set in the column family. To keep the
+            deletes for a configurable amount of time, you can set the delete TTL via the
+              <option>hbase.hstore.time.to.purge.deletes</option> property in
+              <filename>hbase-site.xml</filename>. If
+              <option>hbase.hstore.time.to.purge.deletes</option> is not set, or set to 0, all
+            delete markers, including those with timestamps in the future, are purged during the
+            next major compaction. Otherwise, a delete marker with a timestamp in the future is kept
+            until the major compaction which occurs after the time represented by the marker's
+            timestamp plus the value of <option>hbase.hstore.time.to.purge.deletes</option>, in
+            milliseconds. </para>
+          <note>
+            <para>This behavior represents a fix for an unexpected change that was introduced in
+              HBase 0.94, and was fixed in <link
+                xlink:href="https://issues.apache.org/jira/browse/HBASE-10118">HBASE-10118</link>.
+              The change has been backported to HBase 0.94 and newer branches.</para>
+          </note>
         </section>
       </section>