Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 59C90191BB for ; Wed, 20 Apr 2016 16:44:00 +0000 (UTC) Received: (qmail 29882 invoked by uid 500); 20 Apr 2016 16:44:00 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 29841 invoked by uid 500); 20 Apr 2016 16:44:00 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 29832 invoked by uid 99); 20 Apr 2016 16:44:00 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Apr 2016 16:44:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EA7B0DFC70; Wed, 20 Apr 2016 16:43:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: stack@apache.org To: commits@hbase.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-15385 PREFETCH_BLOCKS_ON_OPEN in HColumnDescriptor is ignored Date: Wed, 20 Apr 2016 16:43:59 +0000 (UTC) Repository: hbase Updated Branches: refs/heads/branch-1.2 c86d17d41 -> b2e0008cf HBASE-15385 PREFETCH_BLOCKS_ON_OPEN in HColumnDescriptor is ignored Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b2e0008c Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b2e0008c Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b2e0008c Branch: refs/heads/branch-1.2 Commit: b2e0008cf34aaf6a41beff85c342b835493908f0 Parents: c86d17d Author: stack Authored: Wed Apr 20 09:43:52 2016 -0700 Committer: stack Committed: Wed Apr 20 09:43:52 2016 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/io/hfile/CacheConfig.java | 7 +++++-- .../java/org/apache/hadoop/hbase/io/hfile/HFileReaderV2.java | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/b2e0008c/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheConfig.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheConfig.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheConfig.java index 2b76b88..e79ba35 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheConfig.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/CacheConfig.java @@ -232,11 +232,14 @@ public class CacheConfig { HColumnDescriptor.DEFAULT_CACHE_DATA_IN_L1) || family.isCacheDataInL1(), conf.getBoolean(DROP_BEHIND_CACHE_COMPACTION_KEY,DROP_BEHIND_CACHE_COMPACTION_DEFAULT) ); + LOG.info("Created cacheConfig for " + family.getNameAsString() + ": " + this); } /** * Create a cache configuration using the specified configuration object and - * defaults for family level settings. + * defaults for family level settings. Only use if no column family context. Prefer + * {@link CacheConfig#CacheConfig(Configuration, HColumnDescriptor)} + * @see #CacheConfig(Configuration, HColumnDescriptor) * @param conf hbase configuration */ public CacheConfig(Configuration conf) { @@ -254,6 +257,7 @@ public class CacheConfig { HColumnDescriptor.DEFAULT_CACHE_DATA_IN_L1), conf.getBoolean(DROP_BEHIND_CACHE_COMPACTION_KEY,DROP_BEHIND_CACHE_COMPACTION_DEFAULT) ); + LOG.info("Created cacheConfig: " + this); } /** @@ -289,7 +293,6 @@ public class CacheConfig { this.prefetchOnOpen = prefetchOnOpen; this.cacheDataInL1 = cacheDataInL1; this.dropBehindCompaction = dropBehindCompaction; - LOG.info(this); } /** http://git-wip-us.apache.org/repos/asf/hbase/blob/b2e0008c/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderV2.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderV2.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderV2.java index a1b4c34..e0ae9ca 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderV2.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileReaderV2.java @@ -195,7 +195,7 @@ public class HFileReaderV2 extends AbstractHFileReader { end = getTrailer().getLoadOnOpenDataOffset(); HFileBlock prevBlock = null; if (LOG.isTraceEnabled()) { - LOG.trace("File=" + path.toString() + ", offset=" + offset + ", end=" + end); + LOG.trace("Prefetch=" + path.toString() + ", offset=" + offset + ", end=" + end); } while (offset < end) { if (Thread.interrupted()) { @@ -213,11 +213,11 @@ public class HFileReaderV2 extends AbstractHFileReader { } catch (IOException e) { // IOExceptions are probably due to region closes (relocation, etc.) if (LOG.isTraceEnabled()) { - LOG.trace("File=" + path.toString() + ", offset=" + offset + ", end=" + end, e); + LOG.trace("Prefetch=" + path.toString() + ", offset=" + offset + ", end=" + end, e); } } catch (Exception e) { // Other exceptions are interesting - LOG.warn("File=" + path.toString() + ", offset=" + offset + ", end=" + end, e); + LOG.warn("Prefetch=" + path.toString() + ", offset=" + offset + ", end=" + end, e); } finally { PrefetchExecutor.complete(path); }