hbase git commit: HBASE-20224 Web UI is broken in standalone mode - addendum for hbase-endpoint and hbase-rsgroup modules
Repository: hbase Updated Branches: refs/heads/master c88ca54c1 -> 219625233 HBASE-20224 Web UI is broken in standalone mode - addendum for hbase-endpoint and hbase-rsgroup modules Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/21962523 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/21962523 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/21962523 Branch: refs/heads/master Commit: 219625233c1e8ad9daf2c35bc2e3a0844e1b97ba Parents: c88ca54 Author: tedyuAuthored: Mon Apr 2 17:57:56 2018 -0700 Committer: tedyu Committed: Mon Apr 2 17:57:56 2018 -0700 -- .../src/test/resources/hbase-site.xml | 39 hbase-rsgroup/src/test/resources/hbase-site.xml | 39 2 files changed, 78 insertions(+) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/21962523/hbase-endpoint/src/test/resources/hbase-site.xml -- diff --git a/hbase-endpoint/src/test/resources/hbase-site.xml b/hbase-endpoint/src/test/resources/hbase-site.xml new file mode 100644 index 000..858d428 --- /dev/null +++ b/hbase-endpoint/src/test/resources/hbase-site.xml @@ -0,0 +1,39 @@ + + + + + +hbase.defaults.for.version.skip +true + + +hbase.hconnection.threads.keepalivetime +3 + + +hbase.localcluster.assign.random.ports +true + + Assign random ports to master and RS info server (UI). + + + http://git-wip-us.apache.org/repos/asf/hbase/blob/21962523/hbase-rsgroup/src/test/resources/hbase-site.xml -- diff --git a/hbase-rsgroup/src/test/resources/hbase-site.xml b/hbase-rsgroup/src/test/resources/hbase-site.xml new file mode 100644 index 000..858d428 --- /dev/null +++ b/hbase-rsgroup/src/test/resources/hbase-site.xml @@ -0,0 +1,39 @@ + + + + + +hbase.defaults.for.version.skip +true + + +hbase.hconnection.threads.keepalivetime +3 + + +hbase.localcluster.assign.random.ports +true + + Assign random ports to master and RS info server (UI). + + +
svn commit: r26089 - /dev/hbase/hbase-1.4.3RC0/ /release/hbase/1.4.3/
Author: apurtell Date: Mon Apr 2 21:07:55 2018 New Revision: 26089 Log: Release HBase 1.4.3 Added: release/hbase/1.4.3/ - copied from r26088, dev/hbase/hbase-1.4.3RC0/ Removed: dev/hbase/hbase-1.4.3RC0/
[hbase] Git Push Summary
Repository: hbase Updated Tags: refs/tags/rel/1.4.3 [created] 04cad0b4e
hbase git commit: HBASE-20259 Doc configs for in-memory-compaction and add detail to in-memory-compaction logging
Repository: hbase Updated Branches: refs/heads/branch-2.0 0db342d31 -> 80724e9ba HBASE-20259 Doc configs for in-memory-compaction and add detail to in-memory-compaction logging Adds logging of CompactingMemStore configuration on construction. Add logging of detail about Store on creation including memstore type. Add chapter to refguide on new in-memory compaction feature. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/80724e9b Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/80724e9b Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/80724e9b Branch: refs/heads/branch-2.0 Commit: 80724e9ba8a295f6d1ee2161fb5ed5a920749da5 Parents: 0db342d Author: Michael StackAuthored: Fri Mar 30 12:35:28 2018 -0700 Committer: Michael Stack Committed: Mon Apr 2 10:00:14 2018 -0700 -- .../hbase/client/TableDescriptorBuilder.java| 4 +- .../hadoop/hbase/io/hfile/HFileBlock.java | 12 +- .../AdaptiveMemStoreCompactionStrategy.java | 12 +- .../BasicMemStoreCompactionStrategy.java| 10 +- .../hbase/regionserver/CompactingMemStore.java | 6 +- .../EagerMemStoreCompactionStrategy.java| 9 +- .../hadoop/hbase/regionserver/HStore.java | 68 ++- .../MemStoreCompactionStrategy.java | 8 +- .../hbase/regionserver/MemStoreCompactor.java | 5 + .../asciidoc/_chapters/inmemory_compaction.adoc | 113 +++ src/main/asciidoc/book.adoc | 1 + 11 files changed, 197 insertions(+), 51 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/80724e9b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableDescriptorBuilder.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableDescriptorBuilder.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableDescriptorBuilder.java index 618b0c9..02901ac 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableDescriptorBuilder.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableDescriptorBuilder.java @@ -183,8 +183,8 @@ public class TableDescriptorBuilder { public static final boolean DEFAULT_NORMALIZATION_ENABLED = false; /** - * Constant that denotes the maximum default size of the memstore after which - * the contents are flushed to the store files + * Constant that denotes the maximum default size of the memstore in bytes after which + * the contents are flushed to the store files. */ public static final long DEFAULT_MEMSTORE_FLUSH_SIZE = 1024 * 1024 * 128L; http://git-wip-us.apache.org/repos/asf/hbase/blob/80724e9b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java index 5674414..f41f78f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java @@ -1732,11 +1732,9 @@ public class HFileBlock implements Cacheable { // and will save us having to seek the stream backwards to reread the header we // read the last time through here. ByteBuffer headerBuf = getCachedHeader(offset); - if (LOG.isTraceEnabled()) { -LOG.trace("Reading " + this.fileContext.getHFileName() + " at offset=" + offset + - ", pread=" + pread + ", verifyChecksum=" + verifyChecksum + ", cachedHeader=" + - headerBuf + ", onDiskSizeWithHeader=" + onDiskSizeWithHeader); - } + LOG.trace("Reading {} at offset={}, pread={}, verifyChecksum={}, cachedHeader={}, " + + "onDiskSizeWithHeader={}", this.fileContext.getHFileName(), offset, pread, + verifyChecksum, headerBuf, onDiskSizeWithHeader); // This is NOT same as verifyChecksum. This latter is whether to do hbase // checksums. Can change with circumstances. The below flag is whether the // file has support for checksums (version 2+). @@ -1800,9 +1798,7 @@ public class HFileBlock implements Cacheable { if (!fileContext.isCompressedOrEncrypted()) { hFileBlock.sanityCheckUncompressed(); } - if (LOG.isTraceEnabled()) { -LOG.trace("Read " + hFileBlock + " in " + duration + " ns"); - } + LOG.trace("Read {} in {} ns", hFileBlock, duration); // Cache next block header if we read it for the next time through here. if (nextBlockOnDiskSize != -1) { cacheNextBlockHeader(offset +
hbase git commit: HBASE-20259 Doc configs for in-memory-compaction and add detail to in-memory-compaction logging
Repository: hbase Updated Branches: refs/heads/branch-2 4b909b890 -> d4e115bf3 HBASE-20259 Doc configs for in-memory-compaction and add detail to in-memory-compaction logging Adds logging of CompactingMemStore configuration on construction. Add logging of detail about Store on creation including memstore type. Add chapter to refguide on new in-memory compaction feature. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d4e115bf Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d4e115bf Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d4e115bf Branch: refs/heads/branch-2 Commit: d4e115bf34ab1af5c178100d5e472e2e6e7f67e7 Parents: 4b909b8 Author: Michael StackAuthored: Fri Mar 30 12:35:28 2018 -0700 Committer: Michael Stack Committed: Mon Apr 2 09:56:32 2018 -0700 -- .../hbase/client/TableDescriptorBuilder.java| 4 +- .../hadoop/hbase/io/hfile/HFileBlock.java | 12 +- .../AdaptiveMemStoreCompactionStrategy.java | 12 +- .../BasicMemStoreCompactionStrategy.java| 10 +- .../hbase/regionserver/CompactingMemStore.java | 6 +- .../EagerMemStoreCompactionStrategy.java| 9 +- .../hadoop/hbase/regionserver/HStore.java | 89 --- .../MemStoreCompactionStrategy.java | 8 +- .../hbase/regionserver/MemStoreCompactor.java | 5 + .../asciidoc/_chapters/inmemory_compaction.adoc | 113 +++ src/main/asciidoc/book.adoc | 1 + 11 files changed, 208 insertions(+), 61 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/d4e115bf/hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableDescriptorBuilder.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableDescriptorBuilder.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableDescriptorBuilder.java index 618b0c9..02901ac 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableDescriptorBuilder.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableDescriptorBuilder.java @@ -183,8 +183,8 @@ public class TableDescriptorBuilder { public static final boolean DEFAULT_NORMALIZATION_ENABLED = false; /** - * Constant that denotes the maximum default size of the memstore after which - * the contents are flushed to the store files + * Constant that denotes the maximum default size of the memstore in bytes after which + * the contents are flushed to the store files. */ public static final long DEFAULT_MEMSTORE_FLUSH_SIZE = 1024 * 1024 * 128L; http://git-wip-us.apache.org/repos/asf/hbase/blob/d4e115bf/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java index 5674414..f41f78f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java @@ -1732,11 +1732,9 @@ public class HFileBlock implements Cacheable { // and will save us having to seek the stream backwards to reread the header we // read the last time through here. ByteBuffer headerBuf = getCachedHeader(offset); - if (LOG.isTraceEnabled()) { -LOG.trace("Reading " + this.fileContext.getHFileName() + " at offset=" + offset + - ", pread=" + pread + ", verifyChecksum=" + verifyChecksum + ", cachedHeader=" + - headerBuf + ", onDiskSizeWithHeader=" + onDiskSizeWithHeader); - } + LOG.trace("Reading {} at offset={}, pread={}, verifyChecksum={}, cachedHeader={}, " + + "onDiskSizeWithHeader={}", this.fileContext.getHFileName(), offset, pread, + verifyChecksum, headerBuf, onDiskSizeWithHeader); // This is NOT same as verifyChecksum. This latter is whether to do hbase // checksums. Can change with circumstances. The below flag is whether the // file has support for checksums (version 2+). @@ -1800,9 +1798,7 @@ public class HFileBlock implements Cacheable { if (!fileContext.isCompressedOrEncrypted()) { hFileBlock.sanityCheckUncompressed(); } - if (LOG.isTraceEnabled()) { -LOG.trace("Read " + hFileBlock + " in " + duration + " ns"); - } + LOG.trace("Read {} in {} ns", hFileBlock, duration); // Cache next block header if we read it for the next time through here. if (nextBlockOnDiskSize != -1) { cacheNextBlockHeader(offset +
hbase git commit: HBASE-20259 Doc configs for in-memory-compaction and add detail to in-memory-compaction logging
Repository: hbase Updated Branches: refs/heads/master 1e5693875 -> c88ca54c1 HBASE-20259 Doc configs for in-memory-compaction and add detail to in-memory-compaction logging Adds logging of CompactingMemStore configuration on construction. Add logging of detail about Store on creation including memstore type. Add chapter to refguide on new in-memory compaction feature. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c88ca54c Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c88ca54c Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c88ca54c Branch: refs/heads/master Commit: c88ca54c16625bc7ab7ebf5eae295fc669d08bb7 Parents: 1e56938 Author: Michael StackAuthored: Fri Mar 30 12:35:28 2018 -0700 Committer: Michael Stack Committed: Mon Apr 2 09:53:12 2018 -0700 -- .../hbase/client/TableDescriptorBuilder.java| 4 +- .../hadoop/hbase/io/hfile/HFileBlock.java | 12 +- .../AdaptiveMemStoreCompactionStrategy.java | 12 +- .../BasicMemStoreCompactionStrategy.java| 10 +- .../hbase/regionserver/CompactingMemStore.java | 6 +- .../EagerMemStoreCompactionStrategy.java| 9 +- .../hadoop/hbase/regionserver/HStore.java | 89 --- .../MemStoreCompactionStrategy.java | 8 +- .../hbase/regionserver/MemStoreCompactor.java | 5 + .../asciidoc/_chapters/inmemory_compaction.adoc | 113 +++ src/main/asciidoc/book.adoc | 1 + 11 files changed, 208 insertions(+), 61 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/c88ca54c/hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableDescriptorBuilder.java -- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableDescriptorBuilder.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableDescriptorBuilder.java index 500cfd5..78f25ec 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableDescriptorBuilder.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/TableDescriptorBuilder.java @@ -182,8 +182,8 @@ public class TableDescriptorBuilder { public static final boolean DEFAULT_NORMALIZATION_ENABLED = false; /** - * Constant that denotes the maximum default size of the memstore after which - * the contents are flushed to the store files + * Constant that denotes the maximum default size of the memstore in bytes after which + * the contents are flushed to the store files. */ public static final long DEFAULT_MEMSTORE_FLUSH_SIZE = 1024 * 1024 * 128L; http://git-wip-us.apache.org/repos/asf/hbase/blob/c88ca54c/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java index d9c5385..dcea318 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java @@ -1732,11 +1732,9 @@ public class HFileBlock implements Cacheable { // and will save us having to seek the stream backwards to reread the header we // read the last time through here. ByteBuffer headerBuf = getCachedHeader(offset); - if (LOG.isTraceEnabled()) { -LOG.trace("Reading " + this.fileContext.getHFileName() + " at offset=" + offset + - ", pread=" + pread + ", verifyChecksum=" + verifyChecksum + ", cachedHeader=" + - headerBuf + ", onDiskSizeWithHeader=" + onDiskSizeWithHeader); - } + LOG.trace("Reading {} at offset={}, pread={}, verifyChecksum={}, cachedHeader={}, " + + "onDiskSizeWithHeader={}", this.fileContext.getHFileName(), offset, pread, + verifyChecksum, headerBuf, onDiskSizeWithHeader); // This is NOT same as verifyChecksum. This latter is whether to do hbase // checksums. Can change with circumstances. The below flag is whether the // file has support for checksums (version 2+). @@ -1800,9 +1798,7 @@ public class HFileBlock implements Cacheable { if (!fileContext.isCompressedOrEncrypted()) { hFileBlock.sanityCheckUncompressed(); } - if (LOG.isTraceEnabled()) { -LOG.trace("Read " + hFileBlock + " in " + duration + " ns"); - } + LOG.trace("Read {} in {} ns", hFileBlock, duration); // Cache next block header if we read it for the next time through here. if (nextBlockOnDiskSize != -1) { cacheNextBlockHeader(offset +