hbase git commit: HBASE-18579 Enable core dump by default for docker -revert

[tedyu]

Repository: hbase
Updated Branches:
  refs/heads/HBASE-14850 6e0f6df79 -> d4bd3c71e


HBASE-18579 Enable core dump by default for docker -revert


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

Branch: refs/heads/HBASE-14850
Commit: d4bd3c71e12d86edab412da1389a3455dba5533e
Parents: 6e0f6df
Author: tedyu 
Authored: Mon Aug 14 16:15:22 2017 -0700
Committer: tedyu 
Committed: Mon Aug 14 16:15:22 2017 -0700

--
 hbase-native-client/bin/start-docker.sh | 2 +-
 hbase-native-client/docker-files/Dockerfile | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/d4bd3c71/hbase-native-client/bin/start-docker.sh
--
diff --git a/hbase-native-client/bin/start-docker.sh 
b/hbase-native-client/bin/start-docker.sh
index 391238d..53325c1 100755
--- a/hbase-native-client/bin/start-docker.sh
+++ b/hbase-native-client/bin/start-docker.sh
@@ -55,7 +55,7 @@ fi;
 docker build -t hbase_native -f docker-files/Dockerfile .
 
 # After the image is built run the thing
-docker run --privileged=true -h="securecluster" -p 16050:16050/tcp \
+docker run -h="securecluster" -p 16050:16050/tcp \
  -v ${BASE_DIR}/..:/usr/src/hbase \
-v ~/.m2:/root/.m2 \
  -it hbase_native /bin/bash

http://git-wip-us.apache.org/repos/asf/hbase/blob/d4bd3c71/hbase-native-client/docker-files/Dockerfile
--
diff --git a/hbase-native-client/docker-files/Dockerfile 
b/hbase-native-client/docker-files/Dockerfile
index ac3cb47..efd9a9d 100644
--- a/hbase-native-client/docker-files/Dockerfile
+++ b/hbase-native-client/docker-files/Dockerfile
@@ -117,8 +117,6 @@ RUN cd /usr/src/ && \
   ctest && \
   make install
 
-RUN echo "enabled=1" >> /etc/default/apport
-
-ENTRYPOINT /usr/sbin/krb5kdc -P /var/run/krb5kdc.pid && echo 
"/tmp/core.%h.%e.%t" >> /proc/sys/kernel/core_pattern && sysctl -p && ulimit -c 
unlimited && /bin/bash
+ENTRYPOINT /usr/sbin/krb5kdc -P /var/run/krb5kdc.pid && /bin/bash
 
 WORKDIR /usr/src/hbase/hbase-native-client

hbase git commit: HBASE-18533 Expose BucketCache values to be configured

[tedyu]

Repository: hbase
Updated Branches:
  refs/heads/branch-1.4 c6f57e0f3 -> 81f5da7af


HBASE-18533 Expose BucketCache values to be configured

Before this commit, BucketCache always used the default values.
This commit adds the ability to configure these values.

Signed-off-by: tedyu 


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

Branch: refs/heads/branch-1.4
Commit: 81f5da7af8525c34018df345eb8936b1b9851cc3
Parents: c6f57e0
Author: Zach York 
Authored: Wed Aug 2 14:43:03 2017 -0700
Committer: tedyu 
Committed: Mon Aug 14 13:29:27 2017 -0700

--
 .../hadoop/hbase/io/hfile/CacheConfig.java  |   2 +-
 .../hbase/io/hfile/bucket/BucketCache.java  | 126 ++-
 .../hbase/io/hfile/bucket/TestBucketCache.java  | 112 +
 .../io/hfile/bucket/TestBucketWriterThread.java |   3 +-
 4 files changed, 213 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/81f5da7a/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 57d2057..1d68b99 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
