You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2017/07/19 16:04:39 UTC
[1/3] hbase git commit: HBASE-15548 SyncTable: sourceHashDir is
supposed to be optional but won't work without (Dave Latham)
Repository: hbase
Updated Branches:
refs/heads/branch-1.3 c74f9d2e5 -> 15dbb2d29
HBASE-15548 SyncTable: sourceHashDir is supposed to be optional but won't work without (Dave Latham)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c91636b2
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c91636b2
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c91636b2
Branch: refs/heads/branch-1.3
Commit: c91636b2d04bc6008fd16c7aa4b6db4f194c9fe8
Parents: c74f9d2
Author: tedyu <yu...@gmail.com>
Authored: Mon Mar 28 16:53:27 2016 -0700
Committer: Sean Busbey <bu...@apache.org>
Committed: Wed Jul 19 10:57:01 2017 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/hbase/mapreduce/SyncTable.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/c91636b2/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/SyncTable.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/SyncTable.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/SyncTable.java
index 23fd10e..7adf200 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/SyncTable.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/SyncTable.java
@@ -684,7 +684,7 @@ public class SyncTable extends Configured implements Tool {
System.err.println();
System.err.println("Args:");
System.err.println(" sourcehashdir path to HashTable output dir for source table");
- System.err.println(" if not specified, then all data will be scanned");
+ System.err.println(" (see org.apache.hadoop.hbase.mapreduce.HashTable)");
System.err.println(" sourcetable Name of the source table to sync from");
System.err.println(" targettable Name of the target table to sync to");
System.err.println();
[3/3] hbase git commit: HBASE-17648: HBase Table-level
synchronization fails between two secured(kerberized) cluster
Posted by bu...@apache.org.
HBASE-17648: HBase Table-level synchronization fails between two secured(kerberized) cluster
Signed-off-by: tedyu <yu...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/15dbb2d2
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/15dbb2d2
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/15dbb2d2
Branch: refs/heads/branch-1.3
Commit: 15dbb2d29b931f3e88644a00e621cfc83ed9e29c
Parents: 705a3ae
Author: Yi Liang <ea...@gmail.com>
Authored: Tue Feb 14 10:22:22 2017 -0800
Committer: Sean Busbey <bu...@apache.org>
Committed: Wed Jul 19 10:57:38 2017 -0500
----------------------------------------------------------------------
.../java/org/apache/hadoop/hbase/mapreduce/SyncTable.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/15dbb2d2/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/SyncTable.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/SyncTable.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/SyncTable.java
index b19b482..8727c71 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/SyncTable.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/SyncTable.java
@@ -143,7 +143,13 @@ public class SyncTable extends Configured implements Tool {
// would be nice to add an option for bulk load instead
}
-
+
+ // Obtain an authentication token, for the specified cluster, on behalf of the current user
+ if (sourceZkCluster != null) {
+ Configuration peerConf =
+ HBaseConfiguration.createClusterConf(job.getConfiguration(), sourceZkCluster);
+ TableMapReduceUtil.initCredentialsForCluster(job, peerConf);
+ }
return job;
}
[2/3] hbase git commit: HBASE-16090 ResultScanner is not closed in
SyncTable#finishRemainingHashRanges()
Posted by bu...@apache.org.
HBASE-16090 ResultScanner is not closed in SyncTable#finishRemainingHashRanges()
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/705a3aee
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/705a3aee
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/705a3aee
Branch: refs/heads/branch-1.3
Commit: 705a3aee946ed3dd9e899ea25b740d9c7cbf67cb
Parents: c91636b
Author: tedyu <yu...@gmail.com>
Authored: Thu Jun 23 07:29:34 2016 -0700
Committer: Sean Busbey <bu...@apache.org>
Committed: Wed Jul 19 10:57:07 2017 -0500
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/mapreduce/SyncTable.java | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/705a3aee/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/SyncTable.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/SyncTable.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/SyncTable.java
index 7adf200..b19b482 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/SyncTable.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/SyncTable.java
@@ -654,9 +654,16 @@ public class SyncTable extends Configured implements Tool {
scan.setStopRow(nextSourceKey.copyBytes());
}
- ResultScanner targetScanner = targetTable.getScanner(scan);
- for (Result row : targetScanner) {
- targetHasher.hashResult(row);
+ ResultScanner targetScanner = null;
+ try {
+ targetScanner = targetTable.getScanner(scan);
+ for (Result row : targetScanner) {
+ targetHasher.hashResult(row);
+ }
+ } finally {
+ if (targetScanner != null) {
+ targetScanner.close();
+ }
}
} // else current batch ends exactly at split end row