You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by sy...@apache.org on 2016/01/22 23:19:55 UTC
[01/13] hbase git commit: HBASE-14902 Revert some of the stringency
recently introduced by checkstyle tightening
Repository: hbase
Updated Branches:
refs/heads/hbase-12439 318814de2 -> 4681827d6
HBASE-14902 Revert some of the stringency recently introduced by checkstyle tightening
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/2c0394f0
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/2c0394f0
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/2c0394f0
Branch: refs/heads/hbase-12439
Commit: 2c0394f078158ef668e75b74f589a7da59ff9e0e
Parents: 318814d
Author: stack <st...@apache.org>
Authored: Tue Jan 19 14:36:26 2016 -0800
Committer: stack <st...@apache.org>
Committed: Tue Jan 19 14:36:44 2016 -0800
----------------------------------------------------------------------
hbase-checkstyle/src/main/resources/hbase/checkstyle.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/2c0394f0/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
----------------------------------------------------------------------
diff --git a/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml b/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
index 6095d99..6670182 100644
--- a/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
+++ b/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
@@ -41,7 +41,9 @@
http://checkstyle.sourceforge.net/config_blocks.html -->
<module name="EmptyBlock"/>
<module name="LeftCurly"/>
- <module name="NeedBraces"/>
+ <module name="NeedBraces">
+ <property name="allowSingleLineStatement" value="true"/>
+ </module>
<!-- Class Design Checks
http://checkstyle.sourceforge.net/config_design.html -->
[06/13] hbase git commit: HBASE-15098 Normalizer switch in
configuration is not used
Posted by sy...@apache.org.
HBASE-15098 Normalizer switch in configuration is not used
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/bd990673
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/bd990673
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/bd990673
Branch: refs/heads/hbase-12439
Commit: bd9906736ef139b410a47799e6bc438a3a367d50
Parents: 5e08e2c
Author: stack <st...@apache.org>
Authored: Wed Jan 20 09:32:38 2016 -0800
Committer: stack <st...@apache.org>
Committed: Wed Jan 20 09:32:38 2016 -0800
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/hbase/HConstants.java | 4 ----
hbase-common/src/main/resources/hbase-default.xml | 6 ------
.../master/normalizer/TestSimpleRegionNormalizerOnCluster.java | 1 -
3 files changed, 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/bd990673/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
index 6fafad3..1b71cb4 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
@@ -134,10 +134,6 @@ public final class HConstants {
public static final String HBASE_MASTER_NORMALIZER_CLASS =
"hbase.master.normalizer.class";
- /** Config for enabling/disabling pluggable region normalizer */
- public static final String HBASE_NORMALIZER_ENABLED =
- "hbase.normalizer.enabled";
-
/** Cluster is standalone or pseudo-distributed */
public static final boolean CLUSTER_IS_LOCAL = false;
http://git-wip-us.apache.org/repos/asf/hbase/blob/bd990673/hbase-common/src/main/resources/hbase-default.xml
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/resources/hbase-default.xml b/hbase-common/src/main/resources/hbase-default.xml
index d9a1994..eefd327 100644
--- a/hbase-common/src/main/resources/hbase-default.xml
+++ b/hbase-common/src/main/resources/hbase-default.xml
@@ -574,12 +574,6 @@ possible configurations would overwhelm and obscure the important.
<description>Period at which the region balancer runs in the Master.</description>
</property>
<property>
- <name>hbase.normalizer.enabled</name>
- <value>false</value>
- <description>If set to true, Master will try to keep region size
- within each table approximately the same.</description>
- </property>
- <property>
<name>hbase.normalizer.period</name>
<value>1800000</value>
<description>Period at which the region normalizer runs in the Master.</description>
http://git-wip-us.apache.org/repos/asf/hbase/blob/bd990673/hbase-server/src/test/java/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizerOnCluster.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizerOnCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizerOnCluster.java
index 4bcccc6..6ec2e95 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizerOnCluster.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizerOnCluster.java
@@ -67,7 +67,6 @@ public class TestSimpleRegionNormalizerOnCluster {
public static void beforeAllTests() throws Exception {
// we will retry operations when PleaseHoldException is thrown
TEST_UTIL.getConfiguration().setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 3);
- TEST_UTIL.getConfiguration().setBoolean(HConstants.HBASE_NORMALIZER_ENABLED, true);
TEST_UTIL.getConfiguration().setBoolean(QuotaUtil.QUOTA_CONF_KEY, true);
// Start a cluster of two regionservers.
[13/13] hbase git commit: HBASE-14963. Remove Guava dependency from
HBase client code
Posted by sy...@apache.org.
HBASE-14963. Remove Guava dependency from HBase client code
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/4681827d
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4681827d
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4681827d
Branch: refs/heads/hbase-12439
Commit: 4681827d63be77eae1ee83efa7faf15b9fe214bc
Parents: f9e69b5
Author: Devaraj Das <dd...@apache.org>
Authored: Fri Jan 22 13:26:54 2016 -0800
Committer: Devaraj Das <dd...@apache.org>
Committed: Fri Jan 22 13:26:54 2016 -0800
----------------------------------------------------------------------
.../hbase/zookeeper/MetaTableLocator.java | 23 ++++++++------------
1 file changed, 9 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/4681827d/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/MetaTableLocator.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/MetaTableLocator.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/MetaTableLocator.java
index 3cffd04..0b844a2 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/MetaTableLocator.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/MetaTableLocator.java
@@ -55,7 +55,6 @@ import org.apache.hadoop.hbase.util.Pair;
import org.apache.hadoop.ipc.RemoteException;
import org.apache.zookeeper.KeeperException;
-import com.google.common.base.Stopwatch;
import com.google.protobuf.InvalidProtocolBufferException;
/**
@@ -229,11 +228,11 @@ public class MetaTableLocator {
* @throws InterruptedException if interrupted while waiting
*/
public void waitMetaRegionLocation(ZooKeeperWatcher zkw) throws InterruptedException {
- Stopwatch stopwatch = new Stopwatch().start();
+ long startTime = System.currentTimeMillis();
while (!stopped) {
try {
if (waitMetaRegionLocation(zkw, 100) != null) break;
- long sleepTime = stopwatch.elapsedMillis();
+ long sleepTime = System.currentTimeMillis() - startTime;
// +1 in case sleepTime=0
if ((sleepTime + 1) % 10000 == 0) {
LOG.warn("Have been waiting for meta to be assigned for " + sleepTime + "ms");
@@ -591,19 +590,15 @@ public class MetaTableLocator {
throws InterruptedException {
if (timeout < 0) throw new IllegalArgumentException();
if (zkw == null) throw new IllegalArgumentException();
- Stopwatch sw = new Stopwatch().start();
+ long startTime = System.currentTimeMillis();
ServerName sn = null;
- try {
- while (true) {
- sn = getMetaRegionLocation(zkw, replicaId);
- if (sn != null || sw.elapsedMillis()
- > timeout - HConstants.SOCKET_RETRY_WAIT_MS) {
- break;
- }
- Thread.sleep(HConstants.SOCKET_RETRY_WAIT_MS);
+ while (true) {
+ sn = getMetaRegionLocation(zkw, replicaId);
+ if (sn != null || (System.currentTimeMillis() - startTime)
+ > timeout - HConstants.SOCKET_RETRY_WAIT_MS) {
+ break;
}
- } finally {
- sw.stop();
+ Thread.sleep(HConstants.SOCKET_RETRY_WAIT_MS);
}
return sn;
}
[04/13] hbase git commit: HBASE-15101 Leaked References to
StoreFile.Reader after HBASE-13082 (Deepankar)
Posted by sy...@apache.org.
HBASE-15101 Leaked References to StoreFile.Reader after HBASE-13082
(Deepankar)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/93e200d5
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/93e200d5
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/93e200d5
Branch: refs/heads/hbase-12439
Commit: 93e200d52b29d35ad5a98eed9eea05783960f6b2
Parents: 55bb5ff
Author: ramkrishna <ra...@gmail.com>
Authored: Wed Jan 20 11:42:13 2016 +0530
Committer: ramkrishna <ra...@gmail.com>
Committed: Wed Jan 20 11:42:13 2016 +0530
----------------------------------------------------------------------
.../java/org/apache/hadoop/hbase/regionserver/StoreScanner.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/93e200d5/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
index 3049608..9ab68e4 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
@@ -407,6 +407,8 @@ public class StoreScanner extends NonReversedNonLazyKeyValueScanner
if (kvs.shouldUseScanner(scan, store, expiredTimestampCutoff)) {
scanners.add(kvs);
+ } else {
+ kvs.close();
}
}
return scanners;
@@ -549,6 +551,7 @@ public class StoreScanner extends NonReversedNonLazyKeyValueScanner
if (storeLimit > -1 && this.countPerRow > (storeLimit + storeOffset)) {
// do what SEEK_NEXT_ROW does.
if (!matcher.moreRowsMayExistAfter(cell)) {
+ close(false);// Do all cleanup except heap.close()
return scannerContext.setScannerState(NextState.NO_MORE_VALUES).hasMoreValues();
}
matcher.curCell = null;
@@ -577,6 +580,7 @@ public class StoreScanner extends NonReversedNonLazyKeyValueScanner
if (qcode == ScanQueryMatcher.MatchCode.INCLUDE_AND_SEEK_NEXT_ROW) {
if (!matcher.moreRowsMayExistAfter(cell)) {
+ close(false);// Do all cleanup except heap.close()
return scannerContext.setScannerState(NextState.NO_MORE_VALUES).hasMoreValues();
}
matcher.curCell = null;
@@ -607,6 +611,7 @@ public class StoreScanner extends NonReversedNonLazyKeyValueScanner
// This is just a relatively simple end of scan fix, to short-cut end
// us if there is an endKey in the scan.
if (!matcher.moreRowsMayExistAfter(cell)) {
+ close(false);// Do all cleanup except heap.close()
return scannerContext.setScannerState(NextState.NO_MORE_VALUES).hasMoreValues();
}
matcher.curCell = null;
[03/13] hbase git commit: HBASE-15119 Include git SHA in
check_compatibility reports
Posted by sy...@apache.org.
HBASE-15119 Include git SHA in check_compatibility reports
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/55bb5ff7
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/55bb5ff7
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/55bb5ff7
Branch: refs/heads/hbase-12439
Commit: 55bb5ff7fb20a976645f26a1a8fc3e667c05b4f7
Parents: df36178
Author: Nick Dimiduk <nd...@apache.org>
Authored: Sat Jan 16 15:44:07 2016 -0800
Committer: Nick Dimiduk <nd...@apache.org>
Committed: Tue Jan 19 21:29:58 2016 -0800
----------------------------------------------------------------------
dev-support/check_compatibility.sh | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/55bb5ff7/dev-support/check_compatibility.sh
----------------------------------------------------------------------
diff --git a/dev-support/check_compatibility.sh b/dev-support/check_compatibility.sh
index b6c11e0..95dba00 100755
--- a/dev-support/check_compatibility.sh
+++ b/dev-support/check_compatibility.sh
@@ -188,6 +188,8 @@ for ref in 1 2; do
echo "Maven could not successfully package ${COMMIT[${ref}]}. Exiting..." >&2
exit 2
fi
+ # grab sha for future reference
+ SHA[${ref}]=$(git rev-parse --short HEAD)
popd > /dev/null
fi
@@ -207,6 +209,7 @@ for ref in 1 2; do
echo "Maven could not successfully package ${COMMIT[${ref}]}. Exiting..." >&2
exit 2
fi
+ SHA[${ref}]=$(git rev-parse --short HEAD)
popd > /dev/null
done
@@ -259,7 +262,8 @@ fi
# Generate command line arguments for Java ACC.
JAVA_ACC_COMMAND+=(-l HBase)
-JAVA_ACC_COMMAND+=(-v1 ${COMMIT[1]} -v2 ${COMMIT[2]})
+JAVA_ACC_COMMAND+=(-v1 ${COMMIT[1]}${SHA[1]+"/${SHA[1]}"})
+JAVA_ACC_COMMAND+=(-v2 ${COMMIT[2]}${SHA[2]+"/${SHA[2]}"})
JAVA_ACC_COMMAND+=(-d1 ${JARS[1]} -d2 ${JARS[2]})
JAVA_ACC_COMMAND+=(-report-path \
${SCRIPT_DIRECTORY}/target/compatibility/report/${COMMIT[1]}_${COMMIT[2]}_compat_report.html)
[08/13] hbase git commit: HBASE-15126 HBaseFsck's
checkRegionBoundaries function sets incorrect storesFirstKey (chenrongwei)
Posted by sy...@apache.org.
HBASE-15126 HBaseFsck's checkRegionBoundaries function sets incorrect storesFirstKey (chenrongwei)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1d2b0d83
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1d2b0d83
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1d2b0d83
Branch: refs/heads/hbase-12439
Commit: 1d2b0d831117e033aebf0b347b162c4483a04e5d
Parents: 4bf6f83
Author: tedyu <yu...@gmail.com>
Authored: Thu Jan 21 07:46:58 2016 -0800
Committer: tedyu <yu...@gmail.com>
Committed: Thu Jan 21 07:46:58 2016 -0800
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/util/HBaseFsck.java | 2 +-
.../hadoop/hbase/util/TestHBaseFsckOneRS.java | 24 ++++++++++++++++++++
2 files changed, 25 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/1d2b0d83/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
index c066803..ca7bc81 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
@@ -795,7 +795,7 @@ public class HBaseFsck extends Configured implements Closeable {
}
currentRegionBoundariesInformation.metaFirstKey = regionInfo.getStartKey();
currentRegionBoundariesInformation.metaLastKey = regionInfo.getEndKey();
- currentRegionBoundariesInformation.storesFirstKey = storeFirstKey;
+ currentRegionBoundariesInformation.storesFirstKey = keyOnly(storeFirstKey);
currentRegionBoundariesInformation.storesLastKey = keyOnly(storeLastKey);
if (currentRegionBoundariesInformation.metaFirstKey.length == 0)
currentRegionBoundariesInformation.metaFirstKey = null;
http://git-wip-us.apache.org/repos/asf/hbase/blob/1d2b0d83/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.java
index 21935f3..1593e6c 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsckOneRS.java
@@ -580,6 +580,30 @@ public class TestHBaseFsckOneRS extends BaseTestHBaseFsck {
}
}
+ /**
+ * test region boundaries and make sure store file had been created.
+ * @throws Exception
+ */
+ @Test(timeout = 180000)
+ public void testRegionBoundariesCheckWithFlushTable() throws Exception {
+ HBaseFsck hbck = doFsck(conf, false);
+ assertNoErrors(hbck); // no errors
+ TableName table = TableName.valueOf("testRegionBoundariesCheckWithFlushTable");
+ try {
+ setupTable(table);
+ admin.flush(table);
+ hbck.connect(); // need connection to have access to META
+ hbck.checkRegionBoundaries();
+ assertNoErrors(hbck); // no errors
+ } catch (IllegalArgumentException e) {
+ if (e.getMessage().endsWith("not a valid DFS filename.")) {
+ fail("Table directory path is not valid." + e.getMessage());
+ }
+ } finally {
+ hbck.close();
+ }
+ }
+
@Test (timeout=180000)
public void testHbckAfterRegionMerge() throws Exception {
TableName table = TableName.valueOf("testMergeRegionFilesInHdfs");
[12/13] hbase git commit: HBASE-15148 Resolve IS2_INCONSISTENT_SYNC
findbugs warning in AuthenticationTokenSecretManager (Yu Li)
Posted by sy...@apache.org.
HBASE-15148 Resolve IS2_INCONSISTENT_SYNC findbugs warning in AuthenticationTokenSecretManager (Yu Li)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f9e69b51
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f9e69b51
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f9e69b51
Branch: refs/heads/hbase-12439
Commit: f9e69b51e1997c6de2ed74f9edbc6947b11c88dc
Parents: b1df2f8
Author: tedyu <yu...@gmail.com>
Authored: Fri Jan 22 02:47:49 2016 -0800
Committer: tedyu <yu...@gmail.com>
Committed: Fri Jan 22 02:47:49 2016 -0800
----------------------------------------------------------------------
.../security/token/AuthenticationTokenSecretManager.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/f9e69b51/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.java
index 72f4598..de66827 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenSecretManager.java
@@ -285,6 +285,10 @@ public class AuthenticationTokenSecretManager
}
}
+ synchronized long getLastKeyUpdate() {
+ return lastKeyUpdate;
+ }
+
public static SecretKey createSecretKey(byte[] raw) {
return SecretManager.createSecretKey(raw);
}
@@ -338,10 +342,7 @@ public class AuthenticationTokenSecretManager
// clear any expired
removeExpiredKeys();
- long localLastKeyUpdate;
- synchronized (this) {
- localLastKeyUpdate = lastKeyUpdate;
- }
+ long localLastKeyUpdate = getLastKeyUpdate();
if (localLastKeyUpdate + keyUpdateInterval < now) {
// roll a new master key
rollCurrentKey();
[09/13] hbase git commit: HBASE-15147 Shell should use
Admin.listTableNames() instead of Admin.listTables()
Posted by sy...@apache.org.
HBASE-15147 Shell should use Admin.listTableNames() instead of Admin.listTables()
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/110274b3
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/110274b3
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/110274b3
Branch: refs/heads/hbase-12439
Commit: 110274b33535db8f8dc1ecd4406c3c09b162a4a8
Parents: 1d2b0d8
Author: Enis Soztutar <en...@apache.org>
Authored: Thu Jan 21 11:09:02 2016 -0800
Committer: Enis Soztutar <en...@apache.org>
Committed: Thu Jan 21 11:09:02 2016 -0800
----------------------------------------------------------------------
hbase-shell/src/main/ruby/hbase/admin.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/110274b3/hbase-shell/src/main/ruby/hbase/admin.rb
----------------------------------------------------------------------
diff --git a/hbase-shell/src/main/ruby/hbase/admin.rb b/hbase-shell/src/main/ruby/hbase/admin.rb
index c61b598..82f0700 100644
--- a/hbase-shell/src/main/ruby/hbase/admin.rb
+++ b/hbase-shell/src/main/ruby/hbase/admin.rb
@@ -45,7 +45,7 @@ module Hbase
#----------------------------------------------------------------------------------------------
# Returns a list of tables in hbase
def list(regex = ".*")
- @admin.listTables(regex).map { |t| t.getNameAsString }
+ @admin.listTableNames(regex).map { |t| t.getNameAsString }
end
#----------------------------------------------------------------------------------------------
[05/13] hbase git commit: Revert "HBASE-14902 Revert some of the
stringency recently introduced by checkstyle tightening" This seems to cause
a NPE when generating report.... reverting.
Posted by sy...@apache.org.
Revert "HBASE-14902 Revert some of the stringency recently introduced by checkstyle tightening"
This seems to cause a NPE when generating report.... reverting.
This reverts commit 2c0394f078158ef668e75b74f589a7da59ff9e0e.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5e08e2ce
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5e08e2ce
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5e08e2ce
Branch: refs/heads/hbase-12439
Commit: 5e08e2ceb6af231eebeff9f46e18d654a7b89338
Parents: 93e200d
Author: stack <st...@apache.org>
Authored: Wed Jan 20 08:40:02 2016 -0800
Committer: stack <st...@apache.org>
Committed: Wed Jan 20 08:40:02 2016 -0800
----------------------------------------------------------------------
hbase-checkstyle/src/main/resources/hbase/checkstyle.xml | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/5e08e2ce/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
----------------------------------------------------------------------
diff --git a/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml b/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
index 6670182..6095d99 100644
--- a/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
+++ b/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
@@ -41,9 +41,7 @@
http://checkstyle.sourceforge.net/config_blocks.html -->
<module name="EmptyBlock"/>
<module name="LeftCurly"/>
- <module name="NeedBraces">
- <property name="allowSingleLineStatement" value="true"/>
- </module>
+ <module name="NeedBraces"/>
<!-- Class Design Checks
http://checkstyle.sourceforge.net/config_design.html -->
[02/13] hbase git commit: HBASE-15111 hbase version should write to
stdout
Posted by sy...@apache.org.
HBASE-15111 hbase version should write to stdout
Signed-off-by: Sean Busbey <bu...@cloudera.com>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/df361780
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/df361780
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/df361780
Branch: refs/heads/hbase-12439
Commit: df36178062dfa5146c3e8bb14d5a15c46f222119
Parents: 2c0394f
Author: Gary Helmling <ga...@apache.org>
Authored: Thu Jan 14 09:51:03 2016 -0800
Committer: Sean Busbey <bu...@cloudera.com>
Committed: Tue Jan 19 22:06:57 2016 -0600
----------------------------------------------------------------------
.../main/java/org/apache/hadoop/hbase/util/VersionInfo.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/df361780/hbase-common/src/main/java/org/apache/hadoop/hbase/util/VersionInfo.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/VersionInfo.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/VersionInfo.java
index d02c5e9..d0462dd 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/VersionInfo.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/VersionInfo.java
@@ -18,6 +18,7 @@
package org.apache.hadoop.hbase.util;
+import java.io.PrintStream;
import java.io.PrintWriter;
import org.apache.commons.logging.Log;
@@ -113,6 +114,12 @@ public class VersionInfo {
}
}
+ public static void writeTo(PrintStream out) {
+ for (String line : versionReport()) {
+ out.println(line);
+ }
+ }
+
public static void logVersion() {
for (String line : versionReport()) {
LOG.info(line);
@@ -120,6 +127,6 @@ public class VersionInfo {
}
public static void main(String[] args) {
- logVersion();
+ writeTo(System.out);
}
}
[07/13] hbase git commit: HBASE-15139 Connection manager doesn't pass
client metrics to RpcClient
Posted by sy...@apache.org.
HBASE-15139 Connection manager doesn't pass client metrics to RpcClient
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/4bf6f837
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4bf6f837
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4bf6f837
Branch: refs/heads/hbase-12439
Commit: 4bf6f8379d7f85413b914dddf607d016780d40ce
Parents: bd99067
Author: Mikhail Antonov <an...@apache.org>
Authored: Wed Jan 20 14:05:12 2016 -0800
Committer: Mikhail Antonov <an...@apache.org>
Committed: Wed Jan 20 14:17:01 2016 -0800
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/client/ConnectionImplementation.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/4bf6f837/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java
index ecac792..d730287 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java
@@ -240,7 +240,7 @@ class ConnectionImplementation implements ClusterConnection, Closeable {
this.registry = setupRegistry();
retrieveClusterId();
- this.rpcClient = RpcClientFactory.createClient(this.conf, this.clusterId);
+ this.rpcClient = RpcClientFactory.createClient(this.conf, this.clusterId, this.metrics);
// Do we publish the status?
if (shouldListen) {
[11/13] hbase git commit: HBASE-15133 Data loss after compaction when
a row has more than Integer.MAX_VALUE columns (Toshihiro Suzuki)
Posted by sy...@apache.org.
HBASE-15133 Data loss after compaction when a row has more than Integer.MAX_VALUE columns (Toshihiro Suzuki)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b1df2f8c
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b1df2f8c
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b1df2f8c
Branch: refs/heads/hbase-12439
Commit: b1df2f8c881d418bb47e15a88c09d964ca89d2e2
Parents: b6f091e
Author: tedyu <yu...@gmail.com>
Authored: Fri Jan 22 02:39:40 2016 -0800
Committer: tedyu <yu...@gmail.com>
Committed: Fri Jan 22 02:39:40 2016 -0800
----------------------------------------------------------------------
.../java/org/apache/hadoop/hbase/regionserver/StoreScanner.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/b1df2f8c/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
index 9ab68e4..c4c509f 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
@@ -64,7 +64,7 @@ public class StoreScanner extends NonReversedNonLazyKeyValueScanner
protected KeyValueHeap heap;
protected boolean cacheBlocks;
- protected int countPerRow = 0;
+ protected long countPerRow = 0;
protected int storeLimit = -1;
protected int storeOffset = 0;
[10/13] hbase git commit: HBASE-15152 Automatically include
prefix-tree module in MR jobs if present
Posted by sy...@apache.org.
HBASE-15152 Automatically include prefix-tree module in MR jobs if present
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b6f091e0
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b6f091e0
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b6f091e0
Branch: refs/heads/hbase-12439
Commit: b6f091e0fd02111714ae8820c8a4d3b9b4828343
Parents: 110274b
Author: Jonathan M Hsieh <jm...@apache.org>
Authored: Thu Jan 21 07:25:00 2016 -0800
Committer: Jonathan M Hsieh <jm...@apache.org>
Committed: Thu Jan 21 18:55:19 2016 -0800
----------------------------------------------------------------------
.../hbase/mapreduce/TableMapReduceUtil.java | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/b6f091e0/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
index cf5f7ac..d43c4d9 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java
@@ -763,7 +763,7 @@ public class TableMapReduceUtil {
* Add HBase and its dependencies (only) to the job configuration.
* <p>
* This is intended as a low-level API, facilitating code reuse between this
- * class and its mapred counterpart. It also of use to extenral tools that
+ * class and its mapred counterpart. It also of use to external tools that
* need to build a MapReduce job that interacts with HBase but want
* fine-grained control over the jars shipped to the cluster.
* </p>
@@ -772,6 +772,21 @@ public class TableMapReduceUtil {
* @see <a href="https://issues.apache.org/jira/browse/PIG-3285">PIG-3285</a>
*/
public static void addHBaseDependencyJars(Configuration conf) throws IOException {
+
+ // PrefixTreeCodec is part of the hbase-prefix-tree module. If not included in MR jobs jar
+ // dependencies, MR jobs that write encoded hfiles will fail.
+ // We used reflection here so to prevent a circular module dependency.
+ // TODO - if we extract the MR into a module, make it depend on hbase-prefix-tree.
+ Class prefixTreeCodecClass = null;
+ try {
+ prefixTreeCodecClass =
+ Class.forName("org.apache.hadoop.hbase.code.prefixtree.PrefixTreeCodec");
+ } catch (ClassNotFoundException e) {
+ // this will show up in unit tests but should not show in real deployments
+ LOG.warn("The hbase-prefix-tree module jar containing PrefixTreeCodec is not present." +
+ " Continuing without it.");
+ }
+
addDependencyJars(conf,
// explicitly pull a class from each module
org.apache.hadoop.hbase.HConstants.class, // hbase-common
@@ -779,6 +794,7 @@ public class TableMapReduceUtil {
org.apache.hadoop.hbase.client.Put.class, // hbase-client
org.apache.hadoop.hbase.CompatibilityFactory.class, // hbase-hadoop-compat
org.apache.hadoop.hbase.mapreduce.TableMapper.class, // hbase-server
+ prefixTreeCodecClass, // hbase-prefix-tree (if null will be skipped)
// pull necessary dependencies
org.apache.zookeeper.ZooKeeper.class,
io.netty.channel.Channel.class,