You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2017/02/23 22:00:41 UTC
[1/4] hbase git commit: Amend HBASE-17069 RegionServer writes invalid
META entries in some circumstances
Repository: hbase
Updated Branches:
refs/heads/branch-1 3e2a6784c -> 2b6e9b3a3
refs/heads/branch-1.2 7314575a2 -> fe00b59a3
refs/heads/branch-1.3 8b0fabf1b -> 9d9decb4d
refs/heads/master 8fb44fae3 -> 0d656b139
Amend HBASE-17069 RegionServer writes invalid META entries in some circumstances
Fix Hregioninfo being null during merge
Signed-off-by: Andrew Purtell <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/9d9decb4
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9d9decb4
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9d9decb4
Branch: refs/heads/branch-1.3
Commit: 9d9decb4d9179cc64e3a5d9753376ed69c517a0a
Parents: 8b0fabf
Author: Abhishek Singh Chouhan <ab...@gmail.com>
Authored: Thu Feb 23 17:53:05 2017 +0530
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu Feb 23 13:45:14 2017 -0800
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/9d9decb4/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
index 6626485..51bcc54 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
@@ -1389,6 +1389,7 @@ public class MetaTableAccessor {
// region replicas are kept in the primary region's row
Put put = new Put(getMetaKeyForRegion(regionInfo), time);
+ addRegionInfo(put, regionInfo);
addLocation(put, sn, openSeqNum, time, regionInfo.getReplicaId());
putToMetaTable(connection, put);
LOG.info("Updated row " + regionInfo.getRegionNameAsString() +
[4/4] hbase git commit: Amend HBASE-17069 RegionServer writes invalid
META entries in some circumstances
Posted by ap...@apache.org.
Amend HBASE-17069 RegionServer writes invalid META entries in some circumstances
Fix Hregioninfo being null during merge
Signed-off-by: Andrew Purtell <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/fe00b59a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/fe00b59a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/fe00b59a
Branch: refs/heads/branch-1.2
Commit: fe00b59a3f11a0fffad271934d56ad8f733ca86b
Parents: 7314575
Author: Abhishek Singh Chouhan <ab...@gmail.com>
Authored: Thu Feb 23 17:53:05 2017 +0530
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu Feb 23 13:46:21 2017 -0800
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/fe00b59a/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
index 6626485..51bcc54 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
@@ -1389,6 +1389,7 @@ public class MetaTableAccessor {
// region replicas are kept in the primary region's row
Put put = new Put(getMetaKeyForRegion(regionInfo), time);
+ addRegionInfo(put, regionInfo);
addLocation(put, sn, openSeqNum, time, regionInfo.getReplicaId());
putToMetaTable(connection, put);
LOG.info("Updated row " + regionInfo.getRegionNameAsString() +
[2/4] hbase git commit: Amend HBASE-17069 RegionServer writes invalid
META entries in some circumstances
Posted by ap...@apache.org.
Amend HBASE-17069 RegionServer writes invalid META entries in some circumstances
Fix Hregioninfo being null during merge
Signed-off-by: Andrew Purtell <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0d656b13
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0d656b13
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0d656b13
Branch: refs/heads/master
Commit: 0d656b1394c1bfb702199998d69efbd10f879d2f
Parents: 8fb44fa
Author: Abhishek Singh Chouhan <ab...@gmail.com>
Authored: Thu Feb 23 17:53:05 2017 +0530
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu Feb 23 13:45:58 2017 -0800
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/0d656b13/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
index 5a37afc..61d4c66 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
@@ -1929,6 +1929,7 @@ public class MetaTableAccessor {
// region replicas are kept in the primary region's row
Put put = new Put(getMetaKeyForRegion(regionInfo), time);
+ addRegionInfo(put, regionInfo);
addLocation(put, sn, openSeqNum, time, regionInfo.getReplicaId());
putToMetaTable(connection, put);
LOG.info("Updated row " + regionInfo.getRegionNameAsString() +
[3/4] hbase git commit: Amend HBASE-17069 RegionServer writes invalid
META entries in some circumstances
Posted by ap...@apache.org.
Amend HBASE-17069 RegionServer writes invalid META entries in some circumstances
Fix Hregioninfo being null during merge
Signed-off-by: Andrew Purtell <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/2b6e9b3a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/2b6e9b3a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/2b6e9b3a
Branch: refs/heads/branch-1
Commit: 2b6e9b3a3af5901f2eab5e38b591c27c33887698
Parents: 3e2a678
Author: Abhishek Singh Chouhan <ab...@gmail.com>
Authored: Thu Feb 23 17:53:05 2017 +0530
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu Feb 23 13:46:02 2017 -0800
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/2b6e9b3a/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
index 53c8fc5..2bbae15 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
@@ -1461,6 +1461,7 @@ public class MetaTableAccessor {
// region replicas are kept in the primary region's row
Put put = new Put(getMetaKeyForRegion(regionInfo), time);
+ addRegionInfo(put, regionInfo);
addLocation(put, sn, openSeqNum, time, regionInfo.getReplicaId());
putToMetaTable(connection, put);
LOG.info("Updated row " + regionInfo.getRegionNameAsString() +