@@ -638,7 +638,7 @@ public class CacheConfig {
   // Bucket cache logs its stats on creation internal to the constructor.
   bucketCache = new BucketCache(bucketCacheIOEngineName,
 bucketCacheSize, blockSize, bucketSizes, writerThreads, 
writerQueueLen, persistentPath,
-ioErrorsTolerationDuration);
+ioErrorsTolerationDuration, c);
 } catch (IOException ioex) {
   LOG.error("Can't instantiate bucket cache", ioex); throw new 
RuntimeException(ioex);
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/81f5da7a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java
index 7aabb5c..0c8e62b 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java
@@ -51,8 +51,11 @@ import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
+import com.google.common.base.Preconditions;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.HBaseConfiguration;
 import org.apache.hadoop.hbase.classification.InterfaceAudience;
 import org.apache.hadoop.hbase.io.HeapSize;
 import org.apache.hadoop.hbase.io.hfile.BlockCache;
@@ -96,14 +99,23 @@ import 
com.google.common.util.concurrent.ThreadFactoryBuilder;
 public class BucketCache implements BlockCache, HeapSize {
   private static final Log LOG = LogFactory.getLog(BucketCache.class);
 
+  /** Priority buckets config */
+  static final String SINGLE_FACTOR_CONFIG_NAME = 
"hbase.bucketcache.single.factor";
+  static final String MULTI_FACTOR_CONFIG_NAME = 
"hbase.bucketcache.multi.factor";
+  static final String MEMORY_FACTOR_CONFIG_NAME = 
"hbase.bucketcache.memory.factor";
+  static final String EXTRA_FREE_FACTOR_CONFIG_NAME = 
"hbase.bucketcache.extrafreefactor";
+  static final String ACCEPT_FACTOR_CONFIG_NAME = 
"hbase.bucketcache.acceptfactor";
+  static final String MIN_FACTOR_CONFIG_NAME = "hbase.bucketcache.minfactor";
+
   /** Priority buckets */
-  private static final float DEFAULT_SINGLE_FACTOR = 0.25f;
-  private static final float DEFAULT_MULTI_FACTOR = 0.50f;
-  private static final float DEFAULT_MEMORY_FACTOR = 0.25f;
-  private static final float DEFAULT_EXTRA_FREE_FACTOR = 0.10f;
+  @VisibleForTesting
+  static final float DEFAULT_SINGLE_FACTOR = 0.25f;
+  static final float DEFAULT_MULTI_FACTOR = 0.50f;
+  static final float DEFAULT_MEMORY_FACTOR = 0.25f;
+  static final float DEFAULT_MIN_FACTOR = 0.85f;
 
+  private static final float DEFAULT_EXTRA_FREE_FACTOR = 0.10f;
   private static final float DEFAULT_ACCEPT_FACTOR = 0.95f;
-  private static final float DEFAULT_MIN_FACTOR = 0.85f;
 
   // Number of blocks to clear for each of the bucket size t

hbase git commit: HBASE-18533 Expose BucketCache values to be configured

[tedyu]

Repository: hbase
Updated Branches:
  refs/heads/branch-1 9078a034c -> d6a781cf0


HBASE-18533 Expose BucketCache values to be configured

Before this commit, BucketCache always used the default values.
This commit adds the ability to configure these values.

Signed-off-by: tedyu 


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

Branch: refs/heads/branch-1
Commit: d6a781cf0823b5051d929455218d6a4720150394
Parents: 9078a03
Author: Zach York 
Authored: Wed Aug 2 14:43:03 2017 -0700
Committer: tedyu 
Committed: Mon Aug 14 13:28:42 2017 -0700

--
 .../hadoop/hbase/io/hfile/CacheConfig.java  |   2 +-
 .../hbase/io/hfile/bucket/BucketCache.java  | 126 ++-
 .../hbase/io/hfile/bucket/TestBucketCache.java  | 112 +
 .../io/hfile/bucket/TestBucketWriterThread.java |   3 +-
 4 files changed, 213 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/d6a781cf/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 57d2057..1d68b99 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
@@ -638,7 +638,7 @@ public class CacheConfig {
   // Bucket cache logs its stats on creation internal to the constructor.
   bucketCache = new BucketCache(bucketCacheIOEngineName,
 bucketCacheSize, blockSize, bucketSizes, writerThreads, 
writerQueueLen, persistentPath,
-ioErrorsTolerationDuration);
+ioErrorsTolerationDuration, c);
 } catch (IOException ioex) {
   LOG.error("Can't instantiate bucket cache", ioex); throw new 
RuntimeException(ioex);
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/d6a781cf/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java
index 7aabb5c..0c8e62b 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java
@@ -51,8 +51,11 @@ import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
+import com.google.common.base.Preconditions;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.HBaseConfiguration;
 import org.apache.hadoop.hbase.classification.InterfaceAudience;
 import org.apache.hadoop.hbase.io.HeapSize;
 import org.apache.hadoop.hbase.io.hfile.BlockCache;
@@ -96,14 +99,23 @@ import 
com.google.common.util.concurrent.ThreadFactoryBuilder;
 public class BucketCache implements BlockCache, HeapSize {
   private static final Log LOG = LogFactory.getLog(BucketCache.class);
 
+  /** Priority buckets config */
+  static final String SINGLE_FACTOR_CONFIG_NAME = 
"hbase.bucketcache.single.factor";
+  static final String MULTI_FACTOR_CONFIG_NAME = 
"hbase.bucketcache.multi.factor";
+  static final String MEMORY_FACTOR_CONFIG_NAME = 
"hbase.bucketcache.memory.factor";
+  static final String EXTRA_FREE_FACTOR_CONFIG_NAME = 
"hbase.bucketcache.extrafreefactor";
+  static final String ACCEPT_FACTOR_CONFIG_NAME = 
"hbase.bucketcache.acceptfactor";
+  static final String MIN_FACTOR_CONFIG_NAME = "hbase.bucketcache.minfactor";
+
   /** Priority buckets */
-  private static final float DEFAULT_SINGLE_FACTOR = 0.25f;
-  private static final float DEFAULT_MULTI_FACTOR = 0.50f;
-  private static final float DEFAULT_MEMORY_FACTOR = 0.25f;
-  private static final float DEFAULT_EXTRA_FREE_FACTOR = 0.10f;
+  @VisibleForTesting
+  static final float DEFAULT_SINGLE_FACTOR = 0.25f;
+  static final float DEFAULT_MULTI_FACTOR = 0.50f;
+  static final float DEFAULT_MEMORY_FACTOR = 0.25f;
+  static final float DEFAULT_MIN_FACTOR = 0.85f;
 
+  private static final float DEFAULT_EXTRA_FREE_FACTOR = 0.10f;
   private static final float DEFAULT_ACCEPT_FACTOR = 0.95f;
-  private static final float DEFAULT_MIN_FACTOR = 0.85f;
 
   // Number of blocks to clear for each of the bucket size that 

hbase git commit: HBASE-18533 Expose BucketCache values to be configured

[tedyu]

Repository: hbase
Updated Branches:
  refs/heads/branch-2 0ded122b1 -> 26bbc8ad6


HBASE-18533 Expose BucketCache values to be configured

Before this commit, BucketCache always used the default values.
This commit adds the ability to configure these values.

Signed-off-by: tedyu 


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

Branch: refs/heads/branch-2
Commit: 26bbc8ad6c683a9965f61e2bce0e7caf5fd2a37e
Parents: 0ded122
Author: Zach York 
Authored: Wed Aug 2 14:43:03 2017 -0700
Committer: tedyu 
Committed: Mon Aug 14 13:27:56 2017 -0700

--
 .../hadoop/hbase/io/hfile/CacheConfig.java  |   2 +-
 .../hbase/io/hfile/bucket/BucketCache.java  | 126 ++-
 .../hbase/io/hfile/bucket/TestBucketCache.java  | 114 -
 .../io/hfile/bucket/TestBucketWriterThread.java |   3 +-
 4 files changed, 214 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/26bbc8ad/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 140009b..13f048e 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
@@ -671,7 +671,7 @@ public class CacheConfig {
   // Bucket cache logs its stats on creation internal to the constructor.
   bucketCache = new BucketCache(bucketCacheIOEngineName,
 bucketCacheSize, blockSize, bucketSizes, writerThreads, 
writerQueueLen, persistentPath,
-ioErrorsTolerationDuration);
+ioErrorsTolerationDuration, c);
 } catch (IOException ioex) {
   LOG.error("Can't instantiate bucket cache", ioex); throw new 
RuntimeException(ioex);
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/26bbc8ad/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java
index 1084399..79b1f4d 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java
@@ -52,8 +52,11 @@ import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
+import com.google.common.base.Preconditions;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.HBaseConfiguration;
 import org.apache.hadoop.hbase.classification.InterfaceAudience;
 import org.apache.hadoop.hbase.io.HeapSize;
 import org.apache.hadoop.hbase.io.hfile.BlockCache;
@@ -100,14 +103,23 @@ import 
org.apache.hadoop.hbase.shaded.com.google.common.util.concurrent.ThreadFa
 public class BucketCache implements BlockCache, HeapSize {
   private static final Log LOG = LogFactory.getLog(BucketCache.class);
 
+  /** Priority buckets config */
+  static final String SINGLE_FACTOR_CONFIG_NAME = 
"hbase.bucketcache.single.factor";
+  static final String MULTI_FACTOR_CONFIG_NAME = 
"hbase.bucketcache.multi.factor";
+  static final String MEMORY_FACTOR_CONFIG_NAME = 
"hbase.bucketcache.memory.factor";
+  static final String EXTRA_FREE_FACTOR_CONFIG_NAME = 
"hbase.bucketcache.extrafreefactor";
+  static final String ACCEPT_FACTOR_CONFIG_NAME = 
"hbase.bucketcache.acceptfactor";
+  static final String MIN_FACTOR_CONFIG_NAME = "hbase.bucketcache.minfactor";
+
   /** Priority buckets */
-  private static final float DEFAULT_SINGLE_FACTOR = 0.25f;
-  private static final float DEFAULT_MULTI_FACTOR = 0.50f;
-  private static final float DEFAULT_MEMORY_FACTOR = 0.25f;
-  private static final float DEFAULT_EXTRA_FREE_FACTOR = 0.10f;
+  @VisibleForTesting
+  static final float DEFAULT_SINGLE_FACTOR = 0.25f;
+  static final float DEFAULT_MULTI_FACTOR = 0.50f;
+  static final float DEFAULT_MEMORY_FACTOR = 0.25f;
+  static final float DEFAULT_MIN_FACTOR = 0.85f;
 
+  private static final float DEFAULT_EXTRA_FREE_FACTOR = 0.10f;
   private static final float DEFAULT_ACCEPT_FACTOR = 0.95f;
-  private static final float DEFAULT_MIN_FACTOR = 0.85f;
 
   // Number of blocks to clear for each of t

hbase git commit: HBASE-18533 Expose BucketCache values to be configured

[tedyu]

Repository: hbase
Updated Branches:
  refs/heads/master 0b26ccdaa -> 0e32869f0


HBASE-18533 Expose BucketCache values to be configured

Before this commit, BucketCache always used the default values.
This commit adds the ability to configure these values.

Signed-off-by: tedyu 


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

Branch: refs/heads/master
Commit: 0e32869f01697abf29292aa786d0cdcca10213c6
Parents: 0b26ccd
Author: Zach York 
Authored: Wed Aug 2 14:43:03 2017 -0700
Committer: tedyu 
Committed: Mon Aug 14 13:27:26 2017 -0700

--
 .../hadoop/hbase/io/hfile/CacheConfig.java  |   2 +-
 .../hbase/io/hfile/bucket/BucketCache.java  | 126 ++-
 .../hbase/io/hfile/bucket/TestBucketCache.java  | 114 -
 .../io/hfile/bucket/TestBucketWriterThread.java |   3 +-
 4 files changed, 214 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/0e32869f/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 140009b..13f048e 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
@@ -671,7 +671,7 @@ public class CacheConfig {
   // Bucket cache logs its stats on creation internal to the constructor.
   bucketCache = new BucketCache(bucketCacheIOEngineName,
 bucketCacheSize, blockSize, bucketSizes, writerThreads, 
writerQueueLen, persistentPath,
-ioErrorsTolerationDuration);
+ioErrorsTolerationDuration, c);
 } catch (IOException ioex) {
   LOG.error("Can't instantiate bucket cache", ioex); throw new 
RuntimeException(ioex);
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/0e32869f/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java
index 1084399..79b1f4d 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java
@@ -52,8 +52,11 @@ import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
+import com.google.common.base.Preconditions;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.HBaseConfiguration;
 import org.apache.hadoop.hbase.classification.InterfaceAudience;
 import org.apache.hadoop.hbase.io.HeapSize;
 import org.apache.hadoop.hbase.io.hfile.BlockCache;
@@ -100,14 +103,23 @@ import 
org.apache.hadoop.hbase.shaded.com.google.common.util.concurrent.ThreadFa
 public class BucketCache implements BlockCache, HeapSize {
   private static final Log LOG = LogFactory.getLog(BucketCache.class);
 
+  /** Priority buckets config */
+  static final String SINGLE_FACTOR_CONFIG_NAME = 
"hbase.bucketcache.single.factor";
+  static final String MULTI_FACTOR_CONFIG_NAME = 
"hbase.bucketcache.multi.factor";
+  static final String MEMORY_FACTOR_CONFIG_NAME = 
"hbase.bucketcache.memory.factor";
+  static final String EXTRA_FREE_FACTOR_CONFIG_NAME = 
"hbase.bucketcache.extrafreefactor";
+  static final String ACCEPT_FACTOR_CONFIG_NAME = 
"hbase.bucketcache.acceptfactor";
+  static final String MIN_FACTOR_CONFIG_NAME = "hbase.bucketcache.minfactor";
+
   /** Priority buckets */
-  private static final float DEFAULT_SINGLE_FACTOR = 0.25f;
-  private static final float DEFAULT_MULTI_FACTOR = 0.50f;
-  private static final float DEFAULT_MEMORY_FACTOR = 0.25f;
-  private static final float DEFAULT_EXTRA_FREE_FACTOR = 0.10f;
+  @VisibleForTesting
+  static final float DEFAULT_SINGLE_FACTOR = 0.25f;
+  static final float DEFAULT_MULTI_FACTOR = 0.50f;
+  static final float DEFAULT_MEMORY_FACTOR = 0.25f;
+  static final float DEFAULT_MIN_FACTOR = 0.85f;
 
+  private static final float DEFAULT_EXTRA_FREE_FACTOR = 0.10f;
   private static final float DEFAULT_ACCEPT_FACTOR = 0.95f;
-  private static final float DEFAULT_MIN_FACTOR = 0.85f;
 
   // Number of blocks to clear for each of the b

hbase git commit: HBASE-18510 Update clock on replaying recovered edits (Sai Teja Ranuva)

[appy]

Repository: hbase
Updated Branches:
  refs/heads/HBASE-14070.HLC 93c0d71c4 -> 58a51bcb7


HBASE-18510 Update clock on replaying recovered edits (Sai Teja Ranuva)

- Added clock updating to HRegion#replayRecoveredEdits
- Added TestHRegion#testHybridLogicalClockUpdatesOnRecoveryEditReplay and
  TestHRegion#testSystemMonotonicClockUpdatesOnRecoveryEditReplay
- Added comments clarifying expected logical and physical time in tests
- Changed TimestampType#getLogicalTime to be public

Change-Id: Ieba31b70fa2bdd3fa8080b521958039cb288badc


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

Branch: refs/heads/HBASE-14070.HLC
Commit: 58a51bcb72250c3173d418a6d3fffb0c1f0d446c
Parents: 93c0d71
Author: Amit Patel 
Authored: Thu Jul 27 11:45:13 2017 -0700
Committer: Apekshit Sharma 
Committed: Mon Aug 14 12:40:43 2017 -0700

--
 .../org/apache/hadoop/hbase/TimestampType.java  |  10 +-
 .../hadoop/hbase/regionserver/HRegion.java  |   1 +
 .../hadoop/hbase/regionserver/TestHRegion.java  | 108 +++
 3 files changed, 116 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/58a51bcb/hbase-common/src/main/java/org/apache/hadoop/hbase/TimestampType.java
--
diff --git 
a/hbase-common/src/main/java/org/apache/hadoop/hbase/TimestampType.java 
b/hbase-common/src/main/java/org/apache/hadoop/hbase/TimestampType.java
index 2f0a229..effbde2 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/TimestampType.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/TimestampType.java
@@ -16,6 +16,7 @@
 
 package org.apache.hadoop.hbase;
 
+import com.google.common.annotations.VisibleForTesting;
 import org.apache.hadoop.hbase.classification.InterfaceAudience;
 import org.apache.hadoop.hbase.classification.InterfaceStability;
 import org.apache.commons.lang.time.FastDateFormat;
@@ -105,7 +106,8 @@ public enum TimestampType {
   return timestamp >>> BITS_FOR_LOGICAL_TIME; // assume unsigned timestamp
 }
 
-long getLogicalTime(long timestamp) {
+@VisibleForTesting
+public long getLogicalTime(long timestamp) {
   return timestamp & LOGICAL_TIME_MAX_VALUE;
 }
 
@@ -200,7 +202,8 @@ public enum TimestampType {
   return timestamp;
 }
 
-long getLogicalTime(long timestamp) {
+@VisibleForTesting
+public long getLogicalTime(long timestamp) {
   return 0;
 }
 
@@ -281,7 +284,8 @@ public enum TimestampType {
* @param timestamp {@link #HYBRID} or {@link #PHYSICAL} Timestamp
* @return logical time
*/
-  abstract long getLogicalTime(long timestamp);
+  @VisibleForTesting
+  abstract public long getLogicalTime(long timestamp);
 
   /**
* @return the maximum possible physical time in {@link 
TimeUnit#MILLISECONDS}

http://git-wip-us.apache.org/repos/asf/hbase/blob/58a51bcb/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
index 2b82e4c..56f8bb6 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
@@ -4434,6 +4434,7 @@ public class HRegion implements HeapSize, 
PropagatingConfigurationObserver, Regi
   continue;
 }
 CellUtil.setSequenceId(cell, currentReplaySeqId);
+clock.update(cell.getTimestamp());
 
 restoreEdit(store, cell, memstoreSize);
 editsCount++;

http://git-wip-us.apache.org/repos/asf/hbase/blob/58a51bcb/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
index 7350473..a7e590b 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
@@ -720,6 +720,114 @@ public class TestHRegion {
 }
   }
 
+  public void verifyClockUpdatesOnRecoveryEditReplay(Clock clock, List 
seqIds,
+  List editTimestamps, long recoverSeqId, long expectedTimestamp) 
throws Exception {
+byte[] family = Bytes.toBytes("family");
+region = initHRegion(tableName, method

hbase git commit: HBASE-18303 Clean up @Parameter boilerplate

[mdrob]

Repository: hbase
Updated Branches:
  refs/heads/branch-2 4e9961b4f -> 0ded122b1


HBASE-18303 Clean up @Parameter boilerplate


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

Branch: refs/heads/branch-2
Commit: 0ded122b1ebaa006e84f12a7a051eb8eaca571c3
Parents: 4e9961b
Author: Mike Drob 
Authored: Fri Jun 30 12:13:56 2017 -0500
Committer: Mike Drob 
Committed: Mon Aug 14 14:24:37 2017 -0500

--
 .../hadoop/hbase/filter/TestKeyOnlyFilter.java  | 15 -
 .../hadoop/hbase/HBaseCommonTestingUtility.java | 22 
 .../apache/hadoop/hbase/types/TestStruct.java   | 18 +++-
 .../hadoop/hbase/util/TestByteBufferUtils.java  |  8 ++-
 .../hbase/codec/keyvalue/TestKeyValueTool.java  | 16 +++---
 .../codec/prefixtree/row/TestRowEncoder.java|  6 +-
 .../hadoop/hbase/rest/TestMultiRowResource.java |  5 +
 .../hadoop/hbase/HBaseTestingUtility.java   | 20 +-
 .../encoding/TestSeekToBlockWithEncoders.java   |  4 ++--
 .../hadoop/hbase/io/hfile/TestCacheOnWrite.java |  3 ++-
 .../apache/hadoop/hbase/io/hfile/TestHFile.java |  3 ++-
 .../hbase/io/hfile/TestHFileBlockIndex.java |  3 ++-
 .../hbase/io/hfile/TestHFileWriterV3.java   |  3 ++-
 .../hbase/util/TestCoprocessorScanPolicy.java   |  3 ++-
 14 files changed, 59 insertions(+), 70 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/0ded122b/hbase-client/src/test/java/org/apache/hadoop/hbase/filter/TestKeyOnlyFilter.java
--
diff --git 
a/hbase-client/src/test/java/org/apache/hadoop/hbase/filter/TestKeyOnlyFilter.java
 
b/hbase-client/src/test/java/org/apache/hadoop/hbase/filter/TestKeyOnlyFilter.java
index 33e3cd9..f957b59 100644
--- 
a/hbase-client/src/test/java/org/apache/hadoop/hbase/filter/TestKeyOnlyFilter.java
+++ 
b/hbase-client/src/test/java/org/apache/hadoop/hbase/filter/TestKeyOnlyFilter.java
@@ -26,6 +26,7 @@ import java.util.List;
 import org.apache.hadoop.hbase.ByteBufferKeyValue;
 
 import org.apache.hadoop.hbase.CellUtil;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
 import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.hbase.KeyValue.Type;
 import org.apache.hadoop.hbase.KeyValueUtil;
@@ -44,20 +45,12 @@ import org.junit.runners.Parameterized.Parameters;
 @RunWith(Parameterized.class)
 public class TestKeyOnlyFilter {
 
-  private final boolean lenAsVal;
+  @Parameterized.Parameter
+  public boolean lenAsVal;
 
   @Parameters
   public static Collection parameters() {
-List paramList = new ArrayList<>(2);
-{
-  paramList.add(new Object[] { false });
-  paramList.add(new Object[] { true });
-}
-return paramList;
-  }
-
-  public TestKeyOnlyFilter(boolean lenAsVal) {
-this.lenAsVal = lenAsVal;
+return HBaseCommonTestingUtility.BOOLEAN_PARAMETERIZED;
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/hbase/blob/0ded122b/hbase-common/src/test/java/org/apache/hadoop/hbase/HBaseCommonTestingUtility.java
--
diff --git 
a/hbase-common/src/test/java/org/apache/hadoop/hbase/HBaseCommonTestingUtility.java
 
b/hbase-common/src/test/java/org/apache/hadoop/hbase/HBaseCommonTestingUtility.java
index e191046..1790f4a 100644
--- 
a/hbase-common/src/test/java/org/apache/hadoop/hbase/HBaseCommonTestingUtility.java
+++ 
b/hbase-common/src/test/java/org/apache/hadoop/hbase/HBaseCommonTestingUtility.java
@@ -20,6 +20,8 @@ package org.apache.hadoop.hbase;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
 import java.util.UUID;
 
 import org.apache.commons.io.FileUtils;
@@ -28,6 +30,7 @@ import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.classification.InterfaceAudience;
+import org.apache.hadoop.hbase.io.compress.Compression;
 
 /**
  * Common helpers for testing HBase that do not depend on specific server/etc. 
things.
@@ -37,6 +40,25 @@ import 
org.apache.hadoop.hbase.classification.InterfaceAudience;
 public class HBaseCommonTestingUtility {
   protected static final Log LOG = 
LogFactory.getLog(HBaseCommonTestingUtility.class);
 
+  /** Compression algorithms to use in parameterized JUnit 4 tests */
+  public static final List COMPRESSION_ALGORITHMS_PARAMETERIZED =
+Arrays.asList(new Object[][] {
+  { Compression.Algorithm.NONE },
+  { Compression.Algorithm.GZ }
+});
+
+  /** This is for unit tests parameterized with a two booleans. */
+  public static final 

[2/3] hbase git commit: HBASE-18497 Add clock type to proto message for HLC region open/close (revision 4)

[appy]

http://git-wip-us.apache.org/repos/asf/hbase/blob/93c0d71c/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/AdminProtos.java
--
diff --git 
a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/AdminProtos.java
 
b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/AdminProtos.java
index f739de6..a74ee18 100644
--- 
a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/AdminProtos.java
+++ 
b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/AdminProtos.java
@@ -4542,28 +4542,47 @@ public final class AdminProtos {
 
 /**
  * 
- * physical or hybrid timestamp from master clock
+ * timestamps from each clock on master
  * 
  *
- * optional .hbase.pb.NodeTime nodeTime = 6;
+ * repeated .hbase.pb.NodeTime nodeTimes = 6;
  */
-boolean hasNodeTime();
+
java.util.List
 
+getNodeTimesList();
 /**
  * 
- * physical or hybrid timestamp from master clock
+ * timestamps from each clock on master
  * 
  *
- * optional .hbase.pb.NodeTime nodeTime = 6;
+ * repeated .hbase.pb.NodeTime nodeTimes = 6;
  */
-org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime 
getNodeTime();
+org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime 
getNodeTimes(int index);
 /**
  * 
- * physical or hybrid timestamp from master clock
+ * timestamps from each clock on master
  * 
  *
- * optional .hbase.pb.NodeTime nodeTime = 6;
+ * repeated .hbase.pb.NodeTime nodeTimes = 6;
  */
-
org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder 
getNodeTimeOrBuilder();
+int getNodeTimesCount();
+/**
+ * 
+ * timestamps from each clock on master
+ * 
+ *
+ * repeated .hbase.pb.NodeTime nodeTimes = 6;
+ */
+java.util.List
 
+getNodeTimesOrBuilderList();
+/**
+ * 
+ * timestamps from each clock on master
+ * 
+ *
+ * repeated .hbase.pb.NodeTime nodeTimes = 6;
+ */
+
org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTimeOrBuilder 
getNodeTimesOrBuilder(
+int index);
   }
   /**
* Protobuf type {@code hbase.pb.OpenRegionRequest}
@@ -4580,6 +4599,7 @@ public final class AdminProtos {
   openInfo_ = java.util.Collections.emptyList();
   serverStartCode_ = 0L;
   masterSystemTime_ = 0L;
+  nodeTimes_ = java.util.Collections.emptyList();
 }
 
 @java.lang.Override
@@ -4630,16 +4650,12 @@ public final class AdminProtos {
   break;
 }
 case 50: {
-  
org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder 
subBuilder = null;
-  if (((bitField0_ & 0x0004) == 0x0004)) {
-subBuilder = nodeTime_.toBuilder();
-  }
-  nodeTime_ = 
input.readMessage(org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.PARSER,
 extensionRegistry);
-  if (subBuilder != null) {
-subBuilder.mergeFrom(nodeTime_);
-nodeTime_ = subBuilder.buildPartial();
+  if (!((mutable_bitField0_ & 0x0008) == 0x0008)) {
+nodeTimes_ = new 
java.util.ArrayList();
+mutable_bitField0_ |= 0x0008;
   }
-  bitField0_ |= 0x0004;
+  nodeTimes_.add(
+  
input.readMessage(org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.PARSER,
 extensionRegistry));
   break;
 }
   }
@@ -4653,6 +4669,9 @@ public final class AdminProtos {
 if (((mutable_bitField0_ & 0x0001) == 0x0001)) {
   openInfo_ = java.util.Collections.unmodifiableList(openInfo_);
 }
+if (((mutable_bitField0_ & 0x0008) == 0x0008)) {
+  nodeTimes_ = java.util.Collections.unmodifiableList(nodeTimes_);
+}
 this.unknownFields = unknownFields.build();
 makeExtensionsImmutable();
   }
@@ -5928,37 +5947,59 @@ public final class AdminProtos {
   return masterSystemTime_;
 }
 
-public static final int NODETIME_FIELD_NUMBER = 6;
-private 
org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime 
nodeTime_;
+public static final int NODETIMES_FIELD_NUMBER = 6;
+private 
java.util.List
 nodeTimes_;
 /**
  * 
- * physical or hybrid timestamp from master clock
+ * timestamps from each clock on master
  * 
  *
- * optional .hbase.pb.NodeTime nodeTime = 6;
+ * repeated .hbase.pb.NodeTime nodeTimes = 6;
  */
-public boolean hasNodeTime() {
-  return ((bitField0_ & 0x0004) == 0x0004);
+public 
java.ut

[1/3] hbase git commit: HBASE-18497 Add clock type to proto message for HLC region open/close (revision 4)

[appy]

Repository: hbase
Updated Branches:
  refs/heads/HBASE-14070.HLC d9a990490 -> 93c0d71c4


http://git-wip-us.apache.org/repos/asf/hbase/blob/93c0d71c/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/HBaseProtos.java
--
diff --git 
a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/HBaseProtos.java
 
b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/HBaseProtos.java
index cb1a47c..8fdd6b6 100644
--- 
a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/HBaseProtos.java
+++ 
b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/HBaseProtos.java
@@ -19002,19 +19002,27 @@ public final class HBaseProtos {
   org.apache.hadoop.hbase.shaded.com.google.protobuf.MessageOrBuilder {
 
 /**
- * optional uint64 time = 1;
+ * optional .hbase.pb.NodeTime.ClockType clockType = 1;
  */
-boolean hasTime();
+boolean hasClockType();
 /**
- * optional uint64 time = 1;
+ * optional .hbase.pb.NodeTime.ClockType clockType = 1;
  */
-long getTime();
+
org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.ClockType
 getClockType();
+
+/**
+ * optional uint64 timestamp = 2;
+ */
+boolean hasTimestamp();
+/**
+ * optional uint64 timestamp = 2;
+ */
+long getTimestamp();
   }
   /**
* 
**
-   * Used to send timestamp of node. The timestamp can be interpreted as 
either a physical or hybrid
-   * timestamp using TimestampType.
+   * Used to send timestamps from each clock of a master or region server
* 
*
* Protobuf type {@code hbase.pb.NodeTime}
@@ -19028,7 +19036,8 @@ public final class HBaseProtos {
   super(builder);
 }
 private NodeTime() {
-  time_ = 0L;
+  clockType_ = 0;
+  timestamp_ = 0L;
 }
 
 @java.lang.Override
@@ -19060,8 +19069,19 @@ public final class HBaseProtos {
   break;
 }
 case 8: {
-  bitField0_ |= 0x0001;
-  time_ = input.readUInt64();
+  int rawValue = input.readEnum();
+  
org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.ClockType
 value = 
org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.ClockType.valueOf(rawValue);
+  if (value == null) {
+unknownFields.mergeVarintField(1, rawValue);
+  } else {
+bitField0_ |= 0x0001;
+clockType_ = rawValue;
+  }
+  break;
+}
+case 16: {
+  bitField0_ |= 0x0002;
+  timestamp_ = input.readUInt64();
   break;
 }
   }
@@ -19088,20 +19108,135 @@ public final class HBaseProtos {
   
org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.class, 
org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NodeTime.Builder.class);
 }
 
+/**
+ * Protobuf enum {@code hbase.pb.NodeTime.ClockType}
+ */
+public enum ClockType
+implements 
org.apache.hadoop.hbase.shaded.com.google.protobuf.ProtocolMessageEnum {
+  /**
+   * SYSTEM = 0;
+   */
+  SYSTEM(0),
+  /**
+   * SYSTEM_MONOTONIC = 1;
+   */
+  SYSTEM_MONOTONIC(1),
+  /**
+   * HLC = 2;
+   */
+  HLC(2),
+  ;
+
+  /**
+   * SYSTEM = 0;
+   */
+  public static final int SYSTEM_VALUE = 0;
+  /**
+   * SYSTEM_MONOTONIC = 1;
+   */
+  public static final int SYSTEM_MONOTONIC_VALUE = 1;
+  /**
+   * HLC = 2;
+   */
+  public static final int HLC_VALUE = 2;
+
+
+  public final int getNumber() {
+return value;
+  }
+
+  /**
+   * @deprecated Use {@link #forNumber(int)} instead.
+   */
+  @java.lang.Deprecated
+  public static ClockType valueOf(int value) {
+return forNumber(value);
+  }
+
+  public static ClockType forNumber(int value) {
+switch (value) {
+  case 0: return SYSTEM;
+  case 1: return SYSTEM_MONOTONIC;
+  case 2: return HLC;
+  default: return null;
+}
+  }
+
+  public static 
org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.EnumLiteMap
+  internalGetValueMap() {
+return internalValueMap;
+  }
+  private static final 
org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.EnumLiteMap<
+  ClockType> internalValueMap =
+new 
org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.EnumLiteMap()
 {
+  public ClockType findValueByNumber(int number) {
+return ClockType.forNumber(number);
+  }
+};
+
+  public final 
org.apache.hadoop.hbase.shaded.com.

[3/3] hbase git commit: HBASE-18497 Add clock type to proto message for HLC region open/close (revision 4)

[appy]

HBASE-18497 Add clock type to proto message for HLC region open/close (revision 
4)

- Removed overridden methods in HMaster#get/set/updateClock
- Changed parameter name and exception text in ProtobufUtil#toClockType
- Removed unused import of ClockType in TestMasterNoCluster
- Removed unused ServerManager#sendRegionClose(ServerName, HRegionInfo, Long) 
that recursively called itself
- Added TODO in RSProcedureDispatcher to update clock with top timestamp of 
both loops
- Added TODO in RequestConverter for removing/merging masterSystemTime

Change-Id: I916e759512d958eaa18c8de8eb0f20dc96adec12


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

Branch: refs/heads/HBASE-14070.HLC
Commit: 93c0d71c47ba850b4353872082ddc1ffa76dd30d
Parents: d9a9904
Author: Amit Patel 
Authored: Wed Aug 2 20:06:09 2017 -0700
Committer: Apekshit Sharma 
Committed: Mon Aug 14 12:24:09 2017 -0700

--
 .../hadoop/hbase/client/RawAsyncHBaseAdmin.java |5 +-
 .../hbase/shaded/protobuf/ProtobufUtil.java |   69 +-
 .../hbase/shaded/protobuf/RequestConverter.java |   29 +-
 .../shaded/protobuf/generated/AdminProtos.java  | 2151 --
 .../shaded/protobuf/generated/HBaseProtos.java  |  303 ++-
 .../src/main/protobuf/Admin.proto   |   16 +-
 .../src/main/protobuf/HBase.proto   |   11 +-
 .../org/apache/hadoop/hbase/master/HMaster.java |   19 -
 .../hadoop/hbase/master/MasterServices.java |6 -
 .../hadoop/hbase/master/ServerManager.java  |   17 +-
 .../master/procedure/RSProcedureDispatcher.java |   54 +-
 .../hbase/regionserver/HRegionServer.java   |8 -
 .../hbase/regionserver/RSRpcServices.java   |   36 +-
 .../regionserver/RegionServerServices.java  |6 -
 .../hadoop/hbase/MockRegionServerServices.java  |8 -
 .../hbase/master/MockNoopMasterServices.java|3 -
 .../hadoop/hbase/master/MockRegionServer.java   |8 -
 .../hbase/master/TestMasterNoCluster.java   |3 +-
 18 files changed, 1925 insertions(+), 827 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/93c0d71c/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.java
 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.java
index 0cef556..1ae0eec 100644
--- 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.java
+++ 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.java
@@ -752,12 +752,13 @@ public class RawAsyncHBaseAdmin implements AsyncAdmin {
   }
 
   private CompletableFuture closeRegion(HRegionInfo hri, ServerName 
serverName) {
+CloseRegionRequest request = 
ProtobufUtil.buildCloseRegionRequest(serverName,
+hri.getRegionName());
 return this
 . newAdminCaller()
 .action(
   (controller, stub) -> this. adminCall(
-controller, stub,
-ProtobufUtil.buildCloseRegionRequest(serverName, 
hri.getRegionName()),
+controller, stub, request,
 (s, c, req, done) -> s.closeRegion(controller, req, done), resp -> 
resp.getClosed()))
 .serverName(serverName).call();
   }

http://git-wip-us.apache.org/repos/asf/hbase/blob/93c0d71c/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java
 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java
index 4ebba53..407d59f 100644
--- 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java
+++ 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java
@@ -44,6 +44,7 @@ import org.apache.hadoop.hbase.ByteBufferCell;
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.CellScanner;
 import org.apache.hadoop.hbase.CellUtil;
+import org.apache.hadoop.hbase.ClockType;
 import org.apache.hadoop.hbase.ClusterId;
 import org.apache.hadoop.hbase.ClusterStatus;
 import org.apache.hadoop.hbase.DoNotRetryIOException;
@@ -154,6 +155,7 @@ import 
org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.BytesBytesP
 import 
org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.ColumnFamilySchema;
 import 
org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.NameBytesPair;
 import 
org.apache.hadoop.hbase.shaded.protobuf.generated

hbase git commit: HBASE-18303 Clean up @Parameter boilerplate

[mdrob]

Repository: hbase
Updated Branches:
  refs/heads/master ea8fa59a4 -> 0b26ccdaa


HBASE-18303 Clean up @Parameter boilerplate


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

Branch: refs/heads/master
Commit: 0b26ccdaa1b8700e7958aeebbaf9cad81e737dd0
Parents: ea8fa59
Author: Mike Drob 
Authored: Fri Jun 30 12:13:56 2017 -0500
Committer: Mike Drob 
Committed: Mon Aug 14 14:23:24 2017 -0500

--
 .../hadoop/hbase/filter/TestKeyOnlyFilter.java  | 15 -
 .../hadoop/hbase/HBaseCommonTestingUtility.java | 22 
 .../apache/hadoop/hbase/types/TestStruct.java   | 18 +++-
 .../hadoop/hbase/util/TestByteBufferUtils.java  |  8 ++-
 .../hbase/codec/keyvalue/TestKeyValueTool.java  | 16 +++---
 .../codec/prefixtree/row/TestRowEncoder.java|  6 +-
 .../hadoop/hbase/rest/TestMultiRowResource.java |  5 +
 .../hadoop/hbase/HBaseTestingUtility.java   | 20 +-
 .../encoding/TestSeekToBlockWithEncoders.java   |  4 ++--
 .../hadoop/hbase/io/hfile/TestCacheOnWrite.java |  3 ++-
 .../apache/hadoop/hbase/io/hfile/TestHFile.java |  3 ++-
 .../hbase/io/hfile/TestHFileBlockIndex.java |  3 ++-
 .../hbase/io/hfile/TestHFileWriterV3.java   |  3 ++-
 .../hbase/util/TestCoprocessorScanPolicy.java   |  3 ++-
 14 files changed, 59 insertions(+), 70 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/0b26ccda/hbase-client/src/test/java/org/apache/hadoop/hbase/filter/TestKeyOnlyFilter.java
--
diff --git 
a/hbase-client/src/test/java/org/apache/hadoop/hbase/filter/TestKeyOnlyFilter.java
 
b/hbase-client/src/test/java/org/apache/hadoop/hbase/filter/TestKeyOnlyFilter.java
index 33e3cd9..f957b59 100644
--- 
a/hbase-client/src/test/java/org/apache/hadoop/hbase/filter/TestKeyOnlyFilter.java
+++ 
b/hbase-client/src/test/java/org/apache/hadoop/hbase/filter/TestKeyOnlyFilter.java
@@ -26,6 +26,7 @@ import java.util.List;
 import org.apache.hadoop.hbase.ByteBufferKeyValue;
 
 import org.apache.hadoop.hbase.CellUtil;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
 import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.hbase.KeyValue.Type;
 import org.apache.hadoop.hbase.KeyValueUtil;
@@ -44,20 +45,12 @@ import org.junit.runners.Parameterized.Parameters;
 @RunWith(Parameterized.class)
 public class TestKeyOnlyFilter {
 
-  private final boolean lenAsVal;
+  @Parameterized.Parameter
+  public boolean lenAsVal;
 
   @Parameters
   public static Collection parameters() {
-List paramList = new ArrayList<>(2);
-{
-  paramList.add(new Object[] { false });
-  paramList.add(new Object[] { true });
-}
-return paramList;
-  }
-
-  public TestKeyOnlyFilter(boolean lenAsVal) {
-this.lenAsVal = lenAsVal;
+return HBaseCommonTestingUtility.BOOLEAN_PARAMETERIZED;
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/hbase/blob/0b26ccda/hbase-common/src/test/java/org/apache/hadoop/hbase/HBaseCommonTestingUtility.java
--
diff --git 
a/hbase-common/src/test/java/org/apache/hadoop/hbase/HBaseCommonTestingUtility.java
 
b/hbase-common/src/test/java/org/apache/hadoop/hbase/HBaseCommonTestingUtility.java
index e191046..1790f4a 100644
--- 
a/hbase-common/src/test/java/org/apache/hadoop/hbase/HBaseCommonTestingUtility.java
+++ 
b/hbase-common/src/test/java/org/apache/hadoop/hbase/HBaseCommonTestingUtility.java
@@ -20,6 +20,8 @@ package org.apache.hadoop.hbase;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
 import java.util.UUID;
 
 import org.apache.commons.io.FileUtils;
@@ -28,6 +30,7 @@ import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.classification.InterfaceAudience;
+import org.apache.hadoop.hbase.io.compress.Compression;
 
 /**
  * Common helpers for testing HBase that do not depend on specific server/etc. 
things.
@@ -37,6 +40,25 @@ import 
org.apache.hadoop.hbase.classification.InterfaceAudience;
 public class HBaseCommonTestingUtility {
   protected static final Log LOG = 
LogFactory.getLog(HBaseCommonTestingUtility.class);
 
+  /** Compression algorithms to use in parameterized JUnit 4 tests */
+  public static final List COMPRESSION_ALGORITHMS_PARAMETERIZED =
+Arrays.asList(new Object[][] {
+  { Compression.Algorithm.NONE },
+  { Compression.Algorithm.GZ }
+});
+
+  /** This is for unit tests parameterized with a two booleans. */
+  public static final List

hbase git commit: HBASE-18238 rubocop autocorrect for bin/

[mdrob]

Repository: hbase
Updated Branches:
  refs/heads/branch-2 cf050de91 -> 4e9961b4f


HBASE-18238 rubocop autocorrect for bin/


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

Branch: refs/heads/branch-2
Commit: 4e9961b4fcb198a74d292e6a5405755dce261dcc
Parents: cf050de
Author: Mike Drob 
Authored: Wed Jul 19 12:05:26 2017 -0500
Committer: Mike Drob 
Committed: Mon Aug 14 14:04:43 2017 -0500

--
 bin/draining_servers.rb | 108 +++
 bin/get-active-master.rb|   6 +-
 bin/hirb.rb |  46 +++--
 bin/region_mover.rb |   2 +-
 bin/region_status.rb|  50 +++---
 bin/replication/copy_tables_desc.rb |  47 +++---
 bin/shutdown_regionserver.rb|  16 ++---
 7 files changed, 132 insertions(+), 143 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/4e9961b4/bin/draining_servers.rb
--
diff --git a/bin/draining_servers.rb b/bin/draining_servers.rb
index 8e1b250..ea74c30 100644
--- a/bin/draining_servers.rb
+++ b/bin/draining_servers.rb
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-# Add or remove servers from draining mode via zookeeper 
+# Add or remove servers from draining mode via zookeeper
 
 require 'optparse'
 include Java
@@ -29,13 +29,13 @@ java_import org.apache.commons.logging.Log
 java_import org.apache.commons.logging.LogFactory
 
 # Name of this script
-NAME = "draining_servers"
+NAME = 'draining_servers'.freeze
 
 # Do command-line parsing
 options = {}
 optparse = OptionParser.new do |opts|
   opts.banner = "Usage: ./hbase org.jruby.Main #{NAME}.rb [options] 
add|remove|list || ..."
-  opts.separator 'Add remove or list servers in draining mode. Can accept 
either hostname to drain all region servers' +
+  opts.separator 'Add remove or list servers in draining mode. Can accept 
either hostname to drain all region servers' \
  'in that host, a host:port pair or a host,port,startCode 
triplet. More than one server can be given separated by space'
   opts.on('-h', '--help', 'Display usage information') do
 puts opts
@@ -51,117 +51,117 @@ optparse.parse!
 # Return array of servernames where servername is hostname+port+startcode
 # comma-delimited
 def getServers(admin)
-  serverInfos = admin.getClusterStatus().getServers()
+  serverInfos = admin.getClusterStatus.getServers
   servers = []
   for server in serverInfos
-servers << server.getServerName()
+servers << server.getServerName
   end
-  return servers
+  servers
 end
 
 def getServerNames(hostOrServers, config)
   ret = []
   connection = ConnectionFactory.createConnection(config)
-  
+
   for hostOrServer in hostOrServers
 # check whether it is already serverName. No need to connect to cluster
 parts = hostOrServer.split(',')
-if parts.size() == 3
+if parts.size == 3
   ret << hostOrServer
-else 
-  admin = connection.getAdmin() if not admin
+else
+  admin = connection.getAdmin unless admin
   servers = getServers(admin)
 
-  hostOrServer = hostOrServer.gsub(/:/, ",")
-  for server in servers 
+  hostOrServer = hostOrServer.tr(':', ',')
+  for server in servers
 ret << server if server.start_with?(hostOrServer)
   end
 end
   end
-  
-  admin.close() if admin
-  connection.close()
-  return ret
+
+  admin.close if admin
+  connection.close
+  ret
 end
 
-def addServers(options, hostOrServers)
-  config = HBaseConfiguration.create()
+def addServers(_options, hostOrServers)
+  config = HBaseConfiguration.create
   servers = getServerNames(hostOrServers, config)
-  
-  zkw = org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher.new(config, 
"draining_servers", nil)
+
+  zkw = org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher.new(config, 
'draining_servers', nil)
   parentZnode = zkw.znodePaths.drainingZNode
-  
+
   begin
 for server in servers
   node = ZKUtil.joinZNode(parentZnode, server)
   ZKUtil.createAndFailSilent(zkw, node)
 end
   ensure
-zkw.close()
+zkw.close
   end
 end
 
-def removeServers(options, hostOrServers)
-  config = HBaseConfiguration.create()
+def removeServers(_options, hostOrServers)
+  config = HBaseConfiguration.create
   servers = getServerNames(hostOrServers, config)
-  
-  zkw = org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher.new(config, 
"draining_servers", nil)
+
+  zkw = org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher.new(config, 
'draining_servers', nil)
   parentZnode = zkw.znodePaths.drainingZNode
-  
+
   begin
 for server i

hbase git commit: HBASE-18238 rubocop autocorrect for bin/

[mdrob]

Repository: hbase
Updated Branches:
  refs/heads/master 096dac2e8 -> ea8fa59a4


HBASE-18238 rubocop autocorrect for bin/


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

Branch: refs/heads/master
Commit: ea8fa59a4c2fe7633ebe70df622098bfe36b5df9
Parents: 096dac2
Author: Mike Drob 
Authored: Wed Jul 19 12:05:26 2017 -0500
Committer: Mike Drob 
Committed: Mon Aug 14 13:53:37 2017 -0500

--
 bin/draining_servers.rb | 108 +++
 bin/get-active-master.rb|   6 +-
 bin/hirb.rb |  46 +++--
 bin/region_mover.rb |   2 +-
 bin/region_status.rb|  50 +++---
 bin/replication/copy_tables_desc.rb |  47 +++---
 bin/shutdown_regionserver.rb|  16 ++---
 7 files changed, 132 insertions(+), 143 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/ea8fa59a/bin/draining_servers.rb
--
diff --git a/bin/draining_servers.rb b/bin/draining_servers.rb
index 8e1b250..ea74c30 100644
--- a/bin/draining_servers.rb
+++ b/bin/draining_servers.rb
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-# Add or remove servers from draining mode via zookeeper 
+# Add or remove servers from draining mode via zookeeper
 
 require 'optparse'
 include Java
@@ -29,13 +29,13 @@ java_import org.apache.commons.logging.Log
 java_import org.apache.commons.logging.LogFactory
 
 # Name of this script
-NAME = "draining_servers"
+NAME = 'draining_servers'.freeze
 
 # Do command-line parsing
 options = {}
 optparse = OptionParser.new do |opts|
   opts.banner = "Usage: ./hbase org.jruby.Main #{NAME}.rb [options] 
add|remove|list || ..."
-  opts.separator 'Add remove or list servers in draining mode. Can accept 
either hostname to drain all region servers' +
+  opts.separator 'Add remove or list servers in draining mode. Can accept 
either hostname to drain all region servers' \
  'in that host, a host:port pair or a host,port,startCode 
triplet. More than one server can be given separated by space'
   opts.on('-h', '--help', 'Display usage information') do
 puts opts
@@ -51,117 +51,117 @@ optparse.parse!
 # Return array of servernames where servername is hostname+port+startcode
 # comma-delimited
 def getServers(admin)
-  serverInfos = admin.getClusterStatus().getServers()
+  serverInfos = admin.getClusterStatus.getServers
   servers = []
   for server in serverInfos
-servers << server.getServerName()
+servers << server.getServerName
   end
-  return servers
+  servers
 end
 
 def getServerNames(hostOrServers, config)
   ret = []
   connection = ConnectionFactory.createConnection(config)
-  
+
   for hostOrServer in hostOrServers
 # check whether it is already serverName. No need to connect to cluster
 parts = hostOrServer.split(',')
-if parts.size() == 3
+if parts.size == 3
   ret << hostOrServer
-else 
-  admin = connection.getAdmin() if not admin
+else
+  admin = connection.getAdmin unless admin
   servers = getServers(admin)
 
-  hostOrServer = hostOrServer.gsub(/:/, ",")
-  for server in servers 
+  hostOrServer = hostOrServer.tr(':', ',')
+  for server in servers
 ret << server if server.start_with?(hostOrServer)
   end
 end
   end
-  
-  admin.close() if admin
-  connection.close()
-  return ret
+
+  admin.close if admin
+  connection.close
+  ret
 end
 
-def addServers(options, hostOrServers)
-  config = HBaseConfiguration.create()
+def addServers(_options, hostOrServers)
+  config = HBaseConfiguration.create
   servers = getServerNames(hostOrServers, config)
-  
-  zkw = org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher.new(config, 
"draining_servers", nil)
+
+  zkw = org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher.new(config, 
'draining_servers', nil)
   parentZnode = zkw.znodePaths.drainingZNode
-  
+
   begin
 for server in servers
   node = ZKUtil.joinZNode(parentZnode, server)
   ZKUtil.createAndFailSilent(zkw, node)
 end
   ensure
-zkw.close()
+zkw.close
   end
 end
 
-def removeServers(options, hostOrServers)
-  config = HBaseConfiguration.create()
+def removeServers(_options, hostOrServers)
+  config = HBaseConfiguration.create
   servers = getServerNames(hostOrServers, config)
-  
-  zkw = org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher.new(config, 
"draining_servers", nil)
+
+  zkw = org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher.new(config, 
'draining_servers', nil)
   parentZnode = zkw.znodePaths.drainingZNode
-  
+
   begin
 for server in se

hbase git commit: HBASE-18522 Add RowMutations support to Batch

[jerryjch]

Repository: hbase
Updated Branches:
  refs/heads/branch-2 add997451 -> cf050de91


HBASE-18522 Add RowMutations support to Batch


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

Branch: refs/heads/branch-2
Commit: cf050de9172a36b767eb7e4700787b9d6a32a1b9
Parents: add9974
Author: Jerry He 
Authored: Mon Aug 14 09:28:49 2017 -0700
Committer: Jerry He 
Committed: Mon Aug 14 10:43:10 2017 -0700

--
 .../hbase/client/MultiServerCallable.java   | 64 +++-
 .../org/apache/hadoop/hbase/client/Table.java   |  4 +-
 .../hbase/shaded/protobuf/RequestConverter.java |  6 +-
 .../shaded/protobuf/ResponseConverter.java  | 37 ++-
 .../hbase/client/TestFromClientSide3.java   | 46 ++
 .../hadoop/hbase/client/TestMultiParallel.java  | 34 ++-
 6 files changed, 168 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/cf050de9/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MultiServerCallable.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MultiServerCallable.java
 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MultiServerCallable.java
index 33c9a0b..7f6052e 100644
--- 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MultiServerCallable.java
+++ 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MultiServerCallable.java
@@ -19,6 +19,7 @@ package org.apache.hadoop.hbase.client;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -93,30 +94,64 @@ class MultiServerCallable extends 
CancellableRegionServerCallable
 RegionAction.Builder regionActionBuilder = RegionAction.newBuilder();
 ClientProtos.Action.Builder actionBuilder = 
ClientProtos.Action.newBuilder();
 MutationProto.Builder mutationBuilder = MutationProto.newBuilder();
-List cells = null;
-// The multi object is a list of Actions by region.  Iterate by region.
+
+// Pre-size. Presume at least a KV per Action. There are likely more.
+List cells =
+(this.cellBlock ? new ArrayList(countOfActions) : null);
+
 long nonceGroup = multiAction.getNonceGroup();
 if (nonceGroup != HConstants.NO_NONCE) {
   multiRequestBuilder.setNonceGroup(nonceGroup);
 }
+// Index to track RegionAction within the MultiRequest
+int regionActionIndex = -1;
+// Map from a created RegionAction to the original index for a 
RowMutations within
+// its original list of actions
+Map rowMutationsIndexMap = new HashMap<>();
+// The multi object is a list of Actions by region. Iterate by region.
 for (Map.Entry> e: 
this.multiAction.actions.entrySet()) {
   final byte [] regionName = e.getKey();
   final List actions = e.getValue();
   regionActionBuilder.clear();
   regionActionBuilder.setRegion(RequestConverter.buildRegionSpecifier(
   HBaseProtos.RegionSpecifier.RegionSpecifierType.REGION_NAME, 
regionName));
-  if (this.cellBlock) {
-// Pre-size. Presume at least a KV per Action.  There are likely more.
-if (cells == null) cells = new ArrayList<>(countOfActions);
-// Send data in cellblocks. The call to buildNoDataMultiRequest will 
skip RowMutations.
-// They have already been handled above. Guess at count of cells
-regionActionBuilder = 
RequestConverter.buildNoDataRegionAction(regionName, actions, cells,
-  regionActionBuilder, actionBuilder, mutationBuilder);
-  } else {
-regionActionBuilder = RequestConverter.buildRegionAction(regionName, 
actions,
-  regionActionBuilder, actionBuilder, mutationBuilder);
+
+  int rowMutations = 0;
+  for (Action action : actions) {
+Row row = action.getAction();
+// Row Mutations are a set of Puts and/or Deletes all to be applied 
atomically
+// on the one row. We do separate RegionAction for each RowMutations.
+// We maintain a map to keep track of this RegionAction and the 
original Action index.
+if (row instanceof RowMutations) {
+  RowMutations rms = (RowMutations)row;
+  if (this.cellBlock) {
+// Build a multi request absent its Cell payload. Send data in 
cellblocks.
+regionActionBuilder = 
RequestConverter.buildNoDataRegionAction(regionName, rms, cells,
+  regionActionBuilder, actionBuilder, mutationBuilder);
+  } else {
+regionActionBuilder = 
RequestConverter.buildRegionAction(regionName, rms);
+  }
+

hbase git commit: HBASE-18522 Add RowMutations support to Batch

[jerryjch]

Repository: hbase
Updated Branches:
  refs/heads/master bd4007309 -> 096dac2e8


HBASE-18522 Add RowMutations support to Batch


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

Branch: refs/heads/master
Commit: 096dac2e83c675f212bad4f91888d8440ba152ca
Parents: bd40073
Author: Jerry He 
Authored: Mon Aug 14 10:39:46 2017 -0700
Committer: Jerry He 
Committed: Mon Aug 14 10:39:46 2017 -0700

--
 .../hbase/client/MultiServerCallable.java   | 64 +++-
 .../org/apache/hadoop/hbase/client/Table.java   |  4 +-
 .../hbase/shaded/protobuf/RequestConverter.java |  6 +-
 .../shaded/protobuf/ResponseConverter.java  | 37 ++-
 .../hbase/client/TestFromClientSide3.java   | 46 ++
 .../hadoop/hbase/client/TestMultiParallel.java  | 34 ++-
 6 files changed, 168 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/096dac2e/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MultiServerCallable.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MultiServerCallable.java
 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MultiServerCallable.java
index 33c9a0b..7f6052e 100644
--- 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MultiServerCallable.java
+++ 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MultiServerCallable.java
@@ -19,6 +19,7 @@ package org.apache.hadoop.hbase.client;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -93,30 +94,64 @@ class MultiServerCallable extends 
CancellableRegionServerCallable
 RegionAction.Builder regionActionBuilder = RegionAction.newBuilder();
 ClientProtos.Action.Builder actionBuilder = 
ClientProtos.Action.newBuilder();
 MutationProto.Builder mutationBuilder = MutationProto.newBuilder();
-List cells = null;
-// The multi object is a list of Actions by region.  Iterate by region.
+
+// Pre-size. Presume at least a KV per Action. There are likely more.
+List cells =
+(this.cellBlock ? new ArrayList(countOfActions) : null);
+
 long nonceGroup = multiAction.getNonceGroup();
 if (nonceGroup != HConstants.NO_NONCE) {
   multiRequestBuilder.setNonceGroup(nonceGroup);
 }
+// Index to track RegionAction within the MultiRequest
+int regionActionIndex = -1;
+// Map from a created RegionAction to the original index for a 
RowMutations within
+// its original list of actions
+Map rowMutationsIndexMap = new HashMap<>();
+// The multi object is a list of Actions by region. Iterate by region.
 for (Map.Entry> e: 
this.multiAction.actions.entrySet()) {
   final byte [] regionName = e.getKey();
   final List actions = e.getValue();
   regionActionBuilder.clear();
   regionActionBuilder.setRegion(RequestConverter.buildRegionSpecifier(
   HBaseProtos.RegionSpecifier.RegionSpecifierType.REGION_NAME, 
regionName));
-  if (this.cellBlock) {
-// Pre-size. Presume at least a KV per Action.  There are likely more.
-if (cells == null) cells = new ArrayList<>(countOfActions);
-// Send data in cellblocks. The call to buildNoDataMultiRequest will 
skip RowMutations.
-// They have already been handled above. Guess at count of cells
-regionActionBuilder = 
RequestConverter.buildNoDataRegionAction(regionName, actions, cells,
-  regionActionBuilder, actionBuilder, mutationBuilder);
-  } else {
-regionActionBuilder = RequestConverter.buildRegionAction(regionName, 
actions,
-  regionActionBuilder, actionBuilder, mutationBuilder);
+
+  int rowMutations = 0;
+  for (Action action : actions) {
+Row row = action.getAction();
+// Row Mutations are a set of Puts and/or Deletes all to be applied 
atomically
+// on the one row. We do separate RegionAction for each RowMutations.
+// We maintain a map to keep track of this RegionAction and the 
original Action index.
+if (row instanceof RowMutations) {
+  RowMutations rms = (RowMutations)row;
+  if (this.cellBlock) {
+// Build a multi request absent its Cell payload. Send data in 
cellblocks.
+regionActionBuilder = 
RequestConverter.buildNoDataRegionAction(regionName, rms, cells,
+  regionActionBuilder, actionBuilder, mutationBuilder);
+  } else {
+regionActionBuilder = 
RequestConverter.buildRegionAction(regionName, rms);
+  }
+

hbase git commit: HBASE-18595 Set version in branch-2 from 2.0.0-alpha2-SNAPSHOT to 2.0.0-alpha2

[stack]

Repository: hbase
Updated Branches:
  refs/heads/branch-2 c20ce21fe -> add997451


HBASE-18595 Set version in branch-2 from 2.0.0-alpha2-SNAPSHOT to 2.0.0-alpha2


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

Branch: refs/heads/branch-2
Commit: add99745155dec52a11e2fbd88497fcda88a39b9
Parents: c20ce21
Author: Michael Stack 
Authored: Mon Aug 14 10:28:44 2017 -0700
Committer: Michael Stack 
Committed: Mon Aug 14 10:28:44 2017 -0700

--
 hbase-annotations/pom.xml   |  2 +-
 .../hbase-archetype-builder/pom.xml |  2 +-
 hbase-archetypes/hbase-client-project/pom.xml   |  2 +-
 .../hbase-shaded-client-project/pom.xml |  2 +-
 hbase-archetypes/pom.xml|  2 +-
 hbase-assembly/pom.xml  |  2 +-
 hbase-checkstyle/pom.xml|  4 +--
 hbase-client/pom.xml|  6 +---
 hbase-common/pom.xml|  2 +-
 hbase-endpoint/pom.xml  |  2 +-
 hbase-examples/pom.xml  |  2 +-
 hbase-external-blockcache/pom.xml   |  2 +-
 hbase-hadoop-compat/pom.xml |  2 +-
 hbase-hadoop2-compat/pom.xml|  2 +-
 hbase-it/pom.xml|  2 +-
 hbase-metrics-api/pom.xml   |  2 +-
 hbase-metrics/pom.xml   |  2 +-
 hbase-prefix-tree/pom.xml   |  2 +-
 hbase-procedure/pom.xml |  2 +-
 hbase-protocol-shaded/pom.xml   |  2 +-
 hbase-protocol/pom.xml  |  2 +-
 hbase-resource-bundle/pom.xml   |  2 +-
 hbase-rest/pom.xml  |  6 +---
 .../apache/hadoop/hbase/rest/RESTServer.java|  4 +--
 .../hbase/rest/HBaseRESTTestingUtility.java |  4 +--
 hbase-rsgroup/pom.xml   |  6 +---
 hbase-server/pom.xml|  6 +---
 hbase-shaded/hbase-shaded-client/pom.xml|  2 +-
 hbase-shaded/hbase-shaded-server/pom.xml|  2 +-
 hbase-shaded/pom.xml|  2 +-
 hbase-shell/pom.xml |  2 +-
 hbase-spark-it/pom.xml  |  2 +-
 hbase-spark/pom.xml |  2 +-
 hbase-testing-util/pom.xml  |  2 +-
 hbase-thrift/pom.xml|  2 +-
 pom.xml | 31 +---
 36 files changed, 37 insertions(+), 86 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/add99745/hbase-annotations/pom.xml
--
diff --git a/hbase-annotations/pom.xml b/hbase-annotations/pom.xml
index 8390dc4..03f5335 100644
--- a/hbase-annotations/pom.xml
+++ b/hbase-annotations/pom.xml
@@ -23,7 +23,7 @@
   
 hbase
 org.apache.hbase
-2.0.0-alpha-2-SNAPSHOT
+2.0.0-alpha2
 ..
   
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/add99745/hbase-archetypes/hbase-archetype-builder/pom.xml
--
diff --git a/hbase-archetypes/hbase-archetype-builder/pom.xml 
b/hbase-archetypes/hbase-archetype-builder/pom.xml
index 5e9e28c..be85b18 100644
--- a/hbase-archetypes/hbase-archetype-builder/pom.xml
+++ b/hbase-archetypes/hbase-archetype-builder/pom.xml
@@ -25,7 +25,7 @@
   
 hbase-archetypes
 org.apache.hbase
-2.0.0-alpha-2-SNAPSHOT
+2.0.0-alpha2
 ..
   
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/add99745/hbase-archetypes/hbase-client-project/pom.xml
--
diff --git a/hbase-archetypes/hbase-client-project/pom.xml 
b/hbase-archetypes/hbase-client-project/pom.xml
index 38c8ecf..2eaa93e 100644
--- a/hbase-archetypes/hbase-client-project/pom.xml
+++ b/hbase-archetypes/hbase-client-project/pom.xml
@@ -26,7 +26,7 @@
   
 hbase-archetypes
 org.apache.hbase
-2.0.0-alpha-2-SNAPSHOT
+2.0.0-alpha2
 ..
   
   hbase-client-project

http://git-wip-us.apache.org/repos/asf/hbase/blob/add99745/hbase-archetypes/hbase-shaded-client-project/pom.xml
--
diff --git a/hbase-archetypes/hbase-shaded-client-project/pom.xml 
b/hbase-archetypes/hbase-shaded-client-project/pom.xml
index d97b805..f7a6016 100644
--- a/hbase-archetypes/hbase-shaded-client-project/pom.xml
+++ b/hbase-archetypes/hbase-shaded-client-project/pom.xml
@@ -26,7 +26,7 @@
   
 hbase-archetypes
 org.apach

hbase git commit: HBASE-18522 Add RowMutations support to Batch

[jerryjch]

Repository: hbase
Updated Branches:
  refs/heads/branch-1 7bd2795ee -> 9078a034c


HBASE-18522 Add RowMutations support to Batch


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

Branch: refs/heads/branch-1
Commit: 9078a034c410d53800e656d6a19f810c30fc102f
Parents: 7bd2795
Author: Jerry He 
Authored: Sun Aug 13 18:23:49 2017 -0700
Committer: Jerry He 
Committed: Mon Aug 14 09:21:53 2017 -0700

--
 .../hbase/client/MultiServerCallable.java   | 66 +++-
 .../org/apache/hadoop/hbase/client/Table.java   |  6 +-
 .../hadoop/hbase/protobuf/RequestConverter.java |  6 +-
 .../hbase/protobuf/ResponseConverter.java   | 35 ++-
 .../hbase/client/TestFromClientSide3.java   | 46 ++
 .../hadoop/hbase/client/TestMultiParallel.java  | 49 ---
 6 files changed, 178 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/9078a034/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MultiServerCallable.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MultiServerCallable.java
 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MultiServerCallable.java
index 42c63eb..b2ea941 100644
--- 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MultiServerCallable.java
+++ 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MultiServerCallable.java
@@ -19,6 +19,7 @@ package org.apache.hadoop.hbase.client;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -97,12 +98,21 @@ class MultiServerCallable extends 
PayloadCarryingServerCallable cells = null;
-// The multi object is a list of Actions by region.  Iterate by region.
+
+// Pre-size. Presume at least a KV per Action. There are likely more.
+List cells =
+(this.cellBlock ? new ArrayList(countOfActions) : null);
+
 long nonceGroup = multiAction.getNonceGroup();
 if (nonceGroup != HConstants.NO_NONCE) {
   multiRequestBuilder.setNonceGroup(nonceGroup);
 }
+// Index to track RegionAction within the MultiRequest
+int regionActionIndex = -1;
+// Map from a created RegionAction for a RowMutations to the original 
index within
+// its original list of actions
+Map rowMutationsIndexMap = new HashMap<>();
+// The multi object is a list of Actions by region.  Iterate by region.
 for (Map.Entry>> e: 
this.multiAction.actions.entrySet()) {
   final byte [] regionName = e.getKey();
   final List> actions = e.getValue();
@@ -110,19 +120,46 @@ class MultiServerCallable extends 
PayloadCarryingServerCallable action : actions) {
+Row row = action.getAction();
+// Row Mutations are a set of Puts and/or Deletes all to be applied 
atomically
+// on the one row. We do separate RegionAction for each RowMutations.
+// We maintain a map to keep track of this RegionAction and the 
original Action index.
+if (row instanceof RowMutations) {
+  RowMutations rms = (RowMutations)row;
+  if (this.cellBlock) {
+// Build a multi request absent its Cell payload. Send data in 
cellblocks.
+regionActionBuilder = 
RequestConverter.buildNoDataRegionAction(regionName, rms, cells,
+  regionActionBuilder, actionBuilder, mutationBuilder);
+  } else {
+regionActionBuilder = 
RequestConverter.buildRegionAction(regionName, rms);
+  }
+  regionActionBuilder.setAtomic(true);
+  multiRequestBuilder.addRegionAction(regionActionBuilder.build());
+  regionActionIndex++;
+  rowMutationsIndexMap.put(regionActionIndex, 
action.getOriginalIndex());
+  rowMutations++;
+
+  regionActionBuilder.clear();
+  regionActionBuilder.setRegion(RequestConverter.buildRegionSpecifier(
+HBaseProtos.RegionSpecifier.RegionSpecifierType.REGION_NAME, 
regionName) );
+}
+  }
 
-  if (this.cellBlock) {
-// Presize.  Presume at least a KV per Action.  There are likely more.
-if (cells == null) cells = new 
ArrayList(countOfActions);
-// Send data in cellblocks. The call to buildNoDataMultiRequest will 
skip RowMutations.
-// They have already been handled above. Guess at count of cells
-regionActionBuilder = 
RequestConverter.buildNoDataRegionAction(regionName, actions, cells,
-  regionActionBuilder, actionBuilder, mutationBuilder);
-  } else {
-regionActionBuilder = RequestConverter.buil

hbase git commit: HBASE-18522 Add RowMutations support to Batch

[jerryjch]

Repository: hbase
Updated Branches:
  refs/heads/branch-1.4 043211760 -> c6f57e0f3


HBASE-18522 Add RowMutations support to Batch


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

Branch: refs/heads/branch-1.4
Commit: c6f57e0f382e9dcef48f05da087d12eb0e47e9ad
Parents: 0432117
Author: Jerry He 
Authored: Sun Aug 13 18:23:49 2017 -0700
Committer: Jerry He 
Committed: Mon Aug 14 09:18:41 2017 -0700

--
 .../hbase/client/MultiServerCallable.java   | 66 +++-
 .../org/apache/hadoop/hbase/client/Table.java   |  6 +-
 .../hadoop/hbase/protobuf/RequestConverter.java |  6 +-
 .../hbase/protobuf/ResponseConverter.java   | 35 ++-
 .../hbase/client/TestFromClientSide3.java   | 46 ++
 .../hadoop/hbase/client/TestMultiParallel.java  | 49 ---
 6 files changed, 178 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/c6f57e0f/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MultiServerCallable.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MultiServerCallable.java
 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MultiServerCallable.java
index 42c63eb..b2ea941 100644
--- 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MultiServerCallable.java
+++ 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MultiServerCallable.java
@@ -19,6 +19,7 @@ package org.apache.hadoop.hbase.client;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -97,12 +98,21 @@ class MultiServerCallable extends 
PayloadCarryingServerCallable cells = null;
-// The multi object is a list of Actions by region.  Iterate by region.
+
+// Pre-size. Presume at least a KV per Action. There are likely more.
+List cells =
+(this.cellBlock ? new ArrayList(countOfActions) : null);
+
 long nonceGroup = multiAction.getNonceGroup();
 if (nonceGroup != HConstants.NO_NONCE) {
   multiRequestBuilder.setNonceGroup(nonceGroup);
 }
+// Index to track RegionAction within the MultiRequest
+int regionActionIndex = -1;
+// Map from a created RegionAction for a RowMutations to the original 
index within
+// its original list of actions
+Map rowMutationsIndexMap = new HashMap<>();
+// The multi object is a list of Actions by region.  Iterate by region.
 for (Map.Entry>> e: 
this.multiAction.actions.entrySet()) {
   final byte [] regionName = e.getKey();
   final List> actions = e.getValue();
@@ -110,19 +120,46 @@ class MultiServerCallable extends 
PayloadCarryingServerCallable action : actions) {
+Row row = action.getAction();
+// Row Mutations are a set of Puts and/or Deletes all to be applied 
atomically
+// on the one row. We do separate RegionAction for each RowMutations.
+// We maintain a map to keep track of this RegionAction and the 
original Action index.
+if (row instanceof RowMutations) {
+  RowMutations rms = (RowMutations)row;
+  if (this.cellBlock) {
+// Build a multi request absent its Cell payload. Send data in 
cellblocks.
+regionActionBuilder = 
RequestConverter.buildNoDataRegionAction(regionName, rms, cells,
+  regionActionBuilder, actionBuilder, mutationBuilder);
+  } else {
+regionActionBuilder = 
RequestConverter.buildRegionAction(regionName, rms);
+  }
+  regionActionBuilder.setAtomic(true);
+  multiRequestBuilder.addRegionAction(regionActionBuilder.build());
+  regionActionIndex++;
+  rowMutationsIndexMap.put(regionActionIndex, 
action.getOriginalIndex());
+  rowMutations++;
+
+  regionActionBuilder.clear();
+  regionActionBuilder.setRegion(RequestConverter.buildRegionSpecifier(
+HBaseProtos.RegionSpecifier.RegionSpecifierType.REGION_NAME, 
regionName) );
+}
+  }
 
-  if (this.cellBlock) {
-// Presize.  Presume at least a KV per Action.  There are likely more.
-if (cells == null) cells = new 
ArrayList(countOfActions);
-// Send data in cellblocks. The call to buildNoDataMultiRequest will 
skip RowMutations.
-// They have already been handled above. Guess at count of cells
-regionActionBuilder = 
RequestConverter.buildNoDataRegionAction(regionName, actions, cells,
-  regionActionBuilder, actionBuilder, mutationBuilder);
-  } else {
-regionActionBuilder = RequestConverter.

[1/2] hbase git commit: Revert "HBASE-18588 Verify we're using netty .so epolling on linux post HBASE-18271" Commit message references wrong-issue

[stack]

Repository: hbase
Updated Branches:
  refs/heads/branch-2 b4793a035 -> c20ce21fe


Revert "HBASE-18588 Verify we're using netty .so epolling on linux post 
HBASE-18271"
Commit message references wrong-issue

This reverts commit b4793a03554c08a9e33b76457a1c1fe347aa0f2f.


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

Branch: refs/heads/branch-2
Commit: c8d56bb13e68680613121df5e5de4e4d197211e2
Parents: b4793a0
Author: Michael Stack 
Authored: Mon Aug 14 09:12:14 2017 -0700
Committer: Michael Stack 
Committed: Mon Aug 14 09:12:14 2017 -0700

--
 hbase-protocol-shaded/pom.xml | 17 -
 1 file changed, 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/c8d56bb1/hbase-protocol-shaded/pom.xml
--
diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml
index f9400b3..fff02f8 100644
--- a/hbase-protocol-shaded/pom.xml
+++ b/hbase-protocol-shaded/pom.xml
@@ -192,23 +192,6 @@
 
   
 
-
-  
-
-  com.google.code.maven-replacer-plugin
-
-replacer
-[1.5.3,)
-
-  replace
-
-  
-  
-
- false
-
-  
-
   
 
   

[2/2] hbase git commit: HBASE-18593 Tell m2eclipse what to do w/ replacer plugin

[stack]

HBASE-18593 Tell m2eclipse what to do w/ replacer plugin


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

Branch: refs/heads/branch-2
Commit: c20ce21fe800289ed902cacbf3d72ad614264442
Parents: c8d56bb
Author: Michael Stack 
Authored: Mon Aug 14 09:13:27 2017 -0700
Committer: Michael Stack 
Committed: Mon Aug 14 09:14:05 2017 -0700

--
 hbase-protocol-shaded/pom.xml | 17 +
 1 file changed, 17 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/c20ce21f/hbase-protocol-shaded/pom.xml
--
diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml
index fff02f8..f9400b3 100644
--- a/hbase-protocol-shaded/pom.xml
+++ b/hbase-protocol-shaded/pom.xml
@@ -192,6 +192,23 @@
 
   
 
+
+  
+
+  com.google.code.maven-replacer-plugin
+
+replacer
+[1.5.3,)
+
+  replace
+
+  
+  
+
+ false
+
+  
+
   
 
   

[2/2] hbase git commit: HBASE-18593 Tell m2eclipse what to do w/ replacer plugin

[stack]

HBASE-18593 Tell m2eclipse what to do w/ replacer plugin


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

Branch: refs/heads/master
Commit: bd40073094b248f74ac9a3c0fff7ef6668265feb
Parents: 424dff2
Author: Michael Stack 
Authored: Mon Aug 14 09:13:27 2017 -0700
Committer: Michael Stack 
Committed: Mon Aug 14 09:13:27 2017 -0700

--
 hbase-protocol-shaded/pom.xml | 17 +
 1 file changed, 17 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/bd400730/hbase-protocol-shaded/pom.xml
--
diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml
index b28c03e..4c72eca 100644
--- a/hbase-protocol-shaded/pom.xml
+++ b/hbase-protocol-shaded/pom.xml
@@ -192,6 +192,23 @@
 
   
 
+
+  
+
+  com.google.code.maven-replacer-plugin
+
+replacer
+[1.5.3,)
+
+  replace
+
+  
+  
+
+ false
+
+  
+
   
 
   

[1/2] hbase git commit: Revert "HBASE-18588 Verify we're using netty .so epolling on linux post HBASE-18271" References the wrong JIRA

[stack]

Repository: hbase
Updated Branches:
  refs/heads/master ddbaf56ca -> bd4007309


Revert "HBASE-18588 Verify we're using netty .so epolling on linux post 
HBASE-18271"
References the wrong JIRA

This reverts commit ddbaf56ca8c712dc44608d3323280f578c56aed2.


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

Branch: refs/heads/master
Commit: 424dff20607577901c06cb40b1293ea5051ec5c5
Parents: ddbaf56
Author: Michael Stack 
Authored: Mon Aug 14 09:12:51 2017 -0700
Committer: Michael Stack 
Committed: Mon Aug 14 09:12:51 2017 -0700

--
 hbase-protocol-shaded/pom.xml | 17 -
 1 file changed, 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/424dff20/hbase-protocol-shaded/pom.xml
--
diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml
index 4c72eca..b28c03e 100644
--- a/hbase-protocol-shaded/pom.xml
+++ b/hbase-protocol-shaded/pom.xml
@@ -192,23 +192,6 @@
 
   
 
-
-  
-
-  com.google.code.maven-replacer-plugin
-
-replacer
-[1.5.3,)
-
-  replace
-
-  
-  
-
- false
-
-  
-
   
 
   

hbase git commit: HBASE-18588 Verify we're using netty .so epolling on linux post HBASE-18271

[stack]

Repository: hbase
Updated Branches:
  refs/heads/branch-2 fffe4e278 -> b4793a035


HBASE-18588 Verify we're using netty .so epolling on linux post HBASE-18271


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

Branch: refs/heads/branch-2
Commit: b4793a03554c08a9e33b76457a1c1fe347aa0f2f
Parents: fffe4e2
Author: Michael Stack 
Authored: Mon Aug 14 09:09:56 2017 -0700
Committer: Michael Stack 
Committed: Mon Aug 14 09:10:55 2017 -0700

--
 hbase-protocol-shaded/pom.xml | 17 +
 1 file changed, 17 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/b4793a03/hbase-protocol-shaded/pom.xml
--
diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml
index fff02f8..f9400b3 100644
--- a/hbase-protocol-shaded/pom.xml
+++ b/hbase-protocol-shaded/pom.xml
@@ -192,6 +192,23 @@
 
   
 
+
+  
+
+  com.google.code.maven-replacer-plugin
+
+replacer
+[1.5.3,)
+
+  replace
+
+  
+  
+
+ false
+
+  
+
   
 
   

hbase git commit: HBASE-18588 Verify we're using netty .so epolling on linux post HBASE-18271

[stack]

Repository: hbase
Updated Branches:
  refs/heads/master e2b797be3 -> ddbaf56ca


HBASE-18588 Verify we're using netty .so epolling on linux post HBASE-18271


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

Branch: refs/heads/master
Commit: ddbaf56ca8c712dc44608d3323280f578c56aed2
Parents: e2b797b
Author: Michael Stack 
Authored: Mon Aug 14 09:09:56 2017 -0700
Committer: Michael Stack 
Committed: Mon Aug 14 09:09:56 2017 -0700

--
 hbase-protocol-shaded/pom.xml | 17 +
 1 file changed, 17 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/ddbaf56c/hbase-protocol-shaded/pom.xml
--
diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml
index b28c03e..4c72eca 100644
--- a/hbase-protocol-shaded/pom.xml
+++ b/hbase-protocol-shaded/pom.xml
@@ -192,6 +192,23 @@
 
   
 
+
+  
+
+  com.google.code.maven-replacer-plugin
+
+replacer
+[1.5.3,)
+
+  replace
+
+  
+  
+
+ false
+
+  
+
   
 
   

[4/4] hbase git commit: HBASE-18520 Add jmx value to determine true Master Start time; amendment

[apurtell]

HBASE-18520 Add jmx value to determine true Master Start time; amendment

This is to determine how long it took in total for the master to start and 
finish initializing.

Signed-off-by: tedyu 


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

Branch: refs/heads/branch-1.4
Commit: 043211760394f6e5885bbb199f632b7be4fee9cd
Parents: 16223bc
Author: Zach York 
Authored: Thu Jun 15 17:10:07 2017 -0700
Committer: Andrew Purtell 
Committed: Mon Aug 14 08:43:13 2017 -0700

--
 .../java/org/apache/hadoop/hbase/master/MetricsMasterWrapper.java | 3 +++
 .../src/main/java/org/apache/hadoop/hbase/master/HMaster.java | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/04321176/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterWrapper.java
--
diff --git 
a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterWrapper.java
 
b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterWrapper.java
index 812cad9..6938e87 100644
--- 
a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterWrapper.java
+++ 
b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/master/MetricsMasterWrapper.java
@@ -125,5 +125,8 @@ public interface MetricsMasterWrapper {
   /**
* Get the time in Millis when the master finished initializing/becoming the 
active master
*/
+  /**
+   * Get the time in Millis when the master finished initializing/becoming the 
active master
+   */
   long getMasterInitializationTime();
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/04321176/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index 950ea4a..5b1aed6 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -894,7 +894,8 @@ public class HMaster extends HRegionServer implements 
MasterServices, Server {
 }
 
 status.markComplete("Initialization successful");
-LOG.info("Master has completed initialization");
+LOG.info(String.format("Master has completed initialization %.3fsec",
+   (System.currentTimeMillis() - masterActiveTime) / 1000.0f));
 this.masterFinishedInitializationTime = System.currentTimeMillis();
 configurationManager.registerObserver(this.balancer);
 

[1/4] hbase git commit: HBASE-18387: [Thrift] Make principal configurable in DemoClient.java

[apurtell]

Repository: hbase
Updated Branches:
  refs/heads/branch-1.4 2523e716f -> 043211760


HBASE-18387: [Thrift] Make principal configurable in DemoClient.java

Added optional (fourth) parameter "server-principal"
The solution is backward compatible, in case not given, uses "hbase" as default 
value
If the third parameter is skipped the fourth cannot be set.

Signed-off-by: Josh Elser 


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

Branch: refs/heads/branch-1.4
Commit: 2d06c1f7ba65f5a153adc726cc9c5cd9805bac5d
Parents: 2523e71
Author: Tamas Penzes 
Authored: Tue Aug 8 13:45:09 2017 +0200
Committer: Andrew Purtell 
Committed: Mon Aug 14 08:41:40 2017 -0700

--
 hbase-examples/README.txt|  3 ++-
 .../org/apache/hadoop/hbase/thrift/DemoClient.java   | 15 ---
 2 files changed, 14 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/2d06c1f7/hbase-examples/README.txt
--
diff --git a/hbase-examples/README.txt b/hbase-examples/README.txt
index 6578bb4..d2ddcc7 100644
--- a/hbase-examples/README.txt
+++ b/hbase-examples/README.txt
@@ -28,7 +28,8 @@ Example code.
   2. If HBase server is not secure, or authentication is not enabled for 
the Thrift server, execute:
   {java -cp hbase-examples-[VERSION].jar:${HBASE_EXAMPLE_CLASSPATH} 
org.apache.hadoop.hbase.thrift.DemoClient  }
   3. If HBase server is secure, and authentication is enabled for the 
Thrift server, run kinit at first, then execute:
-  {java -cp hbase-examples-[VERSION].jar:${HBASE_EXAMPLE_CLASSPATH} 
org.apache.hadoop.hbase.thrift.DemoClient   true}
+  {java -cp hbase-examples-[VERSION].jar:${HBASE_EXAMPLE_CLASSPATH} 
org.apache.hadoop.hbase.thrift.DemoClient   true }
+   should only be specified when the client connects to 
a secure cluster. It's default value is "hbase".
   4. Here is a lazy example that just pulls in all hbase dependency jars 
and that goes against default location on localhost.
   It should work with a standalone hbase instance started by doing 
./bin/start-hbase.sh:
   {java -cp 
./hbase-examples/target/hbase-examples-2.0.0-SNAPSHOT.jar:`./bin/hbase 
classpath` org.apache.hadoop.hbase.thrift.DemoClient localhost 9090}

http://git-wip-us.apache.org/repos/asf/hbase/blob/2d06c1f7/hbase-examples/src/main/java/org/apache/hadoop/hbase/thrift/DemoClient.java
--
diff --git 
a/hbase-examples/src/main/java/org/apache/hadoop/hbase/thrift/DemoClient.java 
b/hbase-examples/src/main/java/org/apache/hadoop/hbase/thrift/DemoClient.java
index 64adc93..e5400f3 100644
--- 
a/hbase-examples/src/main/java/org/apache/hadoop/hbase/thrift/DemoClient.java
+++ 
b/hbase-examples/src/main/java/org/apache/hadoop/hbase/thrift/DemoClient.java
@@ -60,13 +60,14 @@ public class DemoClient {
 CharsetDecoder decoder = null;
 
 private static boolean secure = false;
+private static String serverPrincipal = "hbase";
 
 public static void main(String[] args) throws Exception {
 
-if (args.length < 2 || args.length > 3) {
+if (args.length < 2 || args.length > 4 || (args.length > 2 && 
!isBoolean(args[2]))) {
 
 System.out.println("Invalid arguments!");
-System.out.println("Usage: DemoClient host port [secure=false]");
+System.out.println("Usage: DemoClient host port [secure=false 
[server-principal=hbase] ]");
 
 System.exit(-1);
 }
@@ -77,6 +78,10 @@ public class DemoClient {
   secure = Boolean.parseBoolean(args[2]);
 }
 
+if (args.length == 4) {
+  serverPrincipal = args[3];
+}
+
 final DemoClient client = new DemoClient();
 Subject.doAs(getSubject(),
   new PrivilegedExceptionAction() {
@@ -88,6 +93,10 @@ public class DemoClient {
   });
 }
 
+private static boolean isBoolean(String s){
+  return Boolean.TRUE.toString().equalsIgnoreCase(s) || 
Boolean.FALSE.toString().equalsIgnoreCase(s);
+}
+
 DemoClient() {
 decoder = Charset.forName("UTF-8").newDecoder();
 }
@@ -123,7 +132,7 @@ public class DemoClient {
* The HBase cluster must be secure, allow proxy user.
*/
   transport = new TSaslClientTransport("GSSAPI", null,
-"hbase", // Thrift server user name, should be an authorized proxy 
user.
+serverPrincipal, // Thrift server user name, should be an 
authorized proxy user.
 host, // Thrift server domain
 saslProperties, nul

[2/4] hbase git commit: HBASE-18469 Correct RegionServer metric of totalRequestCount

[apurtell]

HBASE-18469 Correct RegionServer metric of totalRequestCount


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

Branch: refs/heads/branch-1.4
Commit: c9f38bc7f31057a723effd5b59d36760623cffb9
Parents: 2d06c1f7
Author: Yu Li 
Authored: Fri Aug 11 14:13:18 2017 +0800
Committer: Andrew Purtell 
Committed: Mon Aug 14 08:41:46 2017 -0700

--
 .../regionserver/MetricsRegionServerSource.java |  3 ++
 .../MetricsRegionServerWrapper.java |  2 +
 .../MetricsRegionServerSourceImpl.java  |  2 +
 .../MetricsRegionServerWrapperImpl.java |  5 +++
 .../hbase/regionserver/RSRpcServices.java   | 15 +--
 .../MetricsRegionServerWrapperStub.java |  5 +++
 .../regionserver/TestMetricsRegionServer.java   |  4 ++
 .../regionserver/TestRegionServerMetrics.java   | 41 ++--
 8 files changed, 71 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/c9f38bc7/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSource.java
--
diff --git 
a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSource.java
 
b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSource.java
index 06bdee6..3ac678e 100644
--- 
a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSource.java
+++ 
b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSource.java
@@ -244,6 +244,9 @@ public interface MetricsRegionServerSource extends 
BaseSource, JvmPauseMonitorSo
   String TOTAL_REQUEST_COUNT = "totalRequestCount";
   String TOTAL_REQUEST_COUNT_DESC =
   "Total number of requests this RegionServer has answered.";
+  String TOTAL_ROW_ACTION_REQUEST_COUNT = "totalRowActionRequestCount";
+  String TOTAL_ROW_ACTION_REQUEST_COUNT_DESC =
+  "Total number of region requests this RegionServer has answered, count 
by row-level action";
   String READ_REQUEST_COUNT = "readRequestCount";
   String READ_REQUEST_COUNT_DESC =
   "Number of read requests this region server has answered.";

http://git-wip-us.apache.org/repos/asf/hbase/blob/c9f38bc7/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapper.java
--
diff --git 
a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapper.java
 
b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapper.java
index 7232063..7d7f66d 100644
--- 
a/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapper.java
+++ 
b/hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapper.java
@@ -367,4 +367,6 @@ public interface MetricsRegionServerWrapper {
   long getDeleteFamilyBloomHitCount();
 
   long getTrailerHitCount();
+
+  long getTotalRowActionRequestCount();
 }

http://git-wip-us.apache.org/repos/asf/hbase/blob/c9f38bc7/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceImpl.java
--
diff --git 
a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceImpl.java
 
b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceImpl.java
index 9b7f80a..cec122b 100644
--- 
a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceImpl.java
+++ 
b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceImpl.java
@@ -354,6 +354,8 @@ public class MetricsRegionServerSourceImpl
   .addGauge(Interns.info(AVERAGE_REGION_SIZE, 
AVERAGE_REGION_SIZE_DESC), rsWrap.getAverageRegionSize())
   .addCounter(Interns.info(TOTAL_REQUEST_COUNT, 
TOTAL_REQUEST_COUNT_DESC),
   rsWrap.getTotalRequestCount())
+  .addCounter(Interns.info(TOTAL_ROW_ACTION_REQUEST_COUNT, 
TOTAL_ROW_ACTION_REQUEST_COUNT_DESC),
+  rsWrap.getTotalRowActionRequestCount())
   .addCounter(Interns.info(READ_REQUEST_COUNT, 
READ_REQUEST_COUNT_DESC),
   rsWrap.getReadRequestsCount())
   .addCounter(Interns.info(WRITE_REQUEST_COUNT, 
WRITE_REQUEST_COUNT_DESC),

http://git-wip-us.apache.org/repos/asf/hbase/blob/c9f38bc7/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionSe

[3/4] hbase git commit: Revert "HBASE-18520 Add jmx value to determine true Master Start time"

[apurtell]

Revert "HBASE-18520 Add jmx value to determine true Master Start time"

This reverts commit 1ba949e0307e4fda3f9234bc436490fb33155bea.


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

Branch: refs/heads/branch-1.4
Commit: 16223bcb5cdd813b917b5475014b7ad209388e66
Parents: c9f38bc
Author: Michael Stack 
Authored: Tue Aug 8 15:43:58 2017 +0800
Committer: Andrew Purtell 
Committed: Mon Aug 14 08:43:09 2017 -0700

--
 .../src/main/java/org/apache/hadoop/hbase/master/HMaster.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/16223bcb/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index 5b1aed6..950ea4a 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -894,8 +894,7 @@ public class HMaster extends HRegionServer implements 
MasterServices, Server {
 }
 
 status.markComplete("Initialization successful");
-LOG.info(String.format("Master has completed initialization %.3fsec",
-   (System.currentTimeMillis() - masterActiveTime) / 1000.0f));
+LOG.info("Master has completed initialization");
 this.masterFinishedInitializationTime = System.currentTimeMillis();
 configurationManager.registerObserver(this.balancer);
 

[05/51] [partial] hbase-site git commit: Published site at .

[git-site-role]

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8bae1c8a/devapidocs/org/apache/hadoop/hbase/ipc/class-use/MetricsHBaseServer.html
--
diff --git 
a/devapidocs/org/apache/hadoop/hbase/ipc/class-use/MetricsHBaseServer.html 
b/devapidocs/org/apache/hadoop/hbase/ipc/class-use/MetricsHBaseServer.html
index 14fd7e2..7c967d0 100644
--- a/devapidocs/org/apache/hadoop/hbase/ipc/class-use/MetricsHBaseServer.html
+++ b/devapidocs/org/apache/hadoop/hbase/ipc/class-use/MetricsHBaseServer.html
@@ -146,7 +146,7 @@
 
 
 
-NettyRpcServerRequestDecoder(io.netty.channel.group.ChannelGroup allChannels,
+NettyRpcServerRequestDecoder(org.apache.hadoop.hbase.shaded.io.netty.channel.group.ChannelGroup allChannels,
 MetricsHBaseServer metrics) 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8bae1c8a/devapidocs/org/apache/hadoop/hbase/ipc/class-use/NettyRpcServer.html
--
diff --git 
a/devapidocs/org/apache/hadoop/hbase/ipc/class-use/NettyRpcServer.html 
b/devapidocs/org/apache/hadoop/hbase/ipc/class-use/NettyRpcServer.html
index 76298dc..b8a90bd 100644
--- a/devapidocs/org/apache/hadoop/hbase/ipc/class-use/NettyRpcServer.html
+++ b/devapidocs/org/apache/hadoop/hbase/ipc/class-use/NettyRpcServer.html
@@ -120,8 +120,8 @@
 NettyRpcServerPreambleHandler(NettyRpcServer rpcServer) 
 
 
-NettyServerRpcConnection(NettyRpcServer rpcServer,
-
io.netty.channel.Channel channel) 
+NettyServerRpcConnection(NettyRpcServer rpcServer,
+
org.apache.hadoop.hbase.shaded.io.netty.channel.Channel channel) 
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8bae1c8a/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html
--
diff --git a/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html 
b/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html
index 08990df..d9fa725 100644
--- a/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html
@@ -117,25 +117,25 @@
 org.apache.hadoop.hbase.ipc.CellBlockBuilder
 org.apache.hadoop.hbase.ipc.CellBlockBuilder.ByteBufferOutputStreamSupplier 
(implements org.apache.hadoop.hbase.ipc.CellBlockBuilder.OutputStreamSupplier)
 org.apache.hadoop.hbase.ipc.CellBlockBuilder.ByteBufOutputStreamSupplier 
(implements org.apache.hadoop.hbase.ipc.CellBlockBuilder.OutputStreamSupplier)
-io.netty.channel.ChannelHandlerAdapter (implements 
io.netty.channel.ChannelHandler)
+org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelHandlerAdapter
 (implements org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelHandler)
 
-io.netty.channel.ChannelInboundHandlerAdapter (implements 
io.netty.channel.ChannelInboundHandler)
+org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelInboundHandlerAdapter
 (implements 
org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelInboundHandler)
 
-io.netty.channel.ChannelDuplexHandler (implements 
io.netty.channel.ChannelOutboundHandler)
+org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelDuplexHandler
 (implements 
org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelOutboundHandler)
 
 org.apache.hadoop.hbase.ipc.BufferCallBeforeInitHandler
 org.apache.hadoop.hbase.ipc.NettyRpcDuplexHandler
 
 
 org.apache.hadoop.hbase.ipc.NettyRpcServerRequestDecoder
-io.netty.channel.SimpleChannelInboundHandler
+org.apache.hadoop.hbase.shaded.io.netty.channel.SimpleChannelInboundHandler
 
 org.apache.hadoop.hbase.ipc.NettyRpcServerPreambleHandler
 
 
 
 
-io.netty.channel.ChannelOutboundHandlerAdapter (implements 
io.netty.channel.ChannelOutboundHandler)
+org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelOutboundHandlerAdapter
 (implements 
org.apache.hadoop.hbase.shaded.io.netty.channel.ChannelOutboundHandler)
 
 org.apache.hadoop.hbase.ipc.NettyRpcServerResponseEncoder
 
@@ -342,8 +342,8 @@
 java.lang.http://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true";
 title="class or interface in java.lang">Enum (implements java.lang.http://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true";
 title="class or interface in java.lang">Comparable, java.io.http://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true";
 title="class or interface in java.io">Serializable)
 
 org.apache.hadoop.hbase.ipc.BufferCallBeforeInitHandler.BufferCallAction
-org.apache.hadoop.hbase.ipc.MetricsHBaseServerSourceFactoryImpl.SourceStorage
 org.apache.hadoop.hbase.ipc.CallEvent.Type
+org.apache.hadoop.hbase.ipc.MetricsHBaseServerSourceFactoryImpl.SourceStorage
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8bae1c8a/devapidocs/org/apache/hadoop/hbase/mapreduce/class-use/LoadIncrementalHFiles.html