diff --git a/hbase-common/src/main/resources/hbase-default.xml b/hbase-common/src/main/resources/hbase-default.xml index d52233ae8b0..e335b1ed501 100644 --- a/hbase-common/src/main/resources/hbase-default.xml +++ b/hbase-common/src/main/resources/hbase-default.xml @@ -714,6 +714,15 @@ possible configurations would overwhelm and obscure the important. or compacting. Do less if big KeyValues and problems with OOME. Do more if wide, small rows. + + hbase.hstore.time.to.purge.deletes + 0 + 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. + + hbase.storescanner.parallel.seek.enable false diff --git a/src/main/docbkx/book.xml b/src/main/docbkx/book.xml index 0facd319c4b..163bea35e20 100644 --- a/src/main/docbkx/book.xml +++ b/src/main/docbkx/book.xml @@ -811,13 +811,23 @@ htable.put(put); list. Also see for more information on the internal KeyValue format. - 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. + Delete markers are purged during the next major compaction of the store, unless the + 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 + property in + hbase-site.xml. If + 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 , in + milliseconds. + + This behavior represents a fix for an unexpected change that was introduced in + HBase 0.94, and was fixed in HBASE-10118. + The change has been backported to HBase 0.94 and newer branches. +