[07/44] hbase git commit: HBASE-13244 addendum add InterfaceAudience annotation back for HBaseKerberosUtils
HBASE-13244 addendum add InterfaceAudience annotation back for
HBaseKerberosUtils
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b7e2daa1
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b7e2daa1
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b7e2daa1
Branch: refs/heads/hbase-12439
Commit: b7e2daa1dbae67aa7148acdb66a8f131a224d7e7
Parents: 0505b79
Author: zhangduo zhang...@wandoujia.com
Authored: Mon Mar 16 15:18:20 2015 +0800
Committer: zhangduo zhang...@wandoujia.com
Committed: Mon Mar 16 15:18:20 2015 +0800
--
.../java/org/apache/hadoop/hbase/security/HBaseKerberosUtils.java | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/b7e2daa1/hbase-server/src/test/java/org/apache/hadoop/hbase/security/HBaseKerberosUtils.java
--
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/HBaseKerberosUtils.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/HBaseKerberosUtils.java
index ace1719..1f9f4f5 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/HBaseKerberosUtils.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/HBaseKerberosUtils.java
@@ -20,9 +20,11 @@ package org.apache.hadoop.hbase.security;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.CommonConfigurationKeys;
import org.apache.hadoop.hbase.HBaseConfiguration;
+import org.apache.hadoop.hbase.classification.InterfaceAudience;
import com.google.common.base.Strings;
+@InterfaceAudience.Private
public class HBaseKerberosUtils {
public static final String KRB_PRINCIPAL =
hbase.regionserver.kerberos.principal;
public static final String MASTER_KRB_PRINCIPAL =
hbase.master.kerberos.principal;
[32/44] hbase git commit: TestEnableTableHandler.testDeleteForSureClearsAllTableRowsFromMeta - ADDENDUM
TestEnableTableHandler.testDeleteForSureClearsAllTableRowsFromMeta - ADDENDUM
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b728e667
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b728e667
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b728e667
Branch: refs/heads/hbase-12439
Commit: b728e66708cba45e1a030a8e06971a3c9d431dc7
Parents: 6a95dd3
Author: Esteban Gutierrez este...@cloudera.com
Authored: Wed Mar 18 18:02:35 2015 -0700
Committer: Matteo Bertozzi matteo.berto...@cloudera.com
Committed: Thu Mar 19 20:35:12 2015 +
--
.../master/handler/TestEnableTableHandler.java | 95 +++-
1 file changed, 92 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/b728e667/hbase-server/src/test/java/org/apache/hadoop/hbase/master/handler/TestEnableTableHandler.java
--
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/handler/TestEnableTableHandler.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/handler/TestEnableTableHandler.java
index 6788d7d..f5c8b90 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/handler/TestEnableTableHandler.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/handler/TestEnableTableHandler.java
@@ -21,6 +21,7 @@ package org.apache.hadoop.hbase.master.handler;
import java.util.ArrayList;
import java.util.List;
import java.io.IOException;
+import java.util.concurrent.CountDownLatch;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
@@ -43,6 +44,10 @@ import org.apache.hadoop.hbase.client.ResultScanner;
import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.client.Table;
import org.apache.hadoop.hbase.master.HMaster;
+import org.apache.hadoop.hbase.coprocessor.BaseMasterObserver;
+import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;
+import org.apache.hadoop.hbase.coprocessor.MasterCoprocessorEnvironment;
+import org.apache.hadoop.hbase.coprocessor.ObserverContext;
import org.apache.hadoop.hbase.testclassification.MasterTests;
import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.util.Bytes;
@@ -54,6 +59,7 @@ import org.junit.experimental.categories.Category;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
@Category({ MasterTests.class, MediumTests.class })
public class TestEnableTableHandler {
@@ -63,6 +69,8 @@ public class TestEnableTableHandler {
@Before
public void setUp() throws Exception {
+
TEST_UTIL.getConfiguration().set(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY,
+ MasterSyncObserver.class.getName());
TEST_UTIL.startMiniCluster(1);
}
@@ -140,7 +148,12 @@ public class TestEnableTableHandler {
final HBaseAdmin admin = TEST_UTIL.getHBaseAdmin();
final HTableDescriptor desc = new HTableDescriptor(tableName);
desc.addFamily(new HColumnDescriptor(FAMILYNAME));
-admin.createTable(desc, HBaseTestingUtility.KEYS_FOR_HBA_CREATE_TABLE);
+try {
+ createTable(TEST_UTIL, desc,
HBaseTestingUtility.KEYS_FOR_HBA_CREATE_TABLE);
+} catch (Exception e) {
+ e.printStackTrace();
+ fail(Got an exception while creating + tableName);
+}
// Now I have a nice table, mangle it by removing the
HConstants.REGIONINFO_QUALIFIER_STR
// content from a few of the rows.
try (Table metaTable =
TEST_UTIL.getConnection().getTable(TableName.META_TABLE_NAME)) {
@@ -157,8 +170,13 @@ public class TestEnableTableHandler {
}
admin.disableTable(tableName);
TEST_UTIL.waitTableDisabled(tableName.getName());
- // Presume this synchronous all is.
- admin.deleteTable(tableName);
+ // Rely on the coprocessor based latch to make the operation synchronous.
+ try {
+deleteTable(TEST_UTIL, tableName);
+ } catch (Exception e) {
+e.printStackTrace();
+fail(Got an exception while deleting + tableName);
+ }
int rowCount = 0;
try (ResultScanner scanner =
metaTable.getScanner(MetaTableAccessor.getScanForTableName(TEST_UTIL.getConnection(),
tableName))) {
@@ -170,4 +188,75 @@ public class TestEnableTableHandler {
assertEquals(0, rowCount);
}
}
+
+ public static class MasterSyncObserver extends BaseMasterObserver {
+volatile CountDownLatch tableCreationLatch = null;
+volatile CountDownLatch tableDeletionLatch = null;
+
+@Override
+public void postCreateTableHandler(final
ObserverContextMasterCoprocessorEnvironment ctx,
+ HTableDescriptor desc, HRegionInfo[] regions) throws IOException {
+ // the
[31/44] hbase git commit: HBASE-13285 Fix flaky getRegions() in TestAccessController.setUp()
HBASE-13285 Fix flaky getRegions() in TestAccessController.setUp()
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6a95dd35
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6a95dd35
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6a95dd35
Branch: refs/heads/hbase-12439
Commit: 6a95dd35511f4216481d8d0ffd4952ed1893a1c4
Parents: 27cf749
Author: Matteo Bertozzi matteo.berto...@cloudera.com
Authored: Thu Mar 19 17:54:46 2015 +
Committer: Matteo Bertozzi matteo.berto...@cloudera.com
Committed: Thu Mar 19 17:54:46 2015 +
--
.../hbase/security/access/TestAccessController.java | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/6a95dd35/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java
--
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java
index 9a45116..11aa5db 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java
@@ -232,7 +232,7 @@ public class TestAccessController extends SecureTestUtil {
htd.addFamily(hcd);
htd.setOwner(USER_OWNER);
admin.createTable(htd, new byte[][] { Bytes.toBytes(s) });
-TEST_UTIL.waitTableEnabled(TEST_TABLE.getTableName());
+TEST_UTIL.waitUntilAllRegionsAssigned(TEST_TABLE.getTableName());
HRegion region =
TEST_UTIL.getHBaseCluster().getRegions(TEST_TABLE.getTableName()).get(0);
RegionCoprocessorHost rcpHost = region.getCoprocessorHost();
@@ -930,7 +930,7 @@ public class TestAccessController extends SecureTestUtil {
setPermission(loadPath, FsPermission.valueOf(-rwxrwxrwx));
try (HTable table =
(HTable)TEST_UTIL.getConnection().getTable(tableName)) {
-TEST_UTIL.waitTableEnabled(tableName);
+TEST_UTIL.waitUntilAllRegionsAssigned(tableName);
LoadIncrementalHFiles loader = new LoadIncrementalHFiles(conf);
loader.doBulkLoad(loadPath, table);
}
@@ -2173,13 +2173,13 @@ public class TestAccessController extends
SecureTestUtil {
String namespace = testNamespaceUserGrant;
NamespaceDescriptor desc = NamespaceDescriptor.create(namespace).build();
TEST_UTIL.getMiniHBaseCluster().getMaster().createNamespace(desc);
-
+
// Grant namespace READ to USER_NONE, this should supersede any table
permissions
grantOnNamespace(TEST_UTIL, USER_NONE.getShortName(), namespace,
Permission.Action.READ);
// Now USER_NONE should be able to read also
verifyAllowed(getAction, USER_NONE);
-
+
TEST_UTIL.getMiniHBaseCluster().getMaster().deleteNamespace(namespace);
}
@@ -2392,7 +2392,7 @@ public class TestAccessController extends SecureTestUtil {
// Verify that EXEC permission is checked correctly
verifyDenied(execEndpointAction, userB);
verifyAllowed(execEndpointAction, userA);
-
+
String namespace = testCoprocessorExec;
NamespaceDescriptor desc = NamespaceDescriptor.create(namespace).build();
TEST_UTIL.getMiniHBaseCluster().getMaster().createNamespace(desc);
@@ -2402,7 +2402,7 @@ public class TestAccessController extends SecureTestUtil {
// User B should now be allowed also
verifyAllowed(execEndpointAction, userA, userB);
-
+
TEST_UTIL.getMiniHBaseCluster().getMaster().deleteNamespace(namespace);
}
[40/44] hbase git commit: HBASE-13282 Fix the minor issues of running Canary on kerberized environment (Srikanth Srungarapu)
HBASE-13282 Fix the minor issues of running Canary on kerberized environment
(Srikanth Srungarapu)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/09151911
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/09151911
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/09151911
Branch: refs/heads/hbase-12439
Commit: 09151911679a608db31cca63c25cfd52818a311c
Parents: f4eb719
Author: Matteo Bertozzi matteo.berto...@cloudera.com
Authored: Fri Mar 20 21:26:53 2015 +
Committer: Matteo Bertozzi matteo.berto...@cloudera.com
Committed: Fri Mar 20 21:26:53 2015 +
--
.../java/org/apache/hadoop/hbase/AuthUtil.java | 6 +++---
.../org/apache/hadoop/hbase/tool/Canary.java | 19 +--
2 files changed, 16 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/09151911/hbase-common/src/main/java/org/apache/hadoop/hbase/AuthUtil.java
--
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/AuthUtil.java
b/hbase-common/src/main/java/org/apache/hadoop/hbase/AuthUtil.java
index f597935..4754ea4 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/AuthUtil.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/AuthUtil.java
@@ -59,10 +59,10 @@ public class AuthUtil {
conf.get(hbase.client.dns.nameserver, default)));
userProvider.login(hbase.client.keytab.file,
hbase.client.kerberos.principal, host);
} catch (UnknownHostException e) {
- LOG.error(Error resolving host name);
+ LOG.error(Error resolving host name: + e.getMessage(), e);
throw e;
} catch (IOException e) {
- LOG.error(Error while trying to perform the initial login);
+ LOG.error(Error while trying to perform the initial login: +
e.getMessage(), e);
throw e;
}
@@ -93,7 +93,7 @@ public class AuthUtil {
try {
ugi.checkTGTAndReloginFromKeytab();
} catch (IOException e) {
- LOG.info(Got exception while trying to refresh credentials );
+ LOG.error(Got exception while trying to refresh credentials: +
e.getMessage(), e);
}
}
};
http://git-wip-us.apache.org/repos/asf/hbase/blob/09151911/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java
index c8f0a72..e5ad106 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java
@@ -338,6 +338,7 @@ public final class Canary implements Tool {
@Override
public int run(String[] args) throws Exception {
int index = -1;
+ChoreService choreService = null;
// Process command line args
for (int i = 0; i args.length; i++) {
@@ -411,6 +412,15 @@ public final class Canary implements Tool {
}
}
+// Launches chore for refreshing kerberos credentials if security is
enabled.
+// Please see
http://hbase.apache.org/book.html#_running_canary_in_a_kerberos_enabled_cluster
+// for more details.
+final ScheduledChore authChore = AuthUtil.getAuthChore(conf);
+if (authChore != null) {
+ choreService = new ChoreService(CANARY_TOOL);
+ choreService.scheduleChore(authChore);
+}
+
// Start to prepare the stuffs
Monitor monitor = null;
Thread monitorThread = null;
@@ -465,6 +475,9 @@ public final class Canary implements Tool {
} while (interval 0);
} // try-with-resources close
+if (choreService != null) {
+ choreService.shutdown();
+}
return(monitor.errorCode);
}
@@ -875,11 +888,6 @@ public final class Canary implements Tool {
public static void main(String[] args) throws Exception {
final Configuration conf = HBaseConfiguration.create();
-final ChoreService choreService = new ChoreService(CANARY_TOOL);
-final ScheduledChore authChore = AuthUtil.getAuthChore(conf);
-if (authChore != null) {
- choreService.scheduleChore(authChore);
-}
int numThreads = conf.getInt(hbase.canary.threads.num, MAX_THREADS_NUM);
ExecutorService executor = new ScheduledThreadPoolExecutor(numThreads);
@@ -888,7 +896,6 @@ public final class Canary implements Tool {
Sink sink = ReflectionUtils.newInstance(sinkClass);
int exitCode = ToolRunner.run(conf, new Canary(executor, sink), args);
-choreService.shutdown();
executor.shutdown();
System.exit(exitCode);
}
[02/44] hbase git commit: HBASE-13237 Improve trademark marks on the hbase.apache.org homepage
HBASE-13237 Improve trademark marks on the hbase.apache.org homepage Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/2f43da0a Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/2f43da0a Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/2f43da0a Branch: refs/heads/hbase-12439 Commit: 2f43da0a7da879c0beb124c61d0ab8ca00f36df4 Parents: e60cae0 Author: Andrew Purtell apurt...@apache.org Authored: Fri Mar 13 14:37:00 2015 -0700 Committer: Andrew Purtell apurt...@apache.org Committed: Fri Mar 13 15:48:25 2015 -0700 -- src/main/site/xdoc/index.xml | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/2f43da0a/src/main/site/xdoc/index.xml -- diff --git a/src/main/site/xdoc/index.xml b/src/main/site/xdoc/index.xml index f093313..d7e1e4e 100644 --- a/src/main/site/xdoc/index.xml +++ b/src/main/site/xdoc/index.xml @@ -17,21 +17,21 @@ xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd; properties -titleApache HBase#153; Home/title +titleApache HBase#8482; Home/title link rel=shortcut icon href=/images/favicon.ico / /properties body -section name=Welcome to Apache HBase#153; -pa href=http://www.apache.org/;Apache/a HBase#153; is the a href=http://hadoop.apache.org;Hadoop/a database, a distributed, scalable, big data store. +section name=Welcome to Apache HBase#8482; +pa href=http://www.apache.org/;Apache/a HBase#8482; is the a href=http://hadoop.apache.org;Hadoop/a database, a distributed, scalable, big data store. /p -h4Download Apache HBase/h4 +h4Download Apache HBase#8482;/h4 p -Click ba href=http://www.apache.org/dyn/closer.cgi/hbase/;here/a/b to download Apache HBase. +Click ba href=http://www.apache.org/dyn/closer.cgi/hbase/;here/a/b to download Apache HBase#8482;. /p h4When Would I Use Apache HBase?/h4 p -Use Apache HBase when you need random, realtime read/write access to your Big Data. +Use Apache HBase#8482; when you need random, realtime read/write access to your Big Data. This project's goal is the hosting of very large tables -- billions of rows X millions of columns -- atop clusters of commodity hardware. Apache HBase is an open-source, distributed, versioned, non-relational database modeled after Google's a href=http://research.google.com/archive/bigtable.html;Bigtable: A Distributed Storage System for Structured Data/a by Chang et al. Just as Bigtable leverages the distributed data storage provided by the Google File System, Apache HBase provides Bigtable-like capabilities on top of Hadoop and HDFS.
[34/44] hbase git commit: HBASE-13241 Add tests for group level grants
HBASE-13241 Add tests for group level grants
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/2bf904f2
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/2bf904f2
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/2bf904f2
Branch: refs/heads/hbase-12439
Commit: 2bf904f216ab8315c37a65e4860f51c526a3b654
Parents: 64589ab
Author: Ashish Singhi ashish.sin...@huawei.com
Authored: Thu Mar 19 15:48:12 2015 +0530
Committer: Matteo Bertozzi matteo.berto...@cloudera.com
Committed: Thu Mar 19 21:39:12 2015 +
--
.../security/access/TestAccessController2.java | 229 ++-
1 file changed, 226 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/2bf904f2/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController2.java
--
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController2.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController2.java
index 80c4fac..9e10104 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController2.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController2.java
@@ -17,20 +17,26 @@
*/
package org.apache.hadoop.hbase.security.access;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import java.util.ArrayList;
import java.util.List;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HColumnDescriptor;
import org.apache.hadoop.hbase.HTableDescriptor;
+import org.apache.hadoop.hbase.NamespaceDescriptor;
+import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.TableNotFoundException;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.Connection;
import org.apache.hadoop.hbase.client.ConnectionFactory;
-import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.ResultScanner;
@@ -42,7 +48,9 @@ import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.apache.hadoop.hbase.testclassification.SecurityTests;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.TestTableName;
+import org.junit.After;
import org.junit.AfterClass;
+import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
@@ -50,6 +58,7 @@ import org.junit.experimental.categories.Category;
@Category({SecurityTests.class, LargeTests.class})
public class TestAccessController2 extends SecureTestUtil {
+ private static final Log LOG =
LogFactory.getLog(TestAccessController2.class);
private static final byte[] TEST_ROW = Bytes.toBytes(test);
private static final byte[] TEST_FAMILY = Bytes.toBytes(f);
@@ -59,7 +68,29 @@ public class TestAccessController2 extends SecureTestUtil {
private static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
private static Configuration conf;
- @Rule public TestTableName TEST_TABLE = new TestTableName();
+ private static Connection connection;
+
+ private final static byte[] Q1 = Bytes.toBytes(q1);
+ private final static byte[] value1 = Bytes.toBytes(value1);
+
+ private static byte[] TEST_FAMILY_2 = Bytes.toBytes(f2);
+ private static byte[] TEST_ROW_2 = Bytes.toBytes(r2);
+ private final static byte[] Q2 = Bytes.toBytes(q2);
+ private final static byte[] value2 = Bytes.toBytes(value2);
+
+ private static byte[] TEST_ROW_3 = Bytes.toBytes(r3);
+
+ private static final String TESTGROUP_1 = testgroup_1;
+ private static final String TESTGROUP_2 = testgroup_2;
+
+ private static User TESTGROUP1_USER1;
+ private static User TESTGROUP2_USER1;
+
+ @Rule
+ public TestTableName TEST_TABLE = new TestTableName();
+ private String namespace = testNamespace;
+ private String tname = namespace + :testtable1;
+ private TableName tableName = TableName.valueOf(tname);
@BeforeClass
public static void setupBeforeClass() throws Exception {
@@ -70,14 +101,72 @@ public class TestAccessController2 extends SecureTestUtil {
verifyConfiguration(conf);
TEST_UTIL.startMiniCluster();
// Wait for the ACL table to become available
-TEST_UTIL.waitTableEnabled(AccessControlLists.ACL_TABLE_NAME);
+TEST_UTIL.waitUntilAllRegionsAssigned(AccessControlLists.ACL_TABLE_NAME);
+
+
[19/44] hbase git commit: HBASE-13093 Local mode HBase instance doesn't shut down.
HBASE-13093 Local mode HBase instance doesn't shut down.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/7a08ad9d
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7a08ad9d
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7a08ad9d
Branch: refs/heads/hbase-12439
Commit: 7a08ad9df8602bc99848489cd3d734b426aded48
Parents: 75b627c
Author: Andrey Stepachev oct...@gmail.com
Authored: Tue Mar 17 14:46:30 2015 +
Committer: Andrey Stepachev oct...@gmail.com
Committed: Tue Mar 17 14:46:30 2015 +
--
.../org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java | 8
.../java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java | 11 +--
2 files changed, 13 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/7a08ad9d/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java
--
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java
index 8414290..3fb547b 100644
---
a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java
+++
b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java
@@ -262,7 +262,7 @@ public class AsyncRpcChannel {
handleSaslConnectionFailure(retryCount, cause, realTicket);
// Try to reconnect
- AsyncRpcClient.WHEEL_TIMER.newTimeout(new TimerTask() {
+ client.newTimeout(new TimerTask() {
@Override
public void run(Timeout timeout) throws Exception {
connect(bootstrap);
@@ -289,7 +289,7 @@ public class AsyncRpcChannel {
*/
private void retryOrClose(final Bootstrap bootstrap, int connectCounter,
Throwable e) {
if (connectCounter client.maxRetries) {
- AsyncRpcClient.WHEEL_TIMER.newTimeout(new TimerTask() {
+ client.newTimeout(new TimerTask() {
@Override public void run(Timeout timeout) throws Exception {
connect(bootstrap);
}
@@ -339,7 +339,7 @@ public class AsyncRpcChannel {
// Add timeout for cleanup if none is present
if (cleanupTimer == null call.getRpcTimeout() 0) {
cleanupTimer =
-AsyncRpcClient.WHEEL_TIMER.newTimeout(timeoutTask,
call.getRpcTimeout(),
+client.newTimeout(timeoutTask, call.getRpcTimeout(),
TimeUnit.MILLISECONDS);
}
if (!connected) {
@@ -601,7 +601,7 @@ public class AsyncRpcChannel {
}
if (nextCleanupTaskDelay 0) {
cleanupTimer =
-AsyncRpcClient.WHEEL_TIMER.newTimeout(timeoutTask,
nextCleanupTaskDelay,
+client.newTimeout(timeoutTask, nextCleanupTaskDelay,
TimeUnit.MILLISECONDS);
} else {
cleanupTimer = null;
http://git-wip-us.apache.org/repos/asf/hbase/blob/7a08ad9d/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java
--
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java
index 3bf9aad..e55a7eb 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java
@@ -28,6 +28,8 @@ import io.netty.channel.nio.NioEventLoopGroup;
import io.netty.channel.socket.SocketChannel;
import io.netty.channel.socket.nio.NioSocketChannel;
import io.netty.util.HashedWheelTimer;
+import io.netty.util.Timeout;
+import io.netty.util.TimerTask;
import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.GenericFutureListener;
import io.netty.util.concurrent.Promise;
@@ -70,8 +72,9 @@ public class AsyncRpcClient extends AbstractRpcClient {
public static final String USE_NATIVE_TRANSPORT =
hbase.rpc.client.nativetransport;
public static final String USE_GLOBAL_EVENT_LOOP_GROUP =
hbase.rpc.client.globaleventloopgroup;
- public static final HashedWheelTimer WHEEL_TIMER =
- new HashedWheelTimer(100, TimeUnit.MILLISECONDS);
+ private static final HashedWheelTimer WHEEL_TIMER =
+ new
HashedWheelTimer(Threads.newDaemonThreadFactory(AsyncRpcChannel-timer),
+ 100, TimeUnit.MILLISECONDS);
private static final ChannelInitializerSocketChannel
DEFAULT_CHANNEL_INITIALIZER =
new ChannelInitializerSocketChannel() {
@@ -458,4 +461,8 @@ public class AsyncRpcClient extends AbstractRpcClient {
this.rpcClient.callMethod(md, pcrc, param, returnType, this.ticket,
this.isa, done);
}
}
+
+ Timeout newTimeout(TimerTask task, long
[23/44] hbase git commit: HBASE-13229 Specify bash for local-regionservers.sh and local-master-backup.sh
HBASE-13229 Specify bash for local-regionservers.sh and local-master-backup.sh Signed-off-by: Sean Busbey bus...@apache.org Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/99ec3661 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/99ec3661 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/99ec3661 Branch: refs/heads/hbase-12439 Commit: 99ec36614703fb191fa4093b86efdddf6aaa89ae Parents: d9d1b07 Author: Gustavo Anatoly gustavoanat...@gmail.com Authored: Mon Mar 16 23:45:01 2015 -0300 Committer: Sean Busbey bus...@apache.org Committed: Tue Mar 17 11:57:41 2015 -0500 -- bin/local-master-backup.sh | 2 +- bin/local-regionservers.sh | 2 +- src/main/asciidoc/_chapters/configuration.adoc | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/99ec3661/bin/local-master-backup.sh -- diff --git a/bin/local-master-backup.sh b/bin/local-master-backup.sh index f368e4a..e1a80cd 100755 --- a/bin/local-master-backup.sh +++ b/bin/local-master-backup.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash #/** # * Copyright 2007 The Apache Software Foundation # * http://git-wip-us.apache.org/repos/asf/hbase/blob/99ec3661/bin/local-regionservers.sh -- diff --git a/bin/local-regionservers.sh b/bin/local-regionservers.sh index 38d9ffc..f744ee1 100755 --- a/bin/local-regionservers.sh +++ b/bin/local-regionservers.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash #/** # * Copyright 2007 The Apache Software Foundation # * http://git-wip-us.apache.org/repos/asf/hbase/blob/99ec3661/src/main/asciidoc/_chapters/configuration.adoc -- diff --git a/src/main/asciidoc/_chapters/configuration.adoc b/src/main/asciidoc/_chapters/configuration.adoc index a5430eb..ed00a49 100644 --- a/src/main/asciidoc/_chapters/configuration.adoc +++ b/src/main/asciidoc/_chapters/configuration.adoc @@ -172,6 +172,9 @@ session required pam_limits.so +Linux Shell:: + All of the shell scripts that come with HBase rely on the link:http://www.gnu.org/software/bash[GNU Bash] shell. + Windows:: Prior to HBase 0.96, testing for running HBase on Microsoft Windows was limited. Running a on Windows nodes is not recommended for production systems.
[36/44] hbase git commit: HBASE-13198 Remove HConnectionManager (Mikhail Antonov)
HBASE-13198 Remove HConnectionManager (Mikhail Antonov) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f57dca5e Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f57dca5e Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f57dca5e Branch: refs/heads/hbase-12439 Commit: f57dca5e1b0b5c8491e2398e2b26717b480612b1 Parents: 0d76654 Author: stack st...@apache.org Authored: Fri Mar 20 09:41:48 2015 -0700 Committer: stack st...@apache.org Committed: Fri Mar 20 09:41:48 2015 -0700 -- bin/region_mover.rb | 4 +- bin/region_status.rb| 4 +- conf/log4j.properties | 4 +- .../hadoop/hbase/client/ConnectionFactory.java | 1 - .../hadoop/hbase/client/ConnectionManager.java | 46 +-- .../apache/hadoop/hbase/client/HConnection.java | 23 +- .../hadoop/hbase/client/HConnectionManager.java | 324 --- .../org/apache/hadoop/hbase/client/HTable.java | 2 +- .../apache/hadoop/hbase/client/MultiAction.java | 2 +- .../hbase/client/ReversedScannerCallable.java | 2 +- .../hadoop/hbase/client/ScannerCallable.java| 2 +- .../exceptions/ConnectionClosingException.java | 2 +- .../exceptions/PreemptiveFastFailException.java | 2 +- .../src/test/resources/log4j.properties | 2 +- .../src/test/resources/log4j.properties | 2 +- ...egrationTestBigLinkedListWithVisibility.java | 3 +- hbase-rest/src/test/resources/log4j.properties | 2 +- .../hbase/tmpl/master/MasterStatusTmpl.jamon| 1 - .../tmpl/master/RegionServerListTmpl.jamon | 1 - .../apache/hadoop/hbase/LocalHBaseCluster.java | 4 +- .../replication/VerifyReplication.java | 30 +- .../HBaseInterClusterReplicationEndpoint.java | 4 +- .../hadoop/hbase/util/ConnectionCache.java | 13 +- .../org/apache/hadoop/hbase/util/HMerge.java| 18 +- .../hadoop/hbase/util/MultiHConnection.java | 4 +- .../apache/hadoop/hbase/wal/WALSplitter.java| 5 +- .../resources/hbase-webapps/master/snapshot.jsp | 1 - .../org/apache/hadoop/hbase/TestZooKeeper.java | 5 +- .../hbase/client/HConnectionTestingUtility.java | 16 +- .../hadoop/hbase/client/TestFromClientSide.java | 92 +- .../org/apache/hadoop/hbase/client/TestHCM.java | 97 +- .../TestEndToEndSplitTransaction.java | 4 +- .../hadoop/hbase/util/MultiThreadedAction.java | 4 +- .../util/hbck/TestOfflineMetaRebuildBase.java | 1 - .../src/test/resources/log4j.properties | 2 +- 35 files changed, 97 insertions(+), 632 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/f57dca5e/bin/region_mover.rb -- diff --git a/bin/region_mover.rb b/bin/region_mover.rb index 565b0d5..cd0f173 100644 --- a/bin/region_mover.rb +++ b/bin/region_mover.rb @@ -29,7 +29,7 @@ import org.apache.hadoop.hbase.client.HBaseAdmin import org.apache.hadoop.hbase.client.Get import org.apache.hadoop.hbase.client.Scan import org.apache.hadoop.hbase.client.HTable -import org.apache.hadoop.hbase.client.HConnectionManager +import org.apache.hadoop.hbase.client.ConnectionFactory import org.apache.hadoop.hbase.filter.FirstKeyOnlyFilter; import org.apache.hadoop.hbase.filter.InclusiveStopFilter; import org.apache.hadoop.hbase.filter.FilterList; @@ -243,7 +243,7 @@ end # Now get list of regions on targetServer def getRegions(config, servername) - connection = HConnectionManager::getConnection(config); + connection = ConnectionFactory::createConnection(config); return ProtobufUtil::getOnlineRegions(connection.getAdmin(ServerName.valueOf(servername))); end http://git-wip-us.apache.org/repos/asf/hbase/blob/f57dca5e/bin/region_status.rb -- diff --git a/bin/region_status.rb b/bin/region_status.rb index a016afd..52af49e 100644 --- a/bin/region_status.rb +++ b/bin/region_status.rb @@ -56,7 +56,7 @@ import org.apache.hadoop.hbase.util.Bytes import org.apache.hadoop.hbase.HRegionInfo import org.apache.hadoop.hbase.MetaTableAccessor import org.apache.hadoop.hbase.HTableDescriptor -import org.apache.hadoop.hbase.client.HConnectionManager +import org.apache.hadoop.hbase.client.ConnectionFactory # disable debug logging on this script for clarity log_level = org.apache.log4j.Level::ERROR @@ -138,7 +138,7 @@ while true if $tablename.nil? server_count = admin.getClusterStatus().getRegionsCount() else -connection = HConnectionManager::getConnection(config); +connection = ConnectionFactory::createConnection(config); server_count = MetaTableAccessor::allTableRegions(connection, $TableName).size() end print Region Status:
[01/44] hbase git commit: HBASE-13234 Improve the obviousness of the download link on hbase.apache.org
Repository: hbase Updated Branches: refs/heads/hbase-12439 b21fa7c65 - 65d378189 HBASE-13234 Improve the obviousness of the download link on hbase.apache.org Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e60cae05 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e60cae05 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e60cae05 Branch: refs/heads/hbase-12439 Commit: e60cae0500daf3c146e10d808c5070c6cb24ecec Parents: b21fa7c Author: Andrew Purtell apurt...@apache.org Authored: Fri Mar 13 11:24:51 2015 -0700 Committer: Andrew Purtell apurt...@apache.org Committed: Fri Mar 13 11:26:17 2015 -0700 -- src/main/site/xdoc/index.xml | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/e60cae05/src/main/site/xdoc/index.xml -- diff --git a/src/main/site/xdoc/index.xml b/src/main/site/xdoc/index.xml index a40ab4b..f093313 100644 --- a/src/main/site/xdoc/index.xml +++ b/src/main/site/xdoc/index.xml @@ -25,6 +25,10 @@ section name=Welcome to Apache HBase#153; pa href=http://www.apache.org/;Apache/a HBase#153; is the a href=http://hadoop.apache.org;Hadoop/a database, a distributed, scalable, big data store. /p +h4Download Apache HBase/h4 +p +Click ba href=http://www.apache.org/dyn/closer.cgi/hbase/;here/a/b to download Apache HBase. +/p h4When Would I Use Apache HBase?/h4 p Use Apache HBase when you need random, realtime read/write access to your Big Data.
[10/44] hbase git commit: HBASE-13193 RegionScannerImpl filters should not be reset if a partial Result is returned (Jonathan Lawlor)
HBASE-13193 RegionScannerImpl filters should not be reset if a partial Result
is returned (Jonathan Lawlor)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a75a2ace
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a75a2ace
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a75a2ace
Branch: refs/heads/hbase-12439
Commit: a75a2ace4f52daa1eb415f085dfad920b30c3349
Parents: c5aca19
Author: stack st...@apache.org
Authored: Mon Mar 16 13:26:34 2015 -0700
Committer: stack st...@apache.org
Committed: Mon Mar 16 13:26:34 2015 -0700
--
.../hadoop/hbase/client/ClientScanner.java | 123 ---
.../hadoop/hbase/regionserver/HRegion.java | 14 ++-
.../hbase/regionserver/InternalScanner.java | 5 +
.../hbase/TestPartialResultsFromClientSide.java | 44 ++-
4 files changed, 133 insertions(+), 53 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/a75a2ace/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
--
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
index 9993974..bfbe718 100644
---
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
+++
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java
@@ -71,6 +71,12 @@ public class ClientScanner extends AbstractClientScanner {
* result.
*/
protected final LinkedListResult partialResults = new
LinkedListResult();
+/**
+ * The row for which we are accumulating partial Results (i.e. the row of
the Results stored
+ * inside partialResults). Changes to partialResultsRow and partialResults
are kept in sync
+ * via the methods {@link #addToPartialResults(Result)} and {@link
#clearPartialResults()}
+ */
+protected byte[] partialResultsRow = null;
protected final int caching;
protected long lastNext;
// Keep lastResult returned successfully in case we have to reset scanner.
@@ -378,7 +384,7 @@ public class ClientScanner extends AbstractClientScanner {
} catch (DoNotRetryIOException e) {
// An exception was thrown which makes any partial results that we
were collecting
// invalid. The scanner will need to be reset to the beginning of
a row.
-partialResults.clear();
+clearPartialResults();
// DNRIOEs are thrown to make us break out of retries. Some types
of DNRIOEs want us
// to reset the scanner and come back in again.
@@ -515,7 +521,7 @@ public class ClientScanner extends AbstractClientScanner {
if (resultsFromServer == null || resultsFromServer.length == 0) {
if (!partialResults.isEmpty()) {
resultsToAddToCache.add(Result.createCompleteResult(partialResults));
-partialResults.clear();
+clearPartialResults();
}
return resultsToAddToCache;
@@ -534,67 +540,65 @@ public class ClientScanner extends AbstractClientScanner {
LOG.trace(sb.toString());
}
-// There are four possibilities cases that can occur while handling
partial results
+// There are three possibilities cases that can occur while handling
partial results
//
// 1. (partial != null partialResults.isEmpty())
// This is the first partial result that we have received. It should be
added to
// the list of partialResults and await the next RPC request at which
point another
// portion of the complete result will be received
//
-// 2. (partial != null !partialResults.isEmpty())
-// a. values.length == 1
-// Since partialResults contains some elements, it means that we are
expecting to receive
-// the remainder of the complete result within this RPC response. The fact
that a partial result
-// was returned and it's the ONLY result returned indicates that we are
still receiving
-// fragments of the complete result. The Result can be completely formed
only when we have
-// received all of the fragments and thus in this case we simply add the
partial result to
-// our list.
-//
-// b. values.length 1
-// More than one result has been returned from the server. The fact that
we are accumulating
-// partials in partialList and we just received more than one result back
from the server
-// indicates that the FIRST result we received from the server must be the
final fragment that
-// can be used to complete our result. What this means is that the partial
that we received is
-// a partial result for a different row, and at this point we should
combine the existing
-//
[25/44] hbase git commit: HBASE-13200 Improper configuration can leads to endless lease recovery during failover (He Liangliang)
HBASE-13200 Improper configuration can leads to endless lease recovery during
failover (He Liangliang)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6709feeb
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6709feeb
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6709feeb
Branch: refs/heads/hbase-12439
Commit: 6709feeb650ddc44b4168e3250fdd98d113e472c
Parents: f9a17ed
Author: Liu Shaohui liushao...@xiaomi.com
Authored: Thu Mar 19 10:07:25 2015 +0800
Committer: Liu Shaohui liushao...@xiaomi.com
Committed: Thu Mar 19 10:07:25 2015 +0800
--
.../org/apache/hadoop/hbase/util/FSHDFSUtils.java | 14 --
1 file changed, 8 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/6709feeb/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSHDFSUtils.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSHDFSUtils.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSHDFSUtils.java
index 8bdac15..0fffcc6 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSHDFSUtils.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSHDFSUtils.java
@@ -180,9 +180,11 @@ public class FSHDFSUtils extends FSUtils {
long firstPause = conf.getInt(hbase.lease.recovery.first.pause, 4000);
// This should be set to how long it'll take for us to timeout against
primary datanode if it
// is dead. We set it to 61 seconds, 1 second than the default
READ_TIMEOUT in HDFS, the
-// default value for DFS_CLIENT_SOCKET_TIMEOUT_KEY.
-long subsequentPause = conf.getInt(hbase.lease.recovery.dfs.timeout, 61
* 1000);
-
+// default value for DFS_CLIENT_SOCKET_TIMEOUT_KEY. If recovery is still
failing after this
+// timeout, then further recovery will take liner backoff with this base,
to avoid endless
+// preemptions when this value is not properly configured.
+long subsequentPauseBase =
conf.getLong(hbase.lease.recovery.dfs.timeout, 61 * 1000);
+
Method isFileClosedMeth = null;
// whether we need to look for isFileClosed method
boolean findIsFileClosedMeth = true;
@@ -198,11 +200,11 @@ public class FSHDFSUtils extends FSUtils {
if (nbAttempt == 0) {
Thread.sleep(firstPause);
} else {
- // Cycle here until subsequentPause elapses. While spinning, check
isFileClosed if
- // available (should be in hadoop 2.0.5... not in hadoop 1 though.
+ // Cycle here until (subsequentPause * nbAttempt) elapses. While
spinning, check
+ // isFileClosed if available (should be in hadoop 2.0.5... not in
hadoop 1 though.
long localStartWaiting = EnvironmentEdgeManager.currentTime();
while ((EnvironmentEdgeManager.currentTime() - localStartWaiting)
- subsequentPause) {
+ subsequentPauseBase * nbAttempt) {
Thread.sleep(conf.getInt(hbase.lease.recovery.pause, 1000));
if (findIsFileClosedMeth) {
try {
[15/44] hbase git commit: HBASE-13233 add hbase-11339 branch to the patch testing script
HBASE-13233 add hbase-11339 branch to the patch testing script Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e192f5ed Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e192f5ed Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e192f5ed Branch: refs/heads/hbase-12439 Commit: e192f5ed39911d180287730315db51f18f0e5018 Parents: 65ad19d Author: Jonathan M Hsieh jmhs...@apache.org Authored: Tue Mar 17 00:51:06 2015 -0700 Committer: Jonathan M Hsieh jmhs...@apache.org Committed: Tue Mar 17 00:51:06 2015 -0700 -- dev-support/test-patch.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/e192f5ed/dev-support/test-patch.properties -- diff --git a/dev-support/test-patch.properties b/dev-support/test-patch.properties index 85c7630..9bf5842 100644 --- a/dev-support/test-patch.properties +++ b/dev-support/test-patch.properties @@ -27,7 +27,7 @@ MAX_LINE_LENGTH=100 # All supported branches for testing with precommit build # branch-1.x should apprear before branch-1 since the latter is a prefix -BRANCH_NAMES=0.94 0.98 branch-1.0 branch-1 master hbase-12439 +BRANCH_NAMES=0.94 0.98 branch-1.0 branch-1 master hbase-12439 hbase-11339 # All supported Hadoop versions that we want to test the compilation with HADOOP2_VERSIONS=2.4.1 2.5.2 2.6.0
[08/44] hbase git commit: HBASE-13246 Correct the assertion for namespace permissions in tearDown method of TestAccessController (Ashish Singhi)
HBASE-13246 Correct the assertion for namespace permissions in tearDown method
of TestAccessController (Ashish Singhi)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/76ba5300
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/76ba5300
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/76ba5300
Branch: refs/heads/hbase-12439
Commit: 76ba53004b3760c6c3d1a51dc000205fd68f1d53
Parents: b7e2daa
Author: tedyu yuzhih...@gmail.com
Authored: Mon Mar 16 06:47:56 2015 -0700
Committer: tedyu yuzhih...@gmail.com
Committed: Mon Mar 16 06:47:56 2015 -0700
--
.../security/access/TestAccessController.java | 26 ++--
1 file changed, 18 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/76ba5300/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java
--
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java
index ffabe34..9a45116 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java
@@ -20,7 +20,6 @@ package org.apache.hadoop.hbase.security.access;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -288,7 +287,10 @@ public class TestAccessController extends SecureTestUtil {
}
// Verify all table/namespace permissions are erased
assertEquals(0, AccessControlLists.getTablePermissions(conf,
TEST_TABLE.getTableName()).size());
-assertEquals(0, AccessControlLists.getNamespacePermissions(conf,
TEST_TABLE.getTableName().getNameAsString()).size());
+assertEquals(
+ 0,
+ AccessControlLists.getNamespacePermissions(conf,
+TEST_TABLE.getTableName().getNamespaceAsString()).size());
}
@Test
@@ -2168,13 +2170,17 @@ public class TestAccessController extends
SecureTestUtil {
verifyDenied(getAction, USER_NONE);
+String namespace = testNamespaceUserGrant;
+NamespaceDescriptor desc = NamespaceDescriptor.create(namespace).build();
+TEST_UTIL.getMiniHBaseCluster().getMaster().createNamespace(desc);
+
// Grant namespace READ to USER_NONE, this should supersede any table
permissions
-grantOnNamespace(TEST_UTIL, USER_NONE.getShortName(),
- TEST_TABLE.getTableName().getNamespaceAsString(),
- Permission.Action.READ);
+grantOnNamespace(TEST_UTIL, USER_NONE.getShortName(), namespace,
Permission.Action.READ);
// Now USER_NONE should be able to read also
verifyAllowed(getAction, USER_NONE);
+
+TEST_UTIL.getMiniHBaseCluster().getMaster().deleteNamespace(namespace);
}
@Test
@@ -2386,14 +2392,18 @@ public class TestAccessController extends
SecureTestUtil {
// Verify that EXEC permission is checked correctly
verifyDenied(execEndpointAction, userB);
verifyAllowed(execEndpointAction, userA);
+
+String namespace = testCoprocessorExec;
+NamespaceDescriptor desc = NamespaceDescriptor.create(namespace).build();
+TEST_UTIL.getMiniHBaseCluster().getMaster().createNamespace(desc);
// Now grant EXEC to the entire namespace to user B
-grantOnNamespace(TEST_UTIL, userB.getShortName(),
- TEST_TABLE.getTableName().getNamespaceAsString(),
- Permission.Action.EXEC);
+grantOnNamespace(TEST_UTIL, userB.getShortName(), namespace,
Permission.Action.EXEC);
// User B should now be allowed also
verifyAllowed(execEndpointAction, userA, userB);
+
+TEST_UTIL.getMiniHBaseCluster().getMaster().deleteNamespace(namespace);
}
@Test
[12/44] hbase git commit: HBASE-13254 EnableTableHandler#prepare would not throw TableNotFoundException during recovery (Stephen Jiang)
HBASE-13254 EnableTableHandler#prepare would not throw TableNotFoundException
during recovery (Stephen Jiang)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/47787f2c
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/47787f2c
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/47787f2c
Branch: refs/heads/hbase-12439
Commit: 47787f2c3aeaaff16fb06563de654f6f5f504726
Parents: dc03942
Author: tedyu yuzhih...@gmail.com
Authored: Mon Mar 16 17:50:16 2015 -0700
Committer: tedyu yuzhih...@gmail.com
Committed: Mon Mar 16 17:50:16 2015 -0700
--
.../apache/hadoop/hbase/master/handler/EnableTableHandler.java | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/47787f2c/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java
index c4969be..c7145fd 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/EnableTableHandler.java
@@ -92,11 +92,7 @@ public class EnableTableHandler extends EventHandler {
try {
// Check if table exists
if (!MetaTableAccessor.tableExists(this.server.getConnection(),
tableName)) {
-// retainAssignment is true only during recovery. In normal case it
is false
-if (!this.skipTableStateCheck) {
- throw new TableNotFoundException(tableName);
-}
-
this.assignmentManager.getTableStateManager().setDeletedTable(tableName);
+throw new TableNotFoundException(tableName);
}
// There could be multiple client requests trying to disable or enable
[41/44] hbase git commit: HBASE-13303 Fix size calculation of results on the region server
HBASE-13303 Fix size calculation of results on the region server
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8dfed5dc
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8dfed5dc
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8dfed5dc
Branch: refs/heads/hbase-12439
Commit: 8dfed5dc88f1c8008345b22e99224cb945fd0941
Parents: 0915191
Author: Andrew Purtell apurt...@apache.org
Authored: Fri Mar 20 17:24:05 2015 -0700
Committer: Andrew Purtell apurt...@apache.org
Committed: Fri Mar 20 17:24:50 2015 -0700
--
.../java/org/apache/hadoop/hbase/CellUtil.java | 15 +++
.../java/org/apache/hadoop/hbase/KeyValue.java | 21 +++
.../hbase/regionserver/RSRpcServices.java | 4 +-
.../hbase/client/TestResultSizeEstimation.java | 127 +++
4 files changed, 165 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/8dfed5dc/hbase-common/src/main/java/org/apache/hadoop/hbase/CellUtil.java
--
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/CellUtil.java
b/hbase-common/src/main/java/org/apache/hadoop/hbase/CellUtil.java
index 7b68eee..bce3957 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/CellUtil.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/CellUtil.java
@@ -568,6 +568,21 @@ public final class CellUtil {
return estimatedSerializedSizeOf(cell);
}
+ /**
+ * This is a hack that should be removed once we don't care about matching
+ * up client- and server-side estimations of cell size. It needed to be
+ * backwards compatible with estimations done by older clients. We need to
+ * pretend that tags never exist and cells aren't serialized with tag
+ * length included. See HBASE-13262 and HBASE-13303
+ */
+ @Deprecated
+ public static long estimatedHeapSizeOfWithoutTags(final Cell cell) {
+if (cell instanceof KeyValue) {
+ return ((KeyValue)cell).heapSizeWithoutTags();
+}
+return getSumOfCellKeyElementLengths(cell) + cell.getValueLength();
+ }
+
/* tags */
/**
* Util method to iterate through the tags
http://git-wip-us.apache.org/repos/asf/hbase/blob/8dfed5dc/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java
--
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java
b/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java
index f265a38..dace44c 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java
@@ -2641,6 +2641,27 @@ public class KeyValue implements Cell, HeapSize,
Cloneable, SettableSequenceId,
}
/**
+ * This is a hack that should be removed once we don't care about matching
+ * up client- and server-side estimations of cell size. It needed to be
+ * backwards compatible with estimations done by older clients. We need to
+ * pretend that tags never exist and KeyValues aren't serialized with tag
+ * length included. See HBASE-13262 and HBASE-13303
+ */
+ @Deprecated
+ public long heapSizeWithoutTags() {
+int sum = 0;
+sum += ClassSize.OBJECT;// the KeyValue object itself
+sum += ClassSize.REFERENCE;// pointer to bytes
+sum += ClassSize.align(ClassSize.ARRAY);// bytes
+sum += KeyValue.KEYVALUE_INFRASTRUCTURE_SIZE;
+sum += getKeyLength();
+sum += getValueLength();
+sum += 2 * Bytes.SIZEOF_INT;// offset, length
+sum += Bytes.SIZEOF_LONG;// memstoreTS
+return ClassSize.align(sum);
+ }
+
+ /**
* A simple form of KeyValue that creates a keyvalue with only the key part
of the byte[]
* Mainly used in places where we need to compare two cells. Avoids copying
of bytes
* In places like block index keys, we need to compare the key byte[] with a
cell.
http://git-wip-us.apache.org/repos/asf/hbase/blob/8dfed5dc/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
index 3ce1b57..4316a85 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
@@ -2129,7 +2129,7 @@ public class RSRpcServices implements
HBaseRPCErrorHandler,
for (Result r : results) {
for (Cell cell : r.rawCells()) {
totalCellSize
[03/44] hbase git commit: HBASE-13236 Add addt'l lifecycle-mapping executions.
HBASE-13236 Add addt'l lifecycle-mapping executions. Adds a number of lifecycle-mapping entries which prevent errors from showing up in Eclipse on a fresh import of HBase. For plugins defined in the top-level pom, the mapping is added there; otherwise, the mapping is pushed down to the child pom. Signed-off-by: Sean Busbey bus...@apache.org Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/72855c58 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/72855c58 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/72855c58 Branch: refs/heads/hbase-12439 Commit: 72855c584e53173471c44a284ef2e839b6f31564 Parents: 2f43da0 Author: Josh Elser els...@apache.org Authored: Fri Mar 13 17:27:54 2015 -0400 Committer: Sean Busbey bus...@apache.org Committed: Fri Mar 13 22:35:52 2015 -0500 -- hbase-client/pom.xml | 30 hbase-common/pom.xml | 30 ++-- hbase-examples/pom.xml | 43 hbase-hadoop-compat/pom.xml | 30 hbase-hadoop2-compat/pom.xml | 19 +++-- hbase-it/pom.xml | 39 ++ hbase-prefix-tree/pom.xml| 30 hbase-rest/pom.xml | 30 hbase-server/pom.xml | 32 +++-- hbase-shell/pom.xml | 41 ++- hbase-thrift/pom.xml | 56 + pom.xml | 59 +++ 12 files changed, 424 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/72855c58/hbase-client/pom.xml -- diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml index 29fa4fe..da8683f 100644 --- a/hbase-client/pom.xml +++ b/hbase-client/pom.xml @@ -91,6 +91,36 @@ artifactIdmaven-source-plugin/artifactId /plugin /plugins +pluginManagement + plugins +!--This plugin's configuration is used to store Eclipse m2e settings + only. It has no influence on the Maven build itself.-- +plugin + groupIdorg.eclipse.m2e/groupId + artifactIdlifecycle-mapping/artifactId + version1.0.0/version + configuration +lifecycleMappingMetadata + pluginExecutions +pluginExecution + pluginExecutionFilter +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-compiler-plugin/artifactId +versionRange[3.2,)/versionRange +goals + goalcompile/goal +/goals + /pluginExecutionFilter + action +ignore/ignore + /action +/pluginExecution + /pluginExecutions +/lifecycleMappingMetadata + /configuration +/plugin + /plugins +/pluginManagement /build dependencies http://git-wip-us.apache.org/repos/asf/hbase/blob/72855c58/hbase-common/pom.xml -- diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml index c95aaf7..20f905c 100644 --- a/hbase-common/pom.xml +++ b/hbase-common/pom.xml @@ -165,8 +165,8 @@ /plugins pluginManagement plugins - !--This plugin's configuration is used to store Eclipse m2e settings only. It - has no influence on the Maven build itself. -- +!--This plugin's configuration is used to store Eclipse m2e settings + only. It has no influence on the Maven build itself. -- plugin groupIdorg.eclipse.m2e/groupId artifactIdlifecycle-mapping/artifactId @@ -187,6 +187,32 @@ execute/ /action /pluginExecution +pluginExecution + pluginExecutionFilter +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-dependency-plugin/artifactId +versionRange[2.8,)/versionRange +goals + goalbuild-classpath/goal +/goals + /pluginExecutionFilter + action +ignore/ignore + /action +/pluginExecution +pluginExecution + pluginExecutionFilter +groupIdorg.apache.maven.plugins/groupId +artifactIdmaven-compiler-plugin/artifactId +versionRange[3.2,)/versionRange +goals +
[30/44] hbase git commit: HBASE-13280 TestSecureRPC failed
HBASE-13280 TestSecureRPC failed
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/27cf749a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/27cf749a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/27cf749a
Branch: refs/heads/hbase-12439
Commit: 27cf749af884edae55454c885c7fb066f0a33c79
Parents: 535ebbf
Author: zhangduo zhang...@wandoujia.com
Authored: Thu Mar 19 17:49:15 2015 +0800
Committer: zhangduo zhang...@wandoujia.com
Committed: Thu Mar 19 21:36:06 2015 +0800
--
.../java/org/apache/hadoop/hbase/security/TestSecureRPC.java | 4 +---
.../hbase/security/TestUsersOperationsWithSecureHadoop.java | 4 +---
.../hadoop/hbase/security/token/TestGenerateDelegationToken.java | 4 +---
3 files changed, 3 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/27cf749a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestSecureRPC.java
--
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestSecureRPC.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestSecureRPC.java
index 8ac38fa..8eff063 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestSecureRPC.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestSecureRPC.java
@@ -26,7 +26,6 @@ import static org.junit.Assert.assertSame;
import java.io.File;
import java.io.IOException;
-import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.util.ArrayList;
import java.util.List;
@@ -72,7 +71,7 @@ public class TestSecureRPC {
private static MiniKdc KDC;
- private static String HOST;
+ private static String HOST = localhost;
private static String PRINCIPAL;
@@ -82,7 +81,6 @@ public class TestSecureRPC {
conf.put(MiniKdc.DEBUG, true);
KDC = new MiniKdc(conf, new
File(TEST_UTIL.getDataTestDir(kdc).toUri().getPath()));
KDC.start();
-HOST = InetAddress.getLocalHost().getHostName();
PRINCIPAL = hbase/ + HOST;
KDC.createPrincipal(KEYTAB_FILE, PRINCIPAL);
HBaseKerberosUtils.setKeytabFileForTesting(KEYTAB_FILE.getAbsolutePath());
http://git-wip-us.apache.org/repos/asf/hbase/blob/27cf749a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestUsersOperationsWithSecureHadoop.java
--
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestUsersOperationsWithSecureHadoop.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestUsersOperationsWithSecureHadoop.java
index 0089556..0226d49 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestUsersOperationsWithSecureHadoop.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestUsersOperationsWithSecureHadoop.java
@@ -28,7 +28,6 @@ import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.IOException;
-import java.net.InetAddress;
import java.util.Properties;
import org.apache.hadoop.conf.Configuration;
@@ -51,7 +50,7 @@ public class TestUsersOperationsWithSecureHadoop {
private static MiniKdc KDC;
- private static String HOST;
+ private static String HOST = localhost;
private static String PRINCIPAL;
@@ -61,7 +60,6 @@ public class TestUsersOperationsWithSecureHadoop {
conf.put(MiniKdc.DEBUG, true);
KDC = new MiniKdc(conf, new
File(TEST_UTIL.getDataTestDir(kdc).toUri().getPath()));
KDC.start();
-HOST = InetAddress.getLocalHost().getHostName();
PRINCIPAL = hbase/ + HOST;
KDC.createPrincipal(KEYTAB_FILE, PRINCIPAL);
HBaseKerberosUtils.setKeytabFileForTesting(KEYTAB_FILE.getAbsolutePath());
http://git-wip-us.apache.org/repos/asf/hbase/blob/27cf749a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestGenerateDelegationToken.java
--
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestGenerateDelegationToken.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestGenerateDelegationToken.java
index d3f3040..e2752a0 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestGenerateDelegationToken.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestGenerateDelegationToken.java
@@ -22,7 +22,6 @@ import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.IOException;
-import java.net.InetAddress;
import java.util.Properties;
import org.apache.hadoop.hbase.HBaseTestingUtility;
@@ -70,7 +69,7 @@ public class TestGenerateDelegationToken {
.getPath());
private static MiniKdc KDC;
[35/44] hbase git commit: Reapply HBASE-12976 Set default value for hbase.client.scanner.max.result.size. in 1.1 and 2.0 only
Reapply HBASE-12976 Set default value for
hbase.client.scanner.max.result.size. in 1.1 and 2.0 only
This reverts commit 64589abe9936337fcbccdbe82e538d05020c8ee4.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0d766544
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0d766544
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0d766544
Branch: refs/heads/hbase-12439
Commit: 0d766544166fc9630bb00ae14a4a34a69d93f127
Parents: 2bf904f
Author: Lars Hofhansl la...@apache.org
Authored: Thu Mar 19 15:07:15 2015 -0700
Committer: Lars Hofhansl la...@apache.org
Committed: Thu Mar 19 15:07:15 2015 -0700
--
.../src/main/java/org/apache/hadoop/hbase/HConstants.java | 4 ++--
hbase-common/src/main/resources/hbase-default.xml | 10 ++
2 files changed, 12 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/0d766544/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 7d93904..19e251a 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
@@ -624,9 +624,9 @@ public final class HConstants {
* Note that when a single row is larger than this limit the row is still
* returned completely.
*
- * The default value is unlimited.
+ * The default value is 2MB.
*/
- public static final long DEFAULT_HBASE_CLIENT_SCANNER_MAX_RESULT_SIZE =
Long.MAX_VALUE;
+ public static final long DEFAULT_HBASE_CLIENT_SCANNER_MAX_RESULT_SIZE = 2 *
1024 * 1024;
/**
* Parameter name for client pause value, used mostly as value to wait
http://git-wip-us.apache.org/repos/asf/hbase/blob/0d766544/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 69017f6..a3092b5 100644
--- a/hbase-common/src/main/resources/hbase-default.xml
+++ b/hbase-common/src/main/resources/hbase-default.xml
@@ -1290,6 +1290,16 @@ possible configurations would overwhelm and obscure the
important.
/property
property
+namehbase.client.scanner.max.result.size/name
+value2097152/value
+descriptionMaximum number of bytes returned when calling a scanner's
next method.
+Note that when a single row is larger than this limit the row is still
returned completely.
+The default value is 2MB, which is good for 1ge networks.
+With faster and/or high latency networks this value should be increased.
+/description
+ /property
+
+ property
namehbase.status.published/name
valuefalse/value
description
[16/44] hbase git commit: HBASE-13258 Promote TestHRegion to LargeTests
HBASE-13258 Promote TestHRegion to LargeTests
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/2b08653a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/2b08653a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/2b08653a
Branch: refs/heads/hbase-12439
Commit: 2b08653a79a8ed0ae8501a110b79f9ea23e808d4
Parents: e192f5e
Author: zhangduo zhang...@wandoujia.com
Authored: Tue Mar 17 09:20:15 2015 +0800
Committer: zhangduo zhang...@wandoujia.com
Committed: Tue Mar 17 16:02:27 2015 +0800
--
.../java/org/apache/hadoop/hbase/regionserver/TestHRegion.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/2b08653a/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 785e669..cf77f42 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
@@ -140,7 +140,7 @@ import org.apache.hadoop.hbase.regionserver.wal.WALEdit;
import org.apache.hadoop.hbase.regionserver.wal.WALUtil;
import org.apache.hadoop.hbase.security.User;
import org.apache.hadoop.hbase.test.MetricsAssertHelper;
-import org.apache.hadoop.hbase.testclassification.MediumTests;
+import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.apache.hadoop.hbase.testclassification.VerySlowRegionServerTests;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
@@ -178,7 +178,7 @@ import com.google.protobuf.ByteString;
* A lot of the meta information for an HRegion now lives inside other HRegions
* or in the HBaseMaster, so only basic testing is possible.
*/
-@Category({VerySlowRegionServerTests.class, MediumTests.class})
+@Category({VerySlowRegionServerTests.class, LargeTests.class})
@SuppressWarnings(deprecation)
public class TestHRegion {
// Do not spin up clusters in here. If you need to spin up a cluster, do it
[21/44] hbase git commit: Specify bash for local-regionservers.sh and local-master-backup.sh
Specify bash for local-regionservers.sh and local-master-backup.sh Signed-off-by: Sean Busbey bus...@apache.org Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ca8876a9 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ca8876a9 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ca8876a9 Branch: refs/heads/hbase-12439 Commit: ca8876a9f2534f2ab0b416aecb4ac476da9747f8 Parents: ed026c2 Author: Gustavo Anatoly gustavoanat...@gmail.com Authored: Mon Mar 16 23:45:01 2015 -0300 Committer: Sean Busbey bus...@apache.org Committed: Tue Mar 17 09:57:07 2015 -0500 -- bin/local-master-backup.sh | 2 +- bin/local-regionservers.sh | 2 +- src/main/asciidoc/_chapters/configuration.adoc | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/ca8876a9/bin/local-master-backup.sh -- diff --git a/bin/local-master-backup.sh b/bin/local-master-backup.sh index f368e4a..e1a80cd 100755 --- a/bin/local-master-backup.sh +++ b/bin/local-master-backup.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash #/** # * Copyright 2007 The Apache Software Foundation # * http://git-wip-us.apache.org/repos/asf/hbase/blob/ca8876a9/bin/local-regionservers.sh -- diff --git a/bin/local-regionservers.sh b/bin/local-regionservers.sh index 38d9ffc..f744ee1 100755 --- a/bin/local-regionservers.sh +++ b/bin/local-regionservers.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash #/** # * Copyright 2007 The Apache Software Foundation # * http://git-wip-us.apache.org/repos/asf/hbase/blob/ca8876a9/src/main/asciidoc/_chapters/configuration.adoc -- diff --git a/src/main/asciidoc/_chapters/configuration.adoc b/src/main/asciidoc/_chapters/configuration.adoc index a5430eb..ed00a49 100644 --- a/src/main/asciidoc/_chapters/configuration.adoc +++ b/src/main/asciidoc/_chapters/configuration.adoc @@ -172,6 +172,9 @@ session required pam_limits.so +Linux Shell:: + All of the shell scripts that come with HBase rely on the link:http://www.gnu.org/software/bash[GNU Bash] shell. + Windows:: Prior to HBase 0.96, testing for running HBase on Microsoft Windows was limited. Running a on Windows nodes is not recommended for production systems.
[27/44] hbase git commit: HBASE-13199 Some small improvements on canary tool (Shaohui Liu)
HBASE-13199 Some small improvements on canary tool (Shaohui Liu)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/cf7ef936
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/cf7ef936
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/cf7ef936
Branch: refs/heads/hbase-12439
Commit: cf7ef936d20b98482a48926a194772c66d3234c1
Parents: 602e11c
Author: Liu Shaohui liushao...@xiaomi.com
Authored: Thu Mar 19 10:44:35 2015 +0800
Committer: Liu Shaohui liushao...@xiaomi.com
Committed: Thu Mar 19 10:44:35 2015 +0800
--
.../org/apache/hadoop/hbase/tool/Canary.java| 423 ---
1 file changed, 266 insertions(+), 157 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/cf7ef936/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java
index 309a1c2..8efb73d 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java
@@ -24,10 +24,17 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Random;
import java.util.Set;
import java.util.TreeSet;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -56,6 +63,8 @@ import org.apache.hadoop.hbase.client.RegionLocator;
import org.apache.hadoop.hbase.client.ResultScanner;
import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.client.Table;
+import org.apache.hadoop.hbase.filter.FirstKeyOnlyFilter;
+import org.apache.hadoop.hbase.util.ReflectionUtils;
import org.apache.hadoop.util.Tool;
import org.apache.hadoop.util.ToolRunner;
@@ -119,6 +128,174 @@ public final class Canary implements Tool {
}
}
+ /**
+ * For each column family of the region tries to get one row and outputs the
latency, or the
+ * failure.
+ */
+ static class RegionTask implements CallableVoid {
+private Connection connection;
+private HRegionInfo region;
+private Sink sink;
+
+RegionTask(Connection connection, HRegionInfo region, Sink sink) {
+ this.connection = connection;
+ this.region = region;
+ this.sink = sink;
+}
+
+@Override
+public Void call() {
+ Table table = null;
+ HTableDescriptor tableDesc = null;
+ try {
+table = connection.getTable(region.getTable());
+tableDesc = table.getTableDescriptor();
+ } catch (IOException e) {
+LOG.debug(sniffRegion failed, e);
+sink.publishReadFailure(region, e);
+return null;
+ } finally {
+if (table != null) {
+ try {
+table.close();
+ } catch (IOException e) {
+ }
+}
+ }
+
+ byte[] startKey = null;
+ Get get = null;
+ Scan scan = null;
+ ResultScanner rs = null;
+ StopWatch stopWatch = new StopWatch();
+ for (HColumnDescriptor column : tableDesc.getColumnFamilies()) {
+stopWatch.reset();
+startKey = region.getStartKey();
+// Can't do a get on empty start row so do a Scan of first element if
any instead.
+if (startKey.length 0) {
+ get = new Get(startKey);
+ get.setCacheBlocks(false);
+ get.setFilter(new FirstKeyOnlyFilter());
+ get.addFamily(column.getName());
+} else {
+ scan = new Scan();
+ scan.setCaching(1);
+ scan.setCacheBlocks(false);
+ scan.setFilter(new FirstKeyOnlyFilter());
+ scan.addFamily(column.getName());
+ scan.setMaxResultSize(1L);
+}
+
+try {
+ if (startKey.length 0) {
+stopWatch.start();
+table.get(get);
+stopWatch.stop();
+sink.publishReadTiming(region, column, stopWatch.getTime());
+ } else {
+stopWatch.start();
+rs = table.getScanner(scan);
+stopWatch.stop();
+sink.publishReadTiming(region, column, stopWatch.getTime());
+ }
+} catch (Exception e) {
+ sink.publishReadFailure(region, column, e);
+} finally {
+ if (rs != null) {
+rs.close();
+ }
+ if (table != null) {
+try {
+
[43/44] hbase git commit: HBASE-13309 Some tests do not reset EnvironmentEdgeManager
HBASE-13309 Some tests do not reset EnvironmentEdgeManager
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/845f5de1
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/845f5de1
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/845f5de1
Branch: refs/heads/hbase-12439
Commit: 845f5de121e92a99b41b30dc86cb3f2898e0254f
Parents: a9b73b6
Author: Matteo Bertozzi matteo.berto...@cloudera.com
Authored: Sun Mar 22 10:40:49 2015 +
Committer: Matteo Bertozzi matteo.berto...@cloudera.com
Committed: Sun Mar 22 10:40:49 2015 +
--
.../apache/hadoop/hbase/util/TestFSUtils.java| 19 +++
.../apache/hadoop/hbase/util/TestHBaseFsck.java | 6 ++
2 files changed, 17 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/845f5de1/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSUtils.java
--
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSUtils.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSUtils.java
index c8b2285..e2c1488 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSUtils.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSUtils.java
@@ -330,16 +330,19 @@ public class TestFSUtils {
ManualEnvironmentEdge mockEnv = new ManualEnvironmentEdge();
mockEnv.setValue(expect);
EnvironmentEdgeManager.injectEdge(mockEnv);
+try {
+ String dstFile = UUID.randomUUID().toString();
+ Path dst = new Path(testDir , dstFile);
-String dstFile = UUID.randomUUID().toString();
-Path dst = new Path(testDir , dstFile);
-
-assertTrue(FSUtils.renameAndSetModifyTime(fs, p, dst));
-assertFalse(The moved file should not be present, FSUtils.isExists(fs,
p));
-assertTrue(The dst file should be present, FSUtils.isExists(fs, dst));
+ assertTrue(FSUtils.renameAndSetModifyTime(fs, p, dst));
+ assertFalse(The moved file should not be present, FSUtils.isExists(fs,
p));
+ assertTrue(The dst file should be present, FSUtils.isExists(fs, dst));
-assertEquals(expect, fs.getFileStatus(dst).getModificationTime());
-cluster.shutdown();
+ assertEquals(expect, fs.getFileStatus(dst).getModificationTime());
+ cluster.shutdown();
+} finally {
+ EnvironmentEdgeManager.reset();
+}
}
/**
http://git-wip-us.apache.org/repos/asf/hbase/blob/845f5de1/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java
--
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java
index ba7ba9c..ac2d906 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java
@@ -111,6 +111,7 @@ import org.apache.hadoop.hbase.zookeeper.MetaTableLocator;
import org.apache.zookeeper.KeeperException;
import org.junit.AfterClass;
import org.junit.Assert;
+import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
@@ -182,6 +183,11 @@ public class TestHBaseFsck {
TEST_UTIL.shutdownMiniCluster();
}
+ @Before
+ public void setUp() {
+EnvironmentEdgeManager.reset();
+ }
+
@Test (timeout=18)
public void testHBaseFsck() throws Exception {
assertNoErrors(doFsck(conf, false));
[13/44] hbase git commit: HBASE-13223 Add testMoveMeta to IntegrationTestMTTR
HBASE-13223 Add testMoveMeta to IntegrationTestMTTR
Signed-off-by: Andrew Purtell apurt...@apache.org
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/bf9e32d5
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/bf9e32d5
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/bf9e32d5
Branch: refs/heads/hbase-12439
Commit: bf9e32d59d65afa6425f03e488959c8883038801
Parents: 47787f2
Author: Dima Spivak dspi...@cloudera.com
Authored: Mon Mar 16 18:22:51 2015 -0700
Committer: Andrew Purtell apurt...@apache.org
Committed: Mon Mar 16 18:22:51 2015 -0700
--
.../hadoop/hbase/mttr/IntegrationTestMTTR.java | 17 ++---
1 file changed, 14 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/bf9e32d5/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java
--
diff --git
a/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java
b/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java
index 824e87f..4423650 100644
---
a/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java
+++
b/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java
@@ -36,13 +36,13 @@ import org.apache.hadoop.hbase.ClusterStatus;
import org.apache.hadoop.hbase.HColumnDescriptor;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.IntegrationTestingUtility;
-import org.apache.hadoop.hbase.testclassification.IntegrationTests;
import org.apache.hadoop.hbase.InvalidFamilyOperationException;
import org.apache.hadoop.hbase.NamespaceExistException;
import org.apache.hadoop.hbase.NamespaceNotFoundException;
import org.apache.hadoop.hbase.TableExistsException;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.TableNotFoundException;
+import org.apache.hadoop.hbase.testclassification.IntegrationTests;
import org.apache.hadoop.hbase.chaos.actions.Action;
import org.apache.hadoop.hbase.chaos.actions.MoveRegionsOfTableAction;
import org.apache.hadoop.hbase.chaos.actions.RestartActiveMasterAction;
@@ -50,8 +50,6 @@ import
org.apache.hadoop.hbase.chaos.actions.RestartRsHoldingMetaAction;
import org.apache.hadoop.hbase.chaos.actions.RestartRsHoldingTableAction;
import org.apache.hadoop.hbase.chaos.factories.MonkeyConstants;
import org.apache.hadoop.hbase.client.Admin;
-import org.apache.hadoop.hbase.client.HBaseAdmin;
-import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.ResultScanner;
@@ -107,6 +105,7 @@ import com.google.common.base.Objects;
* The ChaosMonkey actions currently run are:
* ul
* liRestart the RegionServer holding meta./li
+ * liMove the Regions of meta./li
* liRestart the RegionServer holding the table the scan and put threads are
targeting./li
* liMove the Regions of the table used by the scan and put threads./li
* liRestart the master./li
@@ -147,6 +146,7 @@ public class IntegrationTestMTTR {
*/
private static Action restartRSAction;
private static Action restartMetaAction;
+ private static Action moveMetaRegionsAction;
private static Action moveRegionAction;
private static Action restartMasterAction;
@@ -195,6 +195,10 @@ public class IntegrationTestMTTR {
// Set up the action that will kill the region holding meta.
restartMetaAction = new RestartRsHoldingMetaAction(sleepTime);
+// Set up the action that will move the regions of meta.
+moveMetaRegionsAction = new MoveRegionsOfTableAction(sleepTime,
+MonkeyConstants.DEFAULT_MOVE_REGIONS_MAX_TIME,
TableName.META_TABLE_NAME);
+
// Set up the action that will move the regions of our table.
moveRegionAction = new MoveRegionsOfTableAction(sleepTime,
MonkeyConstants.DEFAULT_MOVE_REGIONS_MAX_TIME, tableName);
@@ -206,6 +210,7 @@ public class IntegrationTestMTTR {
Action.ActionContext actionContext = new Action.ActionContext(util);
restartRSAction.init(actionContext);
restartMetaAction.init(actionContext);
+moveMetaRegionsAction.init(actionContext);
moveRegionAction.init(actionContext);
restartMasterAction.init(actionContext);
}
@@ -255,6 +260,7 @@ public class IntegrationTestMTTR {
// Clean up the actions.
moveRegionAction = null;
restartMetaAction = null;
+moveMetaRegionsAction = null;
restartRSAction = null;
restartMasterAction = null;
@@ -272,6 +278,11 @@ public class IntegrationTestMTTR {
}
@Test
+ public void testMoveMeta() throws Exception {
+run(new ActionCallable(moveMetaRegionsAction), MoveMeta);
+ }
+
+ @Test
public
[28/44] hbase git commit: HBASE-13006 Document visibility label support for groups. (Jerry He)
HBASE-13006 Document visibility label support for groups. (Jerry He) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/014b8121 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/014b8121 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/014b8121 Branch: refs/heads/hbase-12439 Commit: 014b8121031d6268f73f901d54c32a9d880bb12f Parents: cf7ef93 Author: anoopsjohn anoopsamj...@gmail.com Authored: Thu Mar 19 09:18:21 2015 +0530 Committer: anoopsjohn anoopsamj...@gmail.com Committed: Thu Mar 19 09:18:21 2015 +0530 -- .../src/main/ruby/shell/commands/clear_auths.rb| 5 +++-- hbase-shell/src/main/ruby/shell/commands/get_auths.rb | 5 +++-- hbase-shell/src/main/ruby/shell/commands/set_auths.rb | 5 +++-- src/main/asciidoc/_chapters/security.adoc | 13 - 4 files changed, 21 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/014b8121/hbase-shell/src/main/ruby/shell/commands/clear_auths.rb -- diff --git a/hbase-shell/src/main/ruby/shell/commands/clear_auths.rb b/hbase-shell/src/main/ruby/shell/commands/clear_auths.rb index 7bf4252..8553fa6 100644 --- a/hbase-shell/src/main/ruby/shell/commands/clear_auths.rb +++ b/hbase-shell/src/main/ruby/shell/commands/clear_auths.rb @@ -20,12 +20,13 @@ module Shell class ClearAuths Command def help return -EOF -Add a set of visibility labels for an user that has to removed -Syntax : clear_auths 'user1',[label1, label2] +Clear visibility labels from a user or group +Syntax : clear_auths 'user',[label1, label2] For example: hbase clear_auths 'user1', ['SECRET','PRIVATE'] +hbase clear_auths '@group1', ['SECRET','PRIVATE'] EOF end http://git-wip-us.apache.org/repos/asf/hbase/blob/014b8121/hbase-shell/src/main/ruby/shell/commands/get_auths.rb -- diff --git a/hbase-shell/src/main/ruby/shell/commands/get_auths.rb b/hbase-shell/src/main/ruby/shell/commands/get_auths.rb index 2bc3e09..1b758ef 100644 --- a/hbase-shell/src/main/ruby/shell/commands/get_auths.rb +++ b/hbase-shell/src/main/ruby/shell/commands/get_auths.rb @@ -20,12 +20,13 @@ module Shell class GetAuths Command def help return -EOF -Get the visibility labels set for a particular user -Syntax : get_auths 'user1' +Get the visibility labels set for a particular user or group +Syntax : get_auths 'user' For example: hbase get_auths 'user1' +hbase get_auths '@group1' EOF end http://git-wip-us.apache.org/repos/asf/hbase/blob/014b8121/hbase-shell/src/main/ruby/shell/commands/set_auths.rb -- diff --git a/hbase-shell/src/main/ruby/shell/commands/set_auths.rb b/hbase-shell/src/main/ruby/shell/commands/set_auths.rb index 6679719..4a52eb0 100644 --- a/hbase-shell/src/main/ruby/shell/commands/set_auths.rb +++ b/hbase-shell/src/main/ruby/shell/commands/set_auths.rb @@ -20,12 +20,13 @@ module Shell class SetAuths Command def help return -EOF -Add a set of visibility labels for an user -Syntax : set_auths 'user1',[label1, label2] +Add a set of visibility labels for a user or group +Syntax : set_auths 'user',[label1, label2] For example: hbase set_auths 'user1', ['SECRET','PRIVATE'] +hbase set_auths '@group1', ['SECRET','PRIVATE'] EOF end http://git-wip-us.apache.org/repos/asf/hbase/blob/014b8121/src/main/asciidoc/_chapters/security.adoc -- diff --git a/src/main/asciidoc/_chapters/security.adoc b/src/main/asciidoc/_chapters/security.adoc index ae74661..25153a5 100644 --- a/src/main/asciidoc/_chapters/security.adoc +++ b/src/main/asciidoc/_chapters/security.adoc @@ -1057,6 +1057,9 @@ The default plugin passes through labels specified in Authorizations added to th When the client passes labels for which the user is not authenticated, the default plugin drops them. You can pass a subset of user authenticated labels via the `Get#setAuthorizations(Authorizations(String,...))` and `Scan#setAuthorizations(Authorizations(String,...));` methods. +Groups can be granted visibility labels the same way as users. Groups are prefixed with an @ symbol. When checking visibility labels of a user, the server will include the visibility labels of the groups of which the user is a member, together with the user's own labels. +When the visibility labels are retrieved using API `VisibilityClient#getAuths` or Shell command `get_auths` for a user, we will return labels added specifically for that user alone, not the group level labels. + Visibility label access
[38/44] hbase git commit: HBASE-13286 Minimum timeout for a rpc call could be 1 ms instead of 2 seconds
HBASE-13286 Minimum timeout for a rpc call could be 1 ms instead of 2 seconds
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6d446034
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6d446034
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6d446034
Branch: refs/heads/hbase-12439
Commit: 6d4460341e0d44bfb574180369748e17fbe5f5a1
Parents: 34347a3
Author: Nicolas Liochon nkey...@apache.org
Authored: Fri Mar 20 19:09:43 2015 +0100
Committer: Nicolas Liochon nkey...@apache.org
Committed: Fri Mar 20 19:09:43 2015 +0100
--
.../hadoop/hbase/client/RpcRetryingCallerImpl.java | 11 ---
1 file changed, 4 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/6d446034/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCallerImpl.java
--
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCallerImpl.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCallerImpl.java
index 1d037bc..03138ec 100644
---
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCallerImpl.java
+++
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCallerImpl.java
@@ -54,10 +54,7 @@ public class RpcRetryingCallerImplT implements
RpcRetryingCallerT {
* When we started making calls.
*/
private long globalStartTime;
- /**
- * Start and end times for a single call.
- */
- private final static int MIN_RPC_TIMEOUT = 2000;
+
/** How many retries are allowed before we start to log */
private final int startLogErrorsCnt;
@@ -87,11 +84,11 @@ public class RpcRetryingCallerImplT implements
RpcRetryingCallerT {
if (callTimeout == Integer.MAX_VALUE) return Integer.MAX_VALUE;
int remainingTime = (int) (callTimeout -
(EnvironmentEdgeManager.currentTime() - this.globalStartTime));
- if (remainingTime MIN_RPC_TIMEOUT) {
+ if (remainingTime 1) {
// If there is no time left, we're trying anyway. It's too late.
// 0 means no timeout, and it's not the intent here. So we secure both
cases by
// resetting to the minimum.
-remainingTime = MIN_RPC_TIMEOUT;
+remainingTime = 1;
}
return remainingTime;
}
@@ -222,7 +219,7 @@ public class RpcRetryingCallerImplT implements
RpcRetryingCallerT {
}
// Don't let ServiceException out; its rpc specific.
t = cause;
- // t could be a RemoteException so go aaround again.
+ // t could be a RemoteException so go around again.
translateException(t);
} else if (t instanceof DoNotRetryIOException) {
throw (DoNotRetryIOException)t;
[20/44] hbase git commit: HBASE-13176 Flakey TestZooKeeper test.
HBASE-13176 Flakey TestZooKeeper test.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ed026c2e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ed026c2e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ed026c2e
Branch: refs/heads/hbase-12439
Commit: ed026c2e6f518963ee7fb9c7b26266e888c71c2d
Parents: 7a08ad9
Author: Andrey Stepachev oct...@gmail.com
Authored: Tue Mar 17 14:51:39 2015 +
Committer: Andrey Stepachev oct...@gmail.com
Committed: Tue Mar 17 14:51:39 2015 +
--
.../org/apache/hadoop/hbase/TestZooKeeper.java | 50 +++-
1 file changed, 38 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/ed026c2e/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
--
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
index 4439d4c..c9d984f 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
@@ -38,13 +38,13 @@ import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.Connection;
import org.apache.hadoop.hbase.client.ConnectionFactory;
import org.apache.hadoop.hbase.client.Get;
-import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.hadoop.hbase.client.HConnectionManager;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.ResultScanner;
import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.client.Table;
+import org.apache.hadoop.hbase.coordination.ZkSplitLogWorkerCoordination;
import org.apache.hadoop.hbase.master.HMaster;
import org.apache.hadoop.hbase.master.LoadBalancer;
import org.apache.hadoop.hbase.master.balancer.SimpleLoadBalancer;
@@ -238,7 +238,7 @@ public class TestZooKeeper {
MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster();
HMaster m = cluster.getMaster();
m.abort(Test recovery from zk session expired,
- new KeeperException.SessionExpiredException());
+new KeeperException.SessionExpiredException());
assertTrue(m.isStopped()); // Master doesn't recover any more
testSanity(testMasterZKSessionRecoveryFailure);
}
@@ -529,14 +529,12 @@ public class TestZooKeeper {
cluster.startRegionServer();
cluster.waitForActiveAndReadyMaster(1);
HMaster m = cluster.getMaster();
-ZooKeeperWatcher zkw = m.getZooKeeper();
-int expectedNumOfListeners = zkw.getNumberOfListeners();
+final ZooKeeperWatcher zkw = m.getZooKeeper();
// now the cluster is up. So assign some regions.
-Admin admin = TEST_UTIL.getHBaseAdmin();
-try {
+try (Admin admin = TEST_UTIL.getHBaseAdmin()) {
byte[][] SPLIT_KEYS = new byte[][] { Bytes.toBytes(a),
Bytes.toBytes(b),
-Bytes.toBytes(c), Bytes.toBytes(d), Bytes.toBytes(e),
Bytes.toBytes(f),
-Bytes.toBytes(g), Bytes.toBytes(h), Bytes.toBytes(i),
Bytes.toBytes(j) };
+ Bytes.toBytes(c), Bytes.toBytes(d), Bytes.toBytes(e),
Bytes.toBytes(f),
+ Bytes.toBytes(g), Bytes.toBytes(h), Bytes.toBytes(i),
Bytes.toBytes(j) };
String tableName =
testRegionAssignmentAfterMasterRecoveryDueToZKExpiry;
HTableDescriptor htd = new
HTableDescriptor(TableName.valueOf(tableName));
htd.addFamily(new HColumnDescriptor(HConstants.CATALOG_FAMILY));
@@ -544,8 +542,9 @@ public class TestZooKeeper {
TEST_UTIL.waitUntilNoRegionsInTransition(6);
m.getZooKeeper().close();
MockLoadBalancer.retainAssignCalled = false;
+ final int expectedNumOfListeners = countPermanentListeners(zkw);
m.abort(Test recovery from zk session expired,
-new KeeperException.SessionExpiredException());
+ new KeeperException.SessionExpiredException());
assertTrue(m.isStopped()); // Master doesn't recover any more
// The recovered master should not call retainAssignment, as it is not a
// clean startup.
@@ -553,10 +552,37 @@ public class TestZooKeeper {
// number of listeners should be same as the value before master aborted
// wait for new master is initialized
cluster.waitForActiveAndReadyMaster(12);
- assertEquals(expectedNumOfListeners, zkw.getNumberOfListeners());
-} finally {
- admin.close();
+ final HMaster newMaster = cluster.getMasterThread().getMaster();
+ assertEquals(expectedNumOfListeners,
countPermanentListeners(newMaster.getZooKeeper()));
+}
+ }
+
+ /**
+ * Count listeners in zkw excluding listeners, that belongs to workers or
other
+ *
[44/44] hbase git commit: HBASE-13281 'hbase.bucketcache.size' description in hbase book is not correct (Ram)
HBASE-13281 'hbase.bucketcache.size' description in hbase book is not correct (Ram) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/65d37818 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/65d37818 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/65d37818 Branch: refs/heads/hbase-12439 Commit: 65d3781897baf05ef583fce3b5e8e08cd6228f35 Parents: 845f5de Author: Ramkrishna ramkrishna.s.vasude...@intel.com Authored: Mon Mar 23 22:40:18 2015 +0530 Committer: Ramkrishna ramkrishna.s.vasude...@intel.com Committed: Mon Mar 23 22:40:18 2015 +0530 -- src/main/asciidoc/_chapters/hbase-default.adoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/65d37818/src/main/asciidoc/_chapters/hbase-default.adoc -- diff --git a/src/main/asciidoc/_chapters/hbase-default.adoc b/src/main/asciidoc/_chapters/hbase-default.adoc index 23b96d5..bf56dd3 100644 --- a/src/main/asciidoc/_chapters/hbase-default.adoc +++ b/src/main/asciidoc/_chapters/hbase-default.adoc @@ -1284,11 +1284,11 @@ Whether or not the bucketcache is used in league with the LRU *`hbase.bucketcache.size`*:: + .Description -The size of the buckets for the bucketcache if you only use a single size. - Defaults to the default blocksize, which is 64 * 1024. +Used along with bucket cache, this is a float that EITHER represents a percentage of total heap + memory size to give to the cache (if 1.0) OR, it is the capacity in megabytes of the cache. + .Default -`65536` +`0` when specified as a float [[hbase.bucketcache.sizes]]
[42/44] hbase git commit: HBASE-13308 Fix flaky TestEndToEndSplitTransaction
HBASE-13308 Fix flaky TestEndToEndSplitTransaction
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a9b73b60
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a9b73b60
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a9b73b60
Branch: refs/heads/hbase-12439
Commit: a9b73b600e551749358a61bab27588e9074132d9
Parents: 8dfed5d
Author: zhangduo zhang...@wandoujia.com
Authored: Sat Mar 21 18:15:23 2015 +0800
Committer: zhangduo zhang...@wandoujia.com
Committed: Sat Mar 21 20:43:53 2015 +0800
--
.../TestEndToEndSplitTransaction.java | 206 +--
1 file changed, 95 insertions(+), 111 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/a9b73b60/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java
--
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java
index 30a0e88..523aadc 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java
@@ -25,10 +25,9 @@ import static org.junit.Assert.assertTrue;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
-import java.util.NavigableMap;
import java.util.Random;
import java.util.Set;
+import java.util.TreeSet;
import org.apache.commons.io.IOUtils;
import org.apache.commons.logging.Log;
@@ -38,17 +37,16 @@ import org.apache.hadoop.hbase.ChoreService;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HRegionInfo;
+import org.apache.hadoop.hbase.HRegionLocation;
import org.apache.hadoop.hbase.MetaTableAccessor;
import org.apache.hadoop.hbase.NotServingRegionException;
import org.apache.hadoop.hbase.ScheduledChore;
-import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.Stoppable;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.Connection;
import org.apache.hadoop.hbase.client.ConnectionFactory;
import org.apache.hadoop.hbase.client.Get;
-import org.apache.hadoop.hbase.client.HConnection;
import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.Result;
@@ -60,7 +58,6 @@ import org.apache.hadoop.hbase.protobuf.RequestConverter;
import org.apache.hadoop.hbase.protobuf.generated.ClientProtos;
import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanRequest;
import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos;
-import org.apache.hadoop.hbase.testclassification.FlakeyTests;
import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.Pair;
@@ -76,12 +73,11 @@ import com.google.common.collect.Iterators;
import com.google.common.collect.Sets;
import com.google.protobuf.ServiceException;
-@Category({FlakeyTests.class, LargeTests.class})
-@SuppressWarnings(deprecation)
+@Category(LargeTests.class)
public class TestEndToEndSplitTransaction {
private static final Log LOG =
LogFactory.getLog(TestEndToEndSplitTransaction.class);
private static final HBaseTestingUtility TEST_UTIL = new
HBaseTestingUtility();
- private static final Configuration conf = TEST_UTIL.getConfiguration();
+ private static final Configuration CONF = TEST_UTIL.getConfiguration();
@BeforeClass
public static void beforeAllTests() throws Exception {
@@ -96,70 +92,70 @@ public class TestEndToEndSplitTransaction {
@Test
public void testMasterOpsWhileSplitting() throws Exception {
-TableName tableName =
-TableName.valueOf(TestSplit);
+TableName tableName = TableName.valueOf(TestSplit);
byte[] familyName = Bytes.toBytes(fam);
try (HTable ht = TEST_UTIL.createTable(tableName, familyName)) {
TEST_UTIL.loadTable(ht, familyName, false);
}
HRegionServer server = TEST_UTIL.getHBaseCluster().getRegionServer(0);
-byte []firstRow = Bytes.toBytes(aaa);
-byte []splitRow = Bytes.toBytes(lll);
-byte []lastRow = Bytes.toBytes(zzz);
-HConnection con = (HConnection)
ConnectionFactory.createConnection(TEST_UTIL.getConfiguration());
-// this will also cache the region
-byte[] regionName = con.locateRegion(tableName, splitRow).getRegionInfo()
-.getRegionName();
-HRegion region = server.getRegion(regionName);
-SplitTransaction
[26/44] hbase git commit: HBASE-13216 Add version info in RPC connection header (Shaohui Liu)
HBASE-13216 Add version info in RPC connection header (Shaohui Liu)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/602e11cc
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/602e11cc
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/602e11cc
Branch: refs/heads/hbase-12439
Commit: 602e11cc74b5a0442a754d96bbbcd17fdd171931
Parents: 6709fee
Author: Liu Shaohui liushao...@xiaomi.com
Authored: Thu Mar 19 10:30:55 2015 +0800
Committer: Liu Shaohui liushao...@xiaomi.com
Committed: Thu Mar 19 10:30:55 2015 +0800
--
.../hadoop/hbase/ipc/AsyncRpcChannel.java |2 +
.../apache/hadoop/hbase/ipc/RpcClientImpl.java |2 +
.../hadoop/hbase/protobuf/ProtobufUtil.java | 17 +
.../hbase/protobuf/generated/RPCProtos.java | 1664 +-
hbase-protocol/src/main/protobuf/RPC.proto | 11 +
.../org/apache/hadoop/hbase/ipc/RpcServer.java | 10 +-
6 files changed, 1682 insertions(+), 24 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/602e11cc/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java
--
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java
index 3fb547b..32537fa 100644
---
a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java
+++
b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java
@@ -50,6 +50,7 @@ import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.classification.InterfaceAudience;
import org.apache.hadoop.hbase.exceptions.ConnectionClosingException;
+import org.apache.hadoop.hbase.protobuf.ProtobufUtil;
import org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos;
import org.apache.hadoop.hbase.protobuf.generated.RPCProtos;
import org.apache.hadoop.hbase.protobuf.generated.TracingProtos;
@@ -379,6 +380,7 @@ public class AsyncRpcChannel {
headerBuilder.setCellBlockCompressorClass(client.compressor.getClass().getCanonicalName());
}
+headerBuilder.setVersionInfo(ProtobufUtil.getVersionInfo());
RPCProtos.ConnectionHeader header = headerBuilder.build();
http://git-wip-us.apache.org/repos/asf/hbase/blob/602e11cc/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java
--
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java
index 7492474..c3bcaf9 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java
@@ -31,6 +31,7 @@ import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.classification.InterfaceAudience;
import org.apache.hadoop.hbase.codec.Codec;
import org.apache.hadoop.hbase.exceptions.ConnectionClosingException;
+import org.apache.hadoop.hbase.protobuf.ProtobufUtil;
import org.apache.hadoop.hbase.protobuf.generated.AuthenticationProtos;
import org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta;
import org.apache.hadoop.hbase.protobuf.generated.RPCProtos.ConnectionHeader;
@@ -357,6 +358,7 @@ public class RpcClientImpl extends AbstractRpcClient {
if (this.compressor != null) {
builder.setCellBlockCompressorClass(this.compressor.getClass().getCanonicalName());
}
+ builder.setVersionInfo(ProtobufUtil.getVersionInfo());
this.header = builder.build();
this.setName(IPC Client ( + socketFactory.hashCode() +) connection to
+
http://git-wip-us.apache.org/repos/asf/hbase/blob/602e11cc/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
--
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
index bad3cb4..8e027de 100644
---
a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
+++
b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
@@ -117,6 +117,7 @@ import
org.apache.hadoop.hbase.protobuf.generated.MasterProtos.CreateTableReques
import
org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableDescriptorsResponse;
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.MasterService;
import org.apache.hadoop.hbase.protobuf.generated.QuotaProtos;
+import org.apache.hadoop.hbase.protobuf.generated.RPCProtos;
[14/44] hbase git commit: HBASE-12908 Typos in MemstoreFlusher javadocs (Edvin Malinovskis)
HBASE-12908 Typos in MemstoreFlusher javadocs (Edvin Malinovskis)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/65ad19dd
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/65ad19dd
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/65ad19dd
Branch: refs/heads/hbase-12439
Commit: 65ad19ddf7848dcc811b7968fb31fe6fc05885d8
Parents: bf9e32d
Author: Jonathan M Hsieh jmhs...@apache.org
Authored: Tue Mar 17 00:36:00 2015 -0700
Committer: Jonathan M Hsieh jmhs...@apache.org
Committed: Tue Mar 17 00:36:00 2015 -0700
--
.../org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/65ad19dd/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
index 6e8bbf2..8bee002 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
@@ -431,7 +431,7 @@ class MemStoreFlusher implements FlushRequester {
* on delay queue to retry later.
* @param fqe
* @return true if the region was successfully flushed, false otherwise. If
- * false, there will be accompanying log messages explaining why the log was
+ * false, there will be accompanying log messages explaining why the region
was
* not flushed.
*/
private boolean flushRegion(final FlushRegionEntry fqe) {
@@ -482,7 +482,7 @@ class MemStoreFlusher implements FlushRequester {
* poll on the flush queue (which removed it).
* @param forceFlushAllStores whether we want to flush all store.
* @return true if the region was successfully flushed, false otherwise. If
- * false, there will be accompanying log messages explaining why the log was
+ * false, there will be accompanying log messages explaining why the region
was
* not flushed.
*/
private boolean flushRegion(final HRegion region, final boolean
emergencyFlush,
[09/44] hbase git commit: HBASE-12586 Task 6 7 from HBASE-9117, delete all public HTable constructors and delete ConnectionManager#{delete, get}Connection (Mikhail Antonov)
HBASE-12586 Task 6 7 from HBASE-9117, delete all public HTable constructors
and delete ConnectionManager#{delete,get}Connection (Mikhail Antonov)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c5aca191
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c5aca191
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c5aca191
Branch: refs/heads/hbase-12439
Commit: c5aca1919d774d2145005b748b3430a4b569922c
Parents: 76ba530
Author: stack st...@apache.org
Authored: Mon Mar 16 11:20:14 2015 -0700
Committer: stack st...@apache.org
Committed: Mon Mar 16 11:20:14 2015 -0700
--
.../hadoop/hbase/CoprocessorEnvironment.java| 6 +-
.../apache/hadoop/hbase/MetaTableAccessor.java | 4 +-
.../hadoop/hbase/client/ConnectionManager.java | 4 +-
.../org/apache/hadoop/hbase/client/HTable.java | 136 +--
.../hadoop/hbase/client/HTableFactory.java | 51 ---
.../hbase/client/HTableInterfaceFactory.java| 54
.../hadoop/hbase/client/HTableWrapper.java | 57 +---
.../hbase/coprocessor/CoprocessorHost.java | 12 +-
.../hbase/mapred/TableInputFormatBase.java | 11 +-
.../hadoop/hbase/util/ConnectionCache.java | 4 +-
.../hadoop/hbase/HBaseTestingUtility.java | 4 +-
.../hbase/client/HConnectionTestingUtility.java | 4 +-
.../org/apache/hadoop/hbase/client/TestHCM.java | 4 +-
.../hbase/coprocessor/TestHTableWrapper.java| 34 +
.../hbase/mapred/TestTableInputFormat.java | 6 +-
.../hbase/mapreduce/TestTableInputFormat.java | 6 +-
.../TestSplitTransactionOnCluster.java | 5 +-
.../replication/TestMasterReplication.java | 4 +-
.../ExpAsStringVisibilityLabelServiceImpl.java | 6 +-
.../apache/hadoop/hbase/util/TestHBaseFsck.java | 2 +-
20 files changed, 59 insertions(+), 355 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/c5aca191/hbase-client/src/main/java/org/apache/hadoop/hbase/CoprocessorEnvironment.java
--
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/CoprocessorEnvironment.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/CoprocessorEnvironment.java
index 37f1a33..362439a 100644
---
a/hbase-client/src/main/java/org/apache/hadoop/hbase/CoprocessorEnvironment.java
+++
b/hbase-client/src/main/java/org/apache/hadoop/hbase/CoprocessorEnvironment.java
@@ -20,7 +20,7 @@ import java.util.concurrent.ExecutorService;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.classification.InterfaceAudience;
-import org.apache.hadoop.hbase.client.HTableInterface;
+import org.apache.hadoop.hbase.client.Table;
/**
* Coprocessor environment state.
@@ -50,14 +50,14 @@ public interface CoprocessorEnvironment {
* @return an interface for accessing the given table
* @throws IOException
*/
- HTableInterface getTable(TableName tableName) throws IOException;
+ Table getTable(TableName tableName) throws IOException;
/**
* @return an interface for accessing the given table using the passed
executor to run batch
* operations
* @throws IOException
*/
- HTableInterface getTable(TableName tableName, ExecutorService service)
throws IOException;
+ Table getTable(TableName tableName, ExecutorService service) throws
IOException;
/**
* @return the classloader for the loaded coprocessor instance
http://git-wip-us.apache.org/repos/asf/hbase/blob/c5aca191/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 15d325d..4df58a2 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
@@ -46,8 +46,8 @@ import org.apache.hadoop.hbase.client.ConnectionFactory;
import org.apache.hadoop.hbase.client.Consistency;
import org.apache.hadoop.hbase.client.Delete;
import org.apache.hadoop.hbase.client.Get;
-import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.client.Mutation;
+import org.apache.hadoop.hbase.client.NeedUnmanagedConnectionException;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.RegionLocator;
import org.apache.hadoop.hbase.client.RegionReplicaUtil;
@@ -263,7 +263,7 @@ public class MetaTableAccessor {
// There should still be a way to use this method with an unmanaged
connection.
if (connection instanceof ClusterConnection) {
if (((ClusterConnection)
[17/44] hbase git commit: HBASE-13258 addendum add log and reduce testCount in TestHRegion.testWritesWhileGetting
HBASE-13258 addendum add log and reduce testCount in
TestHRegion.testWritesWhileGetting
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/7b7b0bf9
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7b7b0bf9
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7b7b0bf9
Branch: refs/heads/hbase-12439
Commit: 7b7b0bf9dd08950b314ea60cd2b2d24deff8cd15
Parents: 2b08653
Author: zhangduo zhang...@wandoujia.com
Authored: Tue Mar 17 21:43:37 2015 +0800
Committer: zhangduo zhang...@wandoujia.com
Committed: Tue Mar 17 21:43:37 2015 +0800
--
.../java/org/apache/hadoop/hbase/regionserver/TestHRegion.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/7b7b0bf9/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 cf77f42..ca5135d 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
@@ -3837,7 +3837,7 @@ public class TestHRegion {
*/
@Test
public void testWritesWhileGetting() throws Exception {
-int testCount = 100;
+int testCount = 50;
int numRows = 1;
int numFamilies = 10;
int numQualifiers = 100;
@@ -3896,7 +3896,7 @@ public class TestHRegion {
long prevTimestamp = 0L;
for (int i = 0; i testCount; i++) {
-
+LOG.info(testWritesWhileGetting verify turn + i);
boolean previousEmpty = result == null || result.isEmpty();
result = region.get(get);
if (!result.isEmpty() || !previousEmpty || i compactInterval) {
[39/44] hbase git commit: HBASE-13199 ADDENDUM Some small improvements on canary tool (Shaohui Liu)
HBASE-13199 ADDENDUM Some small improvements on canary tool (Shaohui Liu)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f4eb7191
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f4eb7191
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f4eb7191
Branch: refs/heads/hbase-12439
Commit: f4eb7191be66ada04c94cd555acbfe34efc350c1
Parents: 6d44603
Author: Liu Shaohui liushao...@xiaomi.com
Authored: Fri Mar 20 15:22:14 2015 -0500
Committer: Sean Busbey bus...@cloudera.com
Committed: Fri Mar 20 15:22:14 2015 -0500
--
.../java/org/apache/hadoop/hbase/tool/Canary.java| 15 ++-
1 file changed, 6 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/f4eb7191/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java
index 8efb73d..c8f0a72 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java
@@ -153,14 +153,13 @@ public final class Canary implements Tool {
} catch (IOException e) {
LOG.debug(sniffRegion failed, e);
sink.publishReadFailure(region, e);
-return null;
- } finally {
if (table != null) {
try {
table.close();
- } catch (IOException e) {
+ } catch (IOException ioe) {
}
}
+return null;
}
byte[] startKey = null;
@@ -204,17 +203,15 @@ public final class Canary implements Tool {
if (rs != null) {
rs.close();
}
- if (table != null) {
-try {
- table.close();
-} catch (IOException e) {
-}
- }
scan = null;
get = null;
startKey = null;
}
}
+ try {
+table.close();
+ } catch (IOException e) {
+ }
return null;
}
}
[37/44] hbase git commit: HBASE-13274 Fix misplaced deprecation in Delete#addXYZ (Mikhail Antonov)
HBASE-13274 Fix misplaced deprecation in Delete#addXYZ (Mikhail Antonov)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/34347a36
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/34347a36
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/34347a36
Branch: refs/heads/hbase-12439
Commit: 34347a36399de5496119a692379de46551b07103
Parents: f57dca5
Author: stack st...@apache.org
Authored: Fri Mar 20 09:43:56 2015 -0700
Committer: stack st...@apache.org
Committed: Fri Mar 20 09:43:56 2015 -0700
--
.../src/main/java/org/apache/hadoop/hbase/client/Delete.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/34347a36/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java
--
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java
index d947ef8..86c2462 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Delete.java
@@ -253,7 +253,9 @@ public class Delete extends Mutation implements
ComparableRow {
* @param family family name
* @param timestamp version timestamp
* @return this for invocation chaining
+ * @deprecated Since hbase-1.0.0. Use {@link #addFamilyVersion(byte[], long)}
*/
+ @Deprecated
public Delete deleteFamilyVersion(byte [] family, long timestamp) {
return addFamilyVersion(family, timestamp);
}
@@ -264,9 +266,7 @@ public class Delete extends Mutation implements
ComparableRow {
* @param family family name
* @param timestamp version timestamp
* @return this for invocation chaining
- * @deprecated Since hbase-1.0.0. Use {@link #addFamilyVersion(byte[], long)}
*/
- @Deprecated
public Delete addFamilyVersion(final byte [] family, final long timestamp) {
ListCell list = familyMap.get(family);
if(list == null) {
[11/44] hbase git commit: HBASE-13240 Add an exemption to test-patch for build only changes.
HBASE-13240 Add an exemption to test-patch for build only changes.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/dc03942e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/dc03942e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/dc03942e
Branch: refs/heads/hbase-12439
Commit: dc03942ed1f2839332782995fdae5032e67fe1e7
Parents: a75a2ac
Author: Sean Busbey bus...@apache.org
Authored: Mon Mar 16 02:27:38 2015 -0500
Committer: Sean Busbey bus...@cloudera.com
Committed: Mon Mar 16 15:45:21 2015 -0500
--
dev-support/test-patch.sh | 10 ++
1 file changed, 10 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/dc03942e/dev-support/test-patch.sh
--
diff --git a/dev-support/test-patch.sh b/dev-support/test-patch.sh
index 31aa27e..86f7685 100755
--- a/dev-support/test-patch.sh
+++ b/dev-support/test-patch.sh
@@ -361,6 +361,16 @@ checkTests () {
return 0
fi
fi
+srcReferences=`${GREP} diff --git ${PATCH_DIR}/patch | ${GREP}
src/main | \
+${GREP} -v src/main/asciidoc | ${GREP} -v src/main/site -c`
+if [[ $srcReferences == 0 ]] ; then
+ echo The patch doesn't appear to alter any code that requires tests.
+ JIRA_COMMENT=$JIRA_COMMENT
+
+{color:green}+0 tests included{color}. The patch appears to be a
documentation, build,
+or dev-support patch that doesn't require tests.
+ return 0
+fi
JIRA_COMMENT=$JIRA_COMMENT
{color:red}-1 tests included{color}. The patch doesn't appear to include
any new or modified tests.
[33/44] hbase git commit: Revert HBASE-12976 Set default value for hbase.client.scanner.max.result.size.
Revert HBASE-12976 Set default value for hbase.client.scanner.max.result.size.
This reverts commit 2583e8de574ae4b002c5dbc80b0da666b42dd699.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/64589abe
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/64589abe
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/64589abe
Branch: refs/heads/hbase-12439
Commit: 64589abe9936337fcbccdbe82e538d05020c8ee4
Parents: b728e66
Author: Lars Hofhansl la...@apache.org
Authored: Thu Mar 19 14:19:41 2015 -0700
Committer: Lars Hofhansl la...@apache.org
Committed: Thu Mar 19 14:19:41 2015 -0700
--
.../src/main/java/org/apache/hadoop/hbase/HConstants.java | 4 ++--
hbase-common/src/main/resources/hbase-default.xml | 10 --
2 files changed, 2 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/64589abe/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 19e251a..7d93904 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
@@ -624,9 +624,9 @@ public final class HConstants {
* Note that when a single row is larger than this limit the row is still
* returned completely.
*
- * The default value is 2MB.
+ * The default value is unlimited.
*/
- public static final long DEFAULT_HBASE_CLIENT_SCANNER_MAX_RESULT_SIZE = 2 *
1024 * 1024;
+ public static final long DEFAULT_HBASE_CLIENT_SCANNER_MAX_RESULT_SIZE =
Long.MAX_VALUE;
/**
* Parameter name for client pause value, used mostly as value to wait
http://git-wip-us.apache.org/repos/asf/hbase/blob/64589abe/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 a3092b5..69017f6 100644
--- a/hbase-common/src/main/resources/hbase-default.xml
+++ b/hbase-common/src/main/resources/hbase-default.xml
@@ -1290,16 +1290,6 @@ possible configurations would overwhelm and obscure the
important.
/property
property
-namehbase.client.scanner.max.result.size/name
-value2097152/value
-descriptionMaximum number of bytes returned when calling a scanner's
next method.
-Note that when a single row is larger than this limit the row is still
returned completely.
-The default value is 2MB, which is good for 1ge networks.
-With faster and/or high latency networks this value should be increased.
-/description
- /property
-
- property
namehbase.status.published/name
valuefalse/value
description
[05/44] hbase git commit: HBASE-13239 HBase grant at specific column level does not work for Groups
HBASE-13239 HBase grant at specific column level does not work for Groups
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/01bc979e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/01bc979e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/01bc979e
Branch: refs/heads/hbase-12439
Commit: 01bc979ea29e9282786de13c1cb8cbc107e92e9f
Parents: df23834
Author: tedyu yuzhih...@gmail.com
Authored: Sat Mar 14 20:21:37 2015 -0700
Committer: tedyu yuzhih...@gmail.com
Committed: Sat Mar 14 20:21:37 2015 -0700
--
.../hbase/security/access/TableAuthManager.java | 24 +++-
1 file changed, 18 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/01bc979e/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/TableAuthManager.java
--
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/TableAuthManager.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/TableAuthManager.java
index 6ca40e6..e73b23c 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/TableAuthManager.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/TableAuthManager.java
@@ -295,7 +295,7 @@ public class TableAuthManager {
}
}
} else if (LOG.isDebugEnabled()) {
- LOG.debug(No permissions found);
+ LOG.debug(No permissions found for + action);
}
return false;
@@ -488,20 +488,26 @@ public class TableAuthManager {
* permissions.
*/
public boolean authorizeGroup(String groupName, Permission.Action action) {
-return authorize(globalCache.getGroup(groupName), action);
+ListPermission perms = globalCache.getGroup(groupName);
+if (LOG.isDebugEnabled()) {
+ LOG.debug(authorizing + (perms != null !perms.isEmpty() ?
perms.get(0) : ) +
+ for + action);
+}
+return authorize(perms, action);
}
/**
- * Checks authorization to a given table and column family for a group, based
+ * Checks authorization to a given table, column family and column for a
group, based
* on the stored permissions.
* @param groupName
* @param table
* @param family
+ * @param qualifier
* @param action
* @return true if known and authorized, false otherwise
*/
public boolean authorizeGroup(String groupName, TableName table, byte[]
family,
- Permission.Action action) {
+ byte[] qualifier, Permission.Action action) {
// Global authorization supercedes table level
if (authorizeGroup(groupName, action)) {
return true;
@@ -513,7 +519,13 @@ public class TableAuthManager {
return true;
}
// Check table level
-return authorize(getTablePermissions(table).getGroup(groupName), table,
family, action);
+ListTablePermission tblPerms =
getTablePermissions(table).getGroup(groupName);
+if (LOG.isDebugEnabled()) {
+ LOG.debug(authorizing + (tblPerms != null !tblPerms.isEmpty() ?
tblPerms.get(0) : ) +
+ for +groupName + on + table + . + Bytes.toString(family) +
. +
+Bytes.toString(qualifier) + with + action);
+}
+return authorize(tblPerms, table, family, qualifier, action);
}
/**
@@ -548,7 +560,7 @@ public class TableAuthManager {
String[] groups = user.getGroupNames();
if (groups != null) {
for (String group : groups) {
-if (authorizeGroup(group, table, family, action)) {
+if (authorizeGroup(group, table, family, qualifier, action)) {
return true;
}
}
[22/44] hbase git commit: Revert Specify bash for local-regionservers.sh and local-master-backup.sh
Revert Specify bash for local-regionservers.sh and local-master-backup.sh This reverts commit ca8876a9f2534f2ab0b416aecb4ac476da9747f8. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d9d1b07c Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d9d1b07c Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d9d1b07c Branch: refs/heads/hbase-12439 Commit: d9d1b07cfc11227786b4970f32e91226c890fb16 Parents: ca8876a Author: Sean Busbey bus...@apache.org Authored: Tue Mar 17 11:57:08 2015 -0500 Committer: Sean Busbey bus...@apache.org Committed: Tue Mar 17 11:57:08 2015 -0500 -- bin/local-master-backup.sh | 2 +- bin/local-regionservers.sh | 2 +- src/main/asciidoc/_chapters/configuration.adoc | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/d9d1b07c/bin/local-master-backup.sh -- diff --git a/bin/local-master-backup.sh b/bin/local-master-backup.sh index e1a80cd..f368e4a 100755 --- a/bin/local-master-backup.sh +++ b/bin/local-master-backup.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh #/** # * Copyright 2007 The Apache Software Foundation # * http://git-wip-us.apache.org/repos/asf/hbase/blob/d9d1b07c/bin/local-regionservers.sh -- diff --git a/bin/local-regionservers.sh b/bin/local-regionservers.sh index f744ee1..38d9ffc 100755 --- a/bin/local-regionservers.sh +++ b/bin/local-regionservers.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh #/** # * Copyright 2007 The Apache Software Foundation # * http://git-wip-us.apache.org/repos/asf/hbase/blob/d9d1b07c/src/main/asciidoc/_chapters/configuration.adoc -- diff --git a/src/main/asciidoc/_chapters/configuration.adoc b/src/main/asciidoc/_chapters/configuration.adoc index ed00a49..a5430eb 100644 --- a/src/main/asciidoc/_chapters/configuration.adoc +++ b/src/main/asciidoc/_chapters/configuration.adoc @@ -172,9 +172,6 @@ session required pam_limits.so -Linux Shell:: - All of the shell scripts that come with HBase rely on the link:http://www.gnu.org/software/bash[GNU Bash] shell. - Windows:: Prior to HBase 0.96, testing for running HBase on Microsoft Windows was limited. Running a on Windows nodes is not recommended for production systems.
[04/44] hbase git commit: HBASE-13242 TestPerColumnFamilyFlush.testFlushingWhenLogRolling hung
HBASE-13242 TestPerColumnFamilyFlush.testFlushingWhenLogRolling hung
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/df238346
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/df238346
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/df238346
Branch: refs/heads/hbase-12439
Commit: df238346d237b14053282d154c679a17f1220bb2
Parents: 72855c5
Author: zhangduo zhang...@wandoujia.com
Authored: Sun Mar 15 08:00:19 2015 +0800
Committer: zhangduo zhang...@wandoujia.com
Committed: Sun Mar 15 08:01:05 2015 +0800
--
.../regionserver/TestPerColumnFamilyFlush.java | 122 +++
1 file changed, 74 insertions(+), 48 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/df238346/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPerColumnFamilyFlush.java
--
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPerColumnFamilyFlush.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPerColumnFamilyFlush.java
index 4a9b38a..c131aa6 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPerColumnFamilyFlush.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPerColumnFamilyFlush.java
@@ -19,6 +19,7 @@ package org.apache.hadoop.hbase.regionserver;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import java.io.IOException;
@@ -39,6 +40,7 @@ import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.MiniHBaseCluster;
import org.apache.hadoop.hbase.NamespaceDescriptor;
import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.Waiter;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.Connection;
import org.apache.hadoop.hbase.client.ConnectionFactory;
@@ -49,10 +51,10 @@ import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.Table;
import org.apache.hadoop.hbase.regionserver.wal.FSHLog;
import org.apache.hadoop.hbase.testclassification.LargeTests;
+import org.apache.hadoop.hbase.testclassification.RegionServerTests;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.JVMClusterUtil;
import org.apache.hadoop.hbase.util.Pair;
-import org.apache.hadoop.hbase.util.Threads;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -61,7 +63,7 @@ import com.google.common.hash.Hashing;
/**
* This test verifies the correctness of the Per Column Family flushing
strategy
*/
-@Category(LargeTests.class)
+@Category({ RegionServerTests.class, LargeTests.class })
public class TestPerColumnFamilyFlush {
private static final Log LOG =
LogFactory.getLog(TestPerColumnFamilyFlush.class);
@@ -119,7 +121,7 @@ public class TestPerColumnFamilyFlush {
Arrays.equals(r.getFamilyMap(family).get(qf), val));
}
- @Test (timeout=18)
+ @Test(timeout = 18)
public void testSelectiveFlushWhenEnabled() throws IOException {
// Set up the configuration
Configuration conf = HBaseConfiguration.create();
@@ -258,7 +260,7 @@ public class TestPerColumnFamilyFlush {
HBaseTestingUtility.closeRegionAndWAL(region);
}
- @Test (timeout=18)
+ @Test(timeout = 18)
public void testSelectiveFlushWhenNotEnabled() throws IOException {
// Set up the configuration
Configuration conf = HBaseConfiguration.create();
@@ -337,7 +339,7 @@ public class TestPerColumnFamilyFlush {
try {
TEST_UTIL.startMiniCluster(numRegionServers);
TEST_UTIL.getHBaseAdmin().createNamespace(
-
NamespaceDescriptor.create(TABLENAME.getNamespaceAsString()).build());
+NamespaceDescriptor.create(TABLENAME.getNamespaceAsString()).build());
HTable table = TEST_UTIL.createTable(TABLENAME, FAMILIES);
HTableDescriptor htd = table.getTableDescriptor();
@@ -414,46 +416,50 @@ public class TestPerColumnFamilyFlush {
// In distributed log replay, the log splitters ask the master for the
// last flushed sequence id for a region. This test would ensure that we
// are doing the book-keeping correctly.
- @Test (timeout=18)
+ @Test(timeout = 18)
public void testLogReplayWithDistributedReplay() throws Exception {
TEST_UTIL.getConfiguration().setBoolean(HConstants.DISTRIBUTED_LOG_REPLAY_KEY,
true);
doTestLogReplay();
}
// Test Log Replay with Distributed log split on.
- @Test (timeout=18)
+ @Test(timeout = 18)
public void testLogReplayWithDistributedLogSplit() throws Exception {
[18/44] hbase git commit: HBASE-13256 HBaseConfiguration#checkDefaultsVersion(Configuration) has spelling error (Josh Elser)
HBASE-13256 HBaseConfiguration#checkDefaultsVersion(Configuration) has spelling
error (Josh Elser)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/75b627c8
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/75b627c8
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/75b627c8
Branch: refs/heads/hbase-12439
Commit: 75b627c8ecf17dcb09c96ba9580239f7c8b6c555
Parents: 7b7b0bf
Author: tedyu yuzhih...@gmail.com
Authored: Tue Mar 17 07:24:01 2015 -0700
Committer: tedyu yuzhih...@gmail.com
Committed: Tue Mar 17 07:24:01 2015 -0700
--
.../src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/75b627c8/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
--
diff --git
a/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
b/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
index 3446581..1be66a1 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
@@ -71,7 +71,7 @@ public class HBaseConfiguration extends Configuration {
String thisVersion = VersionInfo.getVersion();
if (!thisVersion.equals(defaultsVersion)) {
throw new RuntimeException(
-hbase-default.xml file seems to be for and old version of HBase ( +
+hbase-default.xml file seems to be for an older version of HBase ( +
defaultsVersion + ), this version is + thisVersion);
}
}
hbase git commit: HBASE-13281 'hbase.bucketcache.size' description in hbase book is not correct (Ram)
Repository: hbase Updated Branches: refs/heads/master 845f5de12 - 65d378189 HBASE-13281 'hbase.bucketcache.size' description in hbase book is not correct (Ram) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/65d37818 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/65d37818 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/65d37818 Branch: refs/heads/master Commit: 65d3781897baf05ef583fce3b5e8e08cd6228f35 Parents: 845f5de Author: Ramkrishna ramkrishna.s.vasude...@intel.com Authored: Mon Mar 23 22:40:18 2015 +0530 Committer: Ramkrishna ramkrishna.s.vasude...@intel.com Committed: Mon Mar 23 22:40:18 2015 +0530 -- src/main/asciidoc/_chapters/hbase-default.adoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/65d37818/src/main/asciidoc/_chapters/hbase-default.adoc -- diff --git a/src/main/asciidoc/_chapters/hbase-default.adoc b/src/main/asciidoc/_chapters/hbase-default.adoc index 23b96d5..bf56dd3 100644 --- a/src/main/asciidoc/_chapters/hbase-default.adoc +++ b/src/main/asciidoc/_chapters/hbase-default.adoc @@ -1284,11 +1284,11 @@ Whether or not the bucketcache is used in league with the LRU *`hbase.bucketcache.size`*:: + .Description -The size of the buckets for the bucketcache if you only use a single size. - Defaults to the default blocksize, which is 64 * 1024. +Used along with bucket cache, this is a float that EITHER represents a percentage of total heap + memory size to give to the cache (if 1.0) OR, it is the capacity in megabytes of the cache. + .Default -`65536` +`0` when specified as a float [[hbase.bucketcache.sizes]]
hbase git commit: HBASE-13310 Fix high priority findbugs warnings
Repository: hbase
Updated Branches:
refs/heads/master 1428a59ca - 6e9ded51f
HBASE-13310 Fix high priority findbugs warnings
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6e9ded51
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6e9ded51
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6e9ded51
Branch: refs/heads/master
Commit: 6e9ded51fb2fc4c3e63fb0da5030246f3466db71
Parents: 1428a59
Author: zhangduo zhang...@wandoujia.com
Authored: Sun Mar 22 20:41:43 2015 +0800
Committer: zhangduo zhang...@wandoujia.com
Committed: Tue Mar 24 06:50:04 2015 +0800
--
.../apache/hadoop/hbase/HColumnDescriptor.java | 26 +++---
.../apache/hadoop/hbase/util/PrettyPrinter.java | 2 +-
.../org/apache/hadoop/hbase/util/Threads.java | 92 ++--
.../apache/hadoop/hbase/rest/RESTServer.java| 6 +-
.../apache/hadoop/hbase/rest/RowResource.java | 4 +-
.../org/apache/hadoop/hbase/rest/RowSpec.java | 8 +-
.../hbase/rest/model/ColumnSchemaModel.java | 10 +--
.../hadoop/hbase/rest/model/ScannerModel.java | 2 +-
.../rest/model/StorageClusterStatusModel.java | 4 +-
.../hbase/rest/model/TableRegionModel.java | 2 +-
.../hbase/rest/model/TableSchemaModel.java | 16 ++--
.../hadoop/hbase/io/hfile/HFileBlock.java | 13 +++
.../hadoop/hbase/master/HMasterCommandLine.java | 8 +-
.../regionserver/RegionCoprocessorHost.java | 5 +-
.../hbase/security/access/TableAuthManager.java | 11 +--
.../org/apache/hadoop/hbase/util/HBaseFsck.java | 4 +-
.../hbase/util/hbck/OfflineMetaRepair.java | 2 +-
.../apache/hadoop/hbase/util/TestHBaseFsck.java | 16 ++--
.../hadoop/hbase/util/hbck/HbckTestingUtil.java | 2 +-
19 files changed, 141 insertions(+), 92 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/6e9ded51/hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java
--
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java
index 5335bef..d4d8ee4 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java
@@ -734,7 +734,7 @@ public class HColumnDescriptor implements
ComparableHColumnDescriptor {
String compressTagsStr = getValue(COMPRESS_TAGS);
boolean compressTags = DEFAULT_COMPRESS_TAGS;
if (compressTagsStr != null) {
- compressTags = Boolean.valueOf(compressTagsStr);
+ compressTags = Boolean.parseBoolean(compressTagsStr);
}
return compressTags;
}
@@ -747,7 +747,7 @@ public class HColumnDescriptor implements
ComparableHColumnDescriptor {
String compressTagsStr = getValue(COMPRESS_TAGS);
boolean compressTags = DEFAULT_COMPRESS_TAGS;
if (compressTagsStr != null) {
- compressTags = Boolean.valueOf(compressTagsStr);
+ compressTags = Boolean.parseBoolean(compressTagsStr);
}
return compressTags;
}
@@ -778,8 +778,9 @@ public class HColumnDescriptor implements
ComparableHColumnDescriptor {
*/
public boolean isInMemory() {
String value = getValue(HConstants.IN_MEMORY);
-if (value != null)
- return Boolean.valueOf(value).booleanValue();
+if (value != null) {
+ return Boolean.parseBoolean(value);
+}
return DEFAULT_IN_MEMORY;
}
@@ -827,7 +828,7 @@ public class HColumnDescriptor implements
ComparableHColumnDescriptor {
*/
public int getTimeToLive() {
String value = getValue(TTL);
-return (value != null)? Integer.valueOf(value).intValue(): DEFAULT_TTL;
+return (value != null)? Integer.parseInt(value) : DEFAULT_TTL;
}
/**
@@ -843,7 +844,7 @@ public class HColumnDescriptor implements
ComparableHColumnDescriptor {
*/
public int getMinVersions() {
String value = getValue(MIN_VERSIONS);
-return (value != null)? Integer.valueOf(value).intValue(): 0;
+return (value != null)? Integer.parseInt(value) : 0;
}
/**
@@ -861,8 +862,9 @@ public class HColumnDescriptor implements
ComparableHColumnDescriptor {
*/
public boolean isBlockCacheEnabled() {
String value = getValue(BLOCKCACHE);
-if (value != null)
- return Boolean.valueOf(value).booleanValue();
+if (value != null) {
+ return Boolean.parseBoolean(value);
+}
return DEFAULT_BLOCKCACHE;
}
@@ -900,7 +902,7 @@ public class HColumnDescriptor implements
ComparableHColumnDescriptor {
public int getScope() {
byte[] value = getValue(REPLICATION_SCOPE_BYTES);
if (value != null) {
- return Integer.valueOf(Bytes.toString(value));
+ return
hbase git commit: HBASE-13315 BufferedMutator should be @InterfaceAudience.Public (Solomon Duskis)
Repository: hbase
Updated Branches:
refs/heads/master 65d378189 - 1428a59ca
HBASE-13315 BufferedMutator should be @InterfaceAudience.Public (Solomon Duskis)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1428a59c
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1428a59c
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1428a59c
Branch: refs/heads/master
Commit: 1428a59caf422b43eb3e0d215d2c538c9ec8463f
Parents: 65d3781
Author: Nick Dimiduk ndimi...@apache.org
Authored: Mon Mar 23 12:16:29 2015 -0700
Committer: Nick Dimiduk ndimi...@apache.org
Committed: Mon Mar 23 12:16:29 2015 -0700
--
.../main/java/org/apache/hadoop/hbase/client/BufferedMutator.java | 2 +-
.../java/org/apache/hadoop/hbase/client/BufferedMutatorImpl.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/1428a59c/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutator.java
--
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutator.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutator.java
index 3b91078..8d3d33c 100644
---
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutator.java
+++
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutator.java
@@ -60,7 +60,7 @@ import java.util.List;
* @see Connection
* @since 1.0.0
*/
-@InterfaceAudience.Private
+@InterfaceAudience.Public
@InterfaceStability.Evolving
public interface BufferedMutator extends Closeable {
/**
http://git-wip-us.apache.org/repos/asf/hbase/blob/1428a59c/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutatorImpl.java
--
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutatorImpl.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutatorImpl.java
index 54e7ccd..249edec 100644
---
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutatorImpl.java
+++
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutatorImpl.java
@@ -42,7 +42,7 @@ import java.util.concurrent.TimeUnit;
* @since 1.0.0
*/
@InterfaceAudience.Private
-@InterfaceStability.Stable
+@InterfaceStability.Evolving
public class BufferedMutatorImpl implements BufferedMutator {
private static final Log LOG = LogFactory.getLog(BufferedMutatorImpl.class);
hbase git commit: HBASE-13315 BufferedMutator should be @InterfaceAudience.Public (Solomon Duskis)
Repository: hbase
Updated Branches:
refs/heads/branch-1.0 af72225f6 - 05e16ecca
HBASE-13315 BufferedMutator should be @InterfaceAudience.Public (Solomon Duskis)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/05e16ecc
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/05e16ecc
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/05e16ecc
Branch: refs/heads/branch-1.0
Commit: 05e16eccad6082c70ac4cc1dd3c689ec36112e7f
Parents: af72225
Author: Nick Dimiduk ndimi...@apache.org
Authored: Mon Mar 23 12:16:29 2015 -0700
Committer: Nick Dimiduk ndimi...@apache.org
Committed: Mon Mar 23 12:17:36 2015 -0700
--
.../main/java/org/apache/hadoop/hbase/client/BufferedMutator.java | 2 +-
.../java/org/apache/hadoop/hbase/client/BufferedMutatorImpl.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/05e16ecc/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutator.java
--
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutator.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutator.java
index 3b91078..8d3d33c 100644
---
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutator.java
+++
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutator.java
@@ -60,7 +60,7 @@ import java.util.List;
* @see Connection
* @since 1.0.0
*/
-@InterfaceAudience.Private
+@InterfaceAudience.Public
@InterfaceStability.Evolving
public interface BufferedMutator extends Closeable {
/**
http://git-wip-us.apache.org/repos/asf/hbase/blob/05e16ecc/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutatorImpl.java
--
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutatorImpl.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutatorImpl.java
index 54e7ccd..249edec 100644
---
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutatorImpl.java
+++
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutatorImpl.java
@@ -42,7 +42,7 @@ import java.util.concurrent.TimeUnit;
* @since 1.0.0
*/
@InterfaceAudience.Private
-@InterfaceStability.Stable
+@InterfaceStability.Evolving
public class BufferedMutatorImpl implements BufferedMutator {
private static final Log LOG = LogFactory.getLog(BufferedMutatorImpl.class);
hbase git commit: HBASE-13315 BufferedMutator should be @InterfaceAudience.Public (addendum)
Repository: hbase
Updated Branches:
refs/heads/master 6e9ded51f - 5459008cc
HBASE-13315 BufferedMutator should be @InterfaceAudience.Public (addendum)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5459008c
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5459008c
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5459008c
Branch: refs/heads/master
Commit: 5459008ccdc83f09e6d8d7ec90144dc120e1a084
Parents: 6e9ded5
Author: Nick Dimiduk ndimi...@apache.org
Authored: Mon Mar 23 16:30:25 2015 -0700
Committer: Nick Dimiduk ndimi...@apache.org
Committed: Mon Mar 23 16:38:32 2015 -0700
--
.../main/java/org/apache/hadoop/hbase/client/BufferedMutator.java | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/5459008c/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutator.java
--
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutator.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutator.java
index 8d3d33c..4424cec 100644
---
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutator.java
+++
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutator.java
@@ -122,6 +122,8 @@ public interface BufferedMutator extends Closeable {
/**
* Listens for asynchronous exceptions on a {@link BufferedMutator}.
*/
+ @InterfaceAudience.Public
+ @InterfaceStability.Evolving
interface ExceptionListener {
public void onException(RetriesExhaustedWithDetailsException exception,
BufferedMutator mutator) throws RetriesExhaustedWithDetailsException;
hbase git commit: HBASE-13315 BufferedMutator should be @InterfaceAudience.Public (addendum)
Repository: hbase
Updated Branches:
refs/heads/branch-1.0 05e16ecca - db31bc259
HBASE-13315 BufferedMutator should be @InterfaceAudience.Public (addendum)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/db31bc25
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/db31bc25
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/db31bc25
Branch: refs/heads/branch-1.0
Commit: db31bc259f9d3e42afbe45be8fcf6570ea06aba6
Parents: 05e16ec
Author: Nick Dimiduk ndimi...@apache.org
Authored: Mon Mar 23 16:30:25 2015 -0700
Committer: Nick Dimiduk ndimi...@apache.org
Committed: Mon Mar 23 16:35:54 2015 -0700
--
.../main/java/org/apache/hadoop/hbase/client/BufferedMutator.java | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/db31bc25/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutator.java
--
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutator.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutator.java
index 8d3d33c..4424cec 100644
---
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutator.java
+++
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutator.java
@@ -122,6 +122,8 @@ public interface BufferedMutator extends Closeable {
/**
* Listens for asynchronous exceptions on a {@link BufferedMutator}.
*/
+ @InterfaceAudience.Public
+ @InterfaceStability.Evolving
interface ExceptionListener {
public void onException(RetriesExhaustedWithDetailsException exception,
BufferedMutator mutator) throws RetriesExhaustedWithDetailsException;
hbase git commit: HBASE-13315 BufferedMutator should be @InterfaceAudience.Public (addendum)
Repository: hbase
Updated Branches:
refs/heads/branch-1 ebd407dbd - 7fad7d1a5
HBASE-13315 BufferedMutator should be @InterfaceAudience.Public (addendum)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/7fad7d1a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7fad7d1a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7fad7d1a
Branch: refs/heads/branch-1
Commit: 7fad7d1a5b756d3b393faee488082f828da3130a
Parents: ebd407d
Author: Nick Dimiduk ndimi...@apache.org
Authored: Mon Mar 23 16:30:25 2015 -0700
Committer: Nick Dimiduk ndimi...@apache.org
Committed: Mon Mar 23 16:35:46 2015 -0700
--
.../main/java/org/apache/hadoop/hbase/client/BufferedMutator.java | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/7fad7d1a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutator.java
--
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutator.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutator.java
index 8d3d33c..4424cec 100644
---
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutator.java
+++
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutator.java
@@ -122,6 +122,8 @@ public interface BufferedMutator extends Closeable {
/**
* Listens for asynchronous exceptions on a {@link BufferedMutator}.
*/
+ @InterfaceAudience.Public
+ @InterfaceStability.Evolving
interface ExceptionListener {
public void onException(RetriesExhaustedWithDetailsException exception,
BufferedMutator mutator) throws RetriesExhaustedWithDetailsException;
hbase git commit: HBASE-13315 BufferedMutator should be @InterfaceAudience.Public (Solomon Duskis)
Repository: hbase
Updated Branches:
refs/heads/branch-1 f3f42bf7a - ebd407dbd
HBASE-13315 BufferedMutator should be @InterfaceAudience.Public (Solomon Duskis)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ebd407db
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ebd407db
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ebd407db
Branch: refs/heads/branch-1
Commit: ebd407dbda181ad7042e361bd1c23abcaad6397c
Parents: f3f42bf
Author: Nick Dimiduk ndimi...@apache.org
Authored: Mon Mar 23 12:16:29 2015 -0700
Committer: Nick Dimiduk ndimi...@apache.org
Committed: Mon Mar 23 12:17:28 2015 -0700
--
.../main/java/org/apache/hadoop/hbase/client/BufferedMutator.java | 2 +-
.../java/org/apache/hadoop/hbase/client/BufferedMutatorImpl.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hbase/blob/ebd407db/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutator.java
--
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutator.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutator.java
index 3b91078..8d3d33c 100644
---
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutator.java
+++
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutator.java
@@ -60,7 +60,7 @@ import java.util.List;
* @see Connection
* @since 1.0.0
*/
-@InterfaceAudience.Private
+@InterfaceAudience.Public
@InterfaceStability.Evolving
public interface BufferedMutator extends Closeable {
/**
http://git-wip-us.apache.org/repos/asf/hbase/blob/ebd407db/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutatorImpl.java
--
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutatorImpl.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutatorImpl.java
index 54e7ccd..249edec 100644
---
a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutatorImpl.java
+++
b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/BufferedMutatorImpl.java
@@ -42,7 +42,7 @@ import java.util.concurrent.TimeUnit;
* @since 1.0.0
*/
@InterfaceAudience.Private
-@InterfaceStability.Stable
+@InterfaceStability.Evolving
public class BufferedMutatorImpl implements BufferedMutator {
private static final Log LOG = LogFactory.getLog(BufferedMutatorImpl.class);
