hbase git commit: HBASE-17757 Unify blocksize after encoding to decrease memory fragment

2017-05-01 Thread anoopsamjohn 
Repository: hbase
Updated Branches:
  refs/heads/branch-1 961bb7325 -> 262c66f61


HBASE-17757 Unify blocksize after encoding to decrease memory fragment

Signed-off-by: anoopsamjohn 


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

Branch: refs/heads/branch-1
Commit: 262c66f614d436c15b47ed4ae2ba33ed913c3cac
Parents: 961bb73
Author: Allan Yang 
Authored: Sun Apr 30 12:01:26 2017 +0800
Committer: anoopsamjohn 
Committed: Tue May 2 10:06:33 2017 +0530

--
 .../hadoop/hbase/io/hfile/HFileBlock.java   | 20 
 .../hadoop/hbase/io/hfile/HFileWriterV2.java| 24 +++-
 2 files changed, 38 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/262c66f6/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java
index b8629da..3b014b9 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileBlock.java
@@ -844,6 +844,10 @@ public class HFileBlock implements Cacheable {
 // includes the header size also.
 private int unencodedDataSizeWritten;
 
+// Size of actual data being written. considering the block encoding. This
+// includes the header size also.
+private int encodedDataSizeWritten;
+
 /**
  * Bytes to be written to the file system, including the header. Compressed
  * if compression is turned on. It also includes the checksum data that
@@ -931,6 +935,7 @@ public class HFileBlock implements Cacheable {
 this.dataBlockEncoder.startBlockEncoding(dataBlockEncodingCtx, 
userDataStream);
   }
   this.unencodedDataSizeWritten = 0;
+  this.encodedDataSizeWritten = 0;
   return userDataStream;
 }
 
@@ -941,8 +946,10 @@ public class HFileBlock implements Cacheable {
  */
 void write(Cell cell) throws IOException{
   expectState(State.WRITING);
+  int posBeforeEncode = this.userDataStream.size();
   this.unencodedDataSizeWritten +=
   this.dataBlockEncoder.encode(cell, dataBlockEncodingCtx, 
this.userDataStream);
+  this.encodedDataSizeWritten += this.userDataStream.size() - 
posBeforeEncode;
 }
 
 /**
@@ -1179,6 +1186,19 @@ public class HFileBlock implements Cacheable {
  *
  * @return the number of bytes written
  */
+public int encodedBlockSizeWritten() {
+  if (state != State.WRITING)
+return 0;
+  return this.encodedDataSizeWritten;
+}
+
+/**
+ * Returns the number of bytes written into the current block so far, or
+ * zero if not writing the block at the moment. Note that this will return
+ * zero in the "block ready" state as well.
+ *
+ * @return the number of bytes written
+ */
 int blockSizeWritten() {
   if (state != State.WRITING) return 0;
   return this.unencodedDataSizeWritten;

http://git-wip-us.apache.org/repos/asf/hbase/blob/262c66f6/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileWriterV2.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileWriterV2.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileWriterV2.java
index 9e68dc3..394cd44 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileWriterV2.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFileWriterV2.java
@@ -93,6 +93,14 @@ public class HFileWriterV2 extends AbstractHFileWriter {
   /** warn on cell with tags */
   private static boolean warnCellWithTags = true;
 
+
+  /** if this feature is enabled, preCalculate encoded data size before real 
encoding happens*/
+  public static final String UNIFIED_ENCODED_BLOCKSIZE_RATIO = 
"hbase.writer.unified.encoded.blocksize.ratio";
+
+  /** Block size limit after encoding, used to unify encoded block Cache entry 
size*/
+  private final int encodedBlockSizeLimit;
+
+
   static class WriterFactoryV2 extends HFile.WriterFactory {
 WriterFactoryV2(Configuration conf, CacheConfig cacheConf) {
   super(conf, cacheConf);
@@ -115,6 +123,8 @@ public class HFileWriterV2 extends AbstractHFileWriter {
 super(cacheConf,
 ostream == null ? createOutputStream(conf, fs, path, null) : ostream,
 path,

hbase git commit: HBASE-14286 Correct typo in argument name for WALSplitter.writeRegionSequenceIdFile

2017-05-01 Thread chia7712 
Repository: hbase
Updated Branches:
  refs/heads/master a171b7fea -> c8a7e80e0


HBASE-14286 Correct typo in argument name for 
WALSplitter.writeRegionSequenceIdFile

Signed-off-by: Chia-Ping Tsai 


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

Branch: refs/heads/master
Commit: c8a7e80e0a87fa39a720b3da54c0bcf11520ee9f
Parents: a171b7f
Author: Gábor Lipták 
Authored: Mon May 1 17:23:21 2017 -0400
Committer: Chia-Ping Tsai 
Committed: Tue May 2 10:01:55 2017 +0800

--
 .../src/main/java/org/apache/hadoop/hbase/wal/WALSplitter.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/c8a7e80e/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALSplitter.java
--
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALSplitter.java 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALSplitter.java
index 77c2d1c..457f574 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALSplitter.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALSplitter.java
@@ -689,12 +689,12 @@ public class WALSplitter {
* @param fs
* @param regiondir
* @param newSeqId
-   * @param saftyBumper
+   * @param safetyBumper
* @return long new sequence Id value
* @throws IOException
*/
   public static long writeRegionSequenceIdFile(final FileSystem fs, final Path 
regiondir,
-  long newSeqId, long saftyBumper) throws IOException {
+  long newSeqId, long safetyBumper) throws IOException {
 // TODO: Why are we using a method in here as part of our normal region 
open where
 // there is no splitting involved? Fix. St.Ack 01/20/2017.
 Path editsdir = WALSplitter.getRegionDirRecoveredEditsDir(regiondir);
@@ -723,7 +723,7 @@ public class WALSplitter {
 if (maxSeqId > newSeqId) {
   newSeqId = maxSeqId;
 }
-newSeqId += saftyBumper; // bump up SeqId
+newSeqId += safetyBumper; // bump up SeqId
 
 // write a new seqId file
 Path newSeqIdFile = new Path(editsdir, newSeqId + SEQUENCE_ID_FILE_SUFFIX);

[1/2] hbase git commit: HBASE-17979 HBase Shell 'list' Command Help Doc Improvements (Hugo Louro)

2017-05-01 Thread enis 
Repository: hbase
Updated Branches:
  refs/heads/branch-1 30c8b3802 -> 961bb7325
  refs/heads/master 13b6fdf8a -> a171b7fea


HBASE-17979 HBase Shell 'list' Command Help Doc Improvements (Hugo Louro)


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

Branch: refs/heads/master
Commit: a171b7feaff1ea4b0122ee73de2c836072738d64
Parents: 13b6fdf
Author: Enis Soztutar 
Authored: Mon May 1 16:36:53 2017 -0700
Committer: Enis Soztutar 
Committed: Mon May 1 16:36:53 2017 -0700

--
 hbase-shell/src/main/ruby/shell/commands/list.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/a171b7fe/hbase-shell/src/main/ruby/shell/commands/list.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/list.rb 
b/hbase-shell/src/main/ruby/shell/commands/list.rb
index f7a0987..dc3d168 100644
--- a/hbase-shell/src/main/ruby/shell/commands/list.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/list.rb
@@ -22,7 +22,7 @@ module Shell
 class List < Command
   def help
 return <<-EOF
-List all tables in hbase. Optional regular expression parameter could
+List all user tables in hbase. Optional regular expression parameter could
 be used to filter the output. Examples:
 
   hbase> list

[2/2] hbase git commit: HBASE-17979 HBase Shell 'list' Command Help Doc Improvements (Hugo Louro)

2017-05-01 Thread enis 
HBASE-17979 HBase Shell 'list' Command Help Doc Improvements (Hugo Louro)


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

Branch: refs/heads/branch-1
Commit: 961bb7325cbcac2a5cf9064e404e2c5141c543c7
Parents: 30c8b38
Author: Enis Soztutar 
Authored: Mon May 1 16:36:53 2017 -0700
Committer: Enis Soztutar 
Committed: Mon May 1 16:37:09 2017 -0700

--
 hbase-shell/src/main/ruby/shell/commands/list.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/961bb732/hbase-shell/src/main/ruby/shell/commands/list.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/list.rb 
b/hbase-shell/src/main/ruby/shell/commands/list.rb
index dce0ae2..6b202a2 100644
--- a/hbase-shell/src/main/ruby/shell/commands/list.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/list.rb
@@ -22,7 +22,7 @@ module Shell
 class List < Command
   def help
 return <<-EOF
-List all tables in hbase. Optional regular expression parameter could
+List all user tables in hbase. Optional regular expression parameter could
 be used to filter the output. Examples:
 
   hbase> list

hbase git commit: HBASE-17973 Expand list_regions to filter on data locality

2017-05-01 Thread elserj 
Repository: hbase
Updated Branches:
  refs/heads/master 94c14ad0f -> 13b6fdf8a


HBASE-17973 Expand list_regions to filter on data locality


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

Branch: refs/heads/master
Commit: 13b6fdf8ad81e236632a2dc99e6c4a317213858e
Parents: 94c14ad
Author: Josh Elser 
Authored: Fri Apr 28 12:04:26 2017 -0400
Committer: Josh Elser 
Committed: Mon May 1 13:46:41 2017 -0400

--
 hbase-shell/src/main/ruby/hbase_constants.rb|  2 +
 .../main/ruby/shell/commands/list_regions.rb| 63 
 .../ruby/hbase/list_regions_test_no_cluster.rb  | 61 +++
 3 files changed, 113 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/13b6fdf8/hbase-shell/src/main/ruby/hbase_constants.rb
--
diff --git a/hbase-shell/src/main/ruby/hbase_constants.rb 
b/hbase-shell/src/main/ruby/hbase_constants.rb
index c02d5c6..55ae9e7 100644
--- a/hbase-shell/src/main/ruby/hbase_constants.rb
+++ b/hbase-shell/src/main/ruby/hbase_constants.rb
@@ -81,6 +81,8 @@ module HBaseConstants
   NAMESPACES = 'NAMESPACES'
   CONFIG = 'CONFIG'
   DATA = 'DATA'
+  SERVER_NAME = 'SERVER_NAME'
+  LOCALITY_THRESHOLD = 'LOCALITY_THRESHOLD'
 
   # Load constants from hbase java API
   def self.promote_constants(constants)

http://git-wip-us.apache.org/repos/asf/hbase/blob/13b6fdf8/hbase-shell/src/main/ruby/shell/commands/list_regions.rb
--
diff --git a/hbase-shell/src/main/ruby/shell/commands/list_regions.rb 
b/hbase-shell/src/main/ruby/shell/commands/list_regions.rb
index 527a6cb..94b7a29 100644
--- a/hbase-shell/src/main/ruby/shell/commands/list_regions.rb
+++ b/hbase-shell/src/main/ruby/shell/commands/list_regions.rb
@@ -23,37 +23,62 @@ module Shell
   def help
 
 return< list_regions 'table_name'
 hbase> list_regions 'table_name', 'server_name'
+hbase> list_regions 'table_name', {SERVER_NAME => 'server_name', 
LOCALITY_THRESHOLD => 0.8}
 
 EOF
 return
   end
 
-  def command(table_name, region_server_name = "")
+  def command(table_name, options = nil)
+if options.nil?
+  options = {}
+elsif not options.is_a? Hash
+  # When options isn't a hash, assume it's the server name
+  # and create the hash internally
+  options = {SERVER_NAME => options}
+end
 admin_instance = admin.instance_variable_get("@admin")
 conn_instance = admin_instance.getConnection()
 cluster_status = admin_instance.getClusterStatus()
 hregion_locator_instance = 
conn_instance.getRegionLocator(TableName.valueOf(table_name))
-hregion_locator_list = hregion_locator_instance.getAllRegionLocations()
+hregion_locator_list = 
hregion_locator_instance.getAllRegionLocations().to_a
 results = Array.new
 
 begin
-  hregion_locator_list.each do |hregion|
+  # Filter out region servers which we don't want, default to all RS
+  regions = hregion_locator_list.filter do |hregion|
+server_name = options[SERVER_NAME] || '*'
+accept_server_name? server_name, hregion.getServerName().toString()
+  end
+  # A locality threshold of "1.0" would be all regions (cannot have 
greater than 1 locality)
+  # Regions which have a `dataLocality` less-than-or-equal to this 
value are accepted
+  locality_threshold = 1.0
+  if options.has_key? LOCALITY_THRESHOLD
+value = options[LOCALITY_THRESHOLD]
+# Value validation. Must be a Float, and must be between [0, 1.0]
+raise "#{LOCALITY_THRESHOLD} must be a float value" unless 
value.is_a? Float
+raise "#{LOCALITY_THRESHOLD} must be between 0 and 1.0, inclusive" 
unless valid_locality_threshold? value
+locality_threshold = value
+  end
+  regions.each do |hregion|
 hregion_info = hregion.getRegionInfo()
 server_name = hregion.getServerName()
-if hregion.getServerName().toString.start_with? region_server_name
-  startKey = Bytes.toString(hregion.getRegionInfo().getStartKey())
-  endKey = Bytes.toString(hregion.getRegionInfo().getEndKey())
-  region_load_map = 
cluster_status.getLoad(server_name).getRegionsLoad()
-  region_load = region_load_map.get(hregion_info.getRegionName())
+region_load_map =

hbase git commit: HBASE-17976 Remove stability annotation from public audience class

2017-05-01 Thread elserj 
Repository: hbase
Updated Branches:
  refs/heads/HBASE-16961 70bcf3fe6 -> 0d5028664


HBASE-17976 Remove stability annotation from public audience class


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

Branch: refs/heads/HBASE-16961
Commit: 0d5028664b8f33450ed41e83362fca50bec3871d
Parents: 70bcf3f
Author: Josh Elser 
Authored: Fri Apr 28 16:51:17 2017 -0400
Committer: Josh Elser 
Committed: Mon May 1 12:58:26 2017 -0400

--
 .../java/org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.java  | 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/0d502866/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.java
--
diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.java
 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.java
index 34d2542..023e855 100644
--- 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.java
+++ 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.java
@@ -17,7 +17,6 @@
 package org.apache.hadoop.hbase.quotas;
 
 import org.apache.hadoop.hbase.classification.InterfaceAudience;
-import org.apache.hadoop.hbase.classification.InterfaceStability;
 
 /**
  * Enumeration that represents the action HBase will take when a space quota 
is violated.
@@ -26,7 +25,6 @@ import 
org.apache.hadoop.hbase.classification.InterfaceStability;
  * namespace, it is treated as a collection of tables (all tables are subject 
to the same policy).
  */
 @InterfaceAudience.Public
-@InterfaceStability.Evolving
 public enum SpaceViolationPolicy {
   /**
* Disables the table(s).

[1/5] hbase git commit: HBASE-17968 Fix NOTICE.txt for src-release

2017-05-01 Thread elserj 
Repository: hbase
Updated Branches:
  refs/heads/branch-1 fa4f63894 -> 30c8b3802
  refs/heads/branch-1.1 e62d7a6d2 -> 8436292eb
  refs/heads/branch-1.2 236a8d06a -> 66e2aa9d9
  refs/heads/branch-1.3 e4c8a858b -> 12415f8bd
  refs/heads/master ef94de3eb -> 94c14ad0f


HBASE-17968 Fix NOTICE.txt for src-release


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

Branch: refs/heads/master
Commit: 94c14ad0f692f60b53c091c1ae705ca0ca4a35a6
Parents: ef94de3
Author: Josh Elser 
Authored: Fri Apr 28 16:39:21 2017 -0400
Committer: Josh Elser 
Committed: Mon May 1 11:25:44 2017 -0400

--
 NOTICE.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/94c14ad0/NOTICE.txt
--
diff --git a/NOTICE.txt b/NOTICE.txt
index 71efa52..7959857 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,5 +1,5 @@
 Apache HBase
-Copyright 2007-2015 The Apache Software Foundation
+Copyright 2007-2017 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

[2/5] hbase git commit: HBASE-17968 Fix NOTICE.txt for src-release

2017-05-01 Thread elserj 
HBASE-17968 Fix NOTICE.txt for src-release


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

Branch: refs/heads/branch-1
Commit: 30c8b380208cbdbde2fb28cd07f4a5fe1901109a
Parents: fa4f638
Author: Josh Elser 
Authored: Fri Apr 28 16:39:21 2017 -0400
Committer: Josh Elser 
Committed: Mon May 1 11:27:14 2017 -0400

--
 NOTICE.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/30c8b380/NOTICE.txt
--
diff --git a/NOTICE.txt b/NOTICE.txt
index 91213d9..229e7ce 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,5 +1,5 @@
 Apache HBase
-Copyright 2007-2015 The Apache Software Foundation
+Copyright 2007-2017 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

[5/5] hbase git commit: HBASE-17968 Fix NOTICE.txt for src-release

2017-05-01 Thread elserj 
HBASE-17968 Fix NOTICE.txt for src-release


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

Branch: refs/heads/branch-1.1
Commit: 8436292eb24b62d6b0d32b0051295a4725245b46
Parents: e62d7a6
Author: Josh Elser 
Authored: Fri Apr 28 16:39:21 2017 -0400
Committer: Josh Elser 
Committed: Mon May 1 11:28:15 2017 -0400

--
 NOTICE.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/8436292e/NOTICE.txt
--
diff --git a/NOTICE.txt b/NOTICE.txt
index fb16a28..dc16d1f 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,5 +1,5 @@
 Apache HBase
-Copyright 2007-2015 The Apache Software Foundation
+Copyright 2007-2017 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

[3/5] hbase git commit: HBASE-17968 Fix NOTICE.txt for src-release

2017-05-01 Thread elserj 
HBASE-17968 Fix NOTICE.txt for src-release


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

Branch: refs/heads/branch-1.3
Commit: 12415f8bde2402ce96ba1450bc73104e62e2df7c
Parents: e4c8a85
Author: Josh Elser 
Authored: Fri Apr 28 16:39:21 2017 -0400
Committer: Josh Elser 
Committed: Mon May 1 11:27:27 2017 -0400

--
 NOTICE.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/12415f8b/NOTICE.txt
--
diff --git a/NOTICE.txt b/NOTICE.txt
index 91213d9..229e7ce 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,5 +1,5 @@
 Apache HBase
-Copyright 2007-2015 The Apache Software Foundation
+Copyright 2007-2017 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

[4/5] hbase git commit: HBASE-17968 Fix NOTICE.txt for src-release

2017-05-01 Thread elserj 
HBASE-17968 Fix NOTICE.txt for src-release


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

Branch: refs/heads/branch-1.2
Commit: 66e2aa9d9d561f08513db498e839d7f85a520342
Parents: 236a8d0
Author: Josh Elser 
Authored: Fri Apr 28 16:39:21 2017 -0400
Committer: Josh Elser 
Committed: Mon May 1 11:27:46 2017 -0400

--
 NOTICE.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/66e2aa9d/NOTICE.txt
--
diff --git a/NOTICE.txt b/NOTICE.txt
index fb16a28..dc16d1f 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,5 +1,5 @@
 Apache HBase
-Copyright 2007-2015 The Apache Software Foundation
+Copyright 2007-2017 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

hbase git commit: HBASE-17957 Custom metrics of replicate endpoints don't prepend "source." to global metrics

2017-05-01 Thread tedyu 
Repository: hbase
Updated Branches:
  refs/heads/master 1848353fd -> ef94de3eb


HBASE-17957 Custom metrics of replicate endpoints don't prepend "source." to 
global metrics

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/ef94de3e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ef94de3e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ef94de3e

Branch: refs/heads/master
Commit: ef94de3eb7ecbf2bb45ce1a3cbfb861ef4c1a417
Parents: 1848353
Author: yoshida.shinya 
Authored: Tue Apr 25 11:11:20 2017 +0900
Committer: tedyu 
Committed: Mon May 1 08:11:59 2017 -0700

--
 .../MetricsReplicationGlobalSourceSource.java | 14 --
 .../hbase/replication/TestReplicationEndpoint.java| 14 --
 2 files changed, 16 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hbase/blob/ef94de3e/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationGlobalSourceSource.java
--
diff --git 
a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationGlobalSourceSource.java
 
b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationGlobalSourceSource.java
index 7a34e45..712096d 100644
--- 
a/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationGlobalSourceSource.java
+++ 
b/hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationGlobalSourceSource.java
@@ -23,6 +23,8 @@ import org.apache.hadoop.metrics2.lib.MutableGaugeLong;
 import org.apache.hadoop.metrics2.lib.MutableHistogram;
 
 public class MetricsReplicationGlobalSourceSource implements 
MetricsReplicationSourceSource{
+  private static final String KEY_PREFIX = "source.";
+
   private final MetricsReplicationSourceImpl rms;
 
   private final MutableHistogram ageOfLastShippedOpHist;
@@ -196,32 +198,32 @@ public class MetricsReplicationGlobalSourceSource 
implements MetricsReplicationS
 
   @Override
   public void setGauge(String gaugeName, long value) {
-rms.setGauge(gaugeName, value);
+rms.setGauge(KEY_PREFIX + gaugeName, value);
   }
 
   @Override
   public void incGauge(String gaugeName, long delta) {
-rms.incGauge(gaugeName, delta);
+rms.incGauge(KEY_PREFIX + gaugeName, delta);
   }
 
   @Override
   public void decGauge(String gaugeName, long delta) {
-rms.decGauge(gaugeName, delta);
+rms.decGauge(KEY_PREFIX + gaugeName, delta);
   }
 
   @Override
   public void removeMetric(String key) {
-rms.removeMetric(key);
+rms.removeMetric(KEY_PREFIX + key);
   }
 
   @Override
   public void incCounters(String counterName, long delta) {
-rms.incCounters(counterName, delta);
+rms.incCounters(KEY_PREFIX + counterName, delta);
   }
 
   @Override
   public void updateHistogram(String name, long value) {
-rms.updateHistogram(name, value);
+rms.updateHistogram(KEY_PREFIX + name, value);
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/hbase/blob/ef94de3e/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.java
--
diff --git 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.java
 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.java
index 4925aab..c63a69b 100644
--- 
a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.java
+++ 
b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.java
@@ -310,9 +310,11 @@ public class TestReplicationEndpoint extends 
TestReplicationBase {
 MetricsSource source = new MetricsSource(id, singleSourceSource, 
globalSourceSource);
 String gaugeName = "gauge";
 String singleGaugeName = "source.id." + gaugeName;
+String globalGaugeName = "source." + gaugeName;
 long delta = 1;
 String counterName = "counter";
 String singleCounterName = "source.id." + counterName;
+String globalCounterName = "source." + counterName;
 long count = 2;
 source.decGauge(gaugeName, delta);
 source.getMetricsContext();
@@ -327,21 +329,21 @@ public class TestReplicationEndpoint extends 
TestReplicationBase {
 source.updateHistogram(counterName, count);
 
 verify(singleRms).decGauge(singleGaugeName, delta);
-verify(globalRms).decGauge(gaugeName, delta);
+verify(globalRms).decGauge(globalGaugeName, delta);
 verify(globalRms).getMetricsContext();

svn commit: r19421 - /release/hbase/KEYS

2017-05-01 Thread ndimiduk 
Author: ndimiduk
Date: Mon May  1 13:00:31 2017
New Revision: 19421

Log:
update HBase KEYS file for ndimi...@apache.org

Modified:
release/hbase/KEYS

Modified: release/hbase/KEYS
==
--- release/hbase/KEYS (original)
+++ release/hbase/KEYS Mon May  1 13:00:31 2017
@@ -597,140 +597,6 @@ VU3ghjoprEKmEJXe75WIcg==
 =4uf+
 -END PGP PUBLIC KEY BLOCK-
 
-pub   4096R/0xCA3633F18644EEB6 2014-03-11 [expires: 2017-05-09]
-uid [ultimate] Nick Dimiduk 
-sig 30xCA3633F18644EEB6 2016-05-09  Nick Dimiduk 
-sig 30xCA3633F18644EEB6 2014-03-11  Nick Dimiduk 
-uid [ultimate] Nick Dimiduk 
-sig 30xCA3633F18644EEB6 2016-05-09  Nick Dimiduk 
-sig 30xCA3633F18644EEB6 2014-03-11  Nick Dimiduk 
-sub   4096R/0xB44B40F2D2DCE494 2014-03-11 [expires: 2017-05-09]
-sig  0xCA3633F18644EEB6 2016-05-09  Nick Dimiduk 
-sub   4096R/0xAD9039071C3489BD 2015-04-30
-sig  0xCA3633F18644EEB6 2015-04-30  Nick Dimiduk 
-
--BEGIN PGP PUBLIC KEY BLOCK-
-
-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