You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by an...@apache.org on 2013/11/28 18:52:27 UTC
svn commit: r1546408 - in /hbase/trunk/hbase-server/src:
main/java/org/apache/hadoop/hbase/security/visibility/VisibilityController.java
test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabels.java
Author: anoopsamjohn
Date: Thu Nov 28 17:52:27 2013
New Revision: 1546408
URL: http://svn.apache.org/r1546408
Log:
HBASE-10005 TestVisibilityLabels fails occasionally (addendum)
Modified:
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityController.java
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabels.java
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityController.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityController.java?rev=1546408&r1=1546407&r2=1546408&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityController.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityController.java Thu Nov 28 17:52:27 2013
@@ -1166,7 +1166,7 @@ public class VisibilityController extend
GetAuthsResponse.Builder response = GetAuthsResponse.newBuilder();
response.setUser(request.getUser());
try {
- List<String> labels = getUserAuthsFromLablesTable(user);
+ List<String> labels = getUserAuthsFromLabelsTable(user);
for (String label : labels) {
response.addAuth(ZeroCopyLiteralByteString.wrap(Bytes.toBytes(label)));
}
@@ -1176,7 +1176,7 @@ public class VisibilityController extend
done.run(response.build());
}
- private List<String> getUserAuthsFromLablesTable(byte[] user) throws IOException {
+ private List<String> getUserAuthsFromLabelsTable(byte[] user) throws IOException {
Scan s = new Scan();
s.addColumn(LABELS_TABLE_FAMILY, user);
Filter filter = createVisibilityLabelFilter(this.regionEnv.getRegion(), new Authorizations(
@@ -1210,7 +1210,7 @@ public class VisibilityController extend
byte[] user = request.getUser().toByteArray();
try {
checkCallingUserAuth();
- List<String> currentAuths = this.getUserAuthsFromLablesTable(user);
+ List<String> currentAuths = this.getUserAuthsFromLabelsTable(user);
List<Mutation> deletes = new ArrayList<Mutation>(auths.size());
RegionActionResult successResult = RegionActionResult.newBuilder().build();
for (ByteString authBS : auths) {
Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabels.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabels.java?rev=1546408&r1=1546407&r2=1546408&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabels.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabels.java Thu Nov 28 17:52:27 2013
@@ -550,7 +550,7 @@ public class TestVisibilityLabels {
}
@Test
- public void testLablesWithCheckAndPut() throws Throwable {
+ public void testLabelsWithCheckAndPut() throws Throwable {
TableName tableName = TableName.valueOf(TEST_NAME.getMethodName());
HTable table = null;
try {
@@ -582,7 +582,7 @@ public class TestVisibilityLabels {
}
@Test
- public void testLablesWithIncrement() throws Throwable {
+ public void testLabelsWithIncrement() throws Throwable {
TableName tableName = TableName.valueOf(TEST_NAME.getMethodName());
HTable table = null;
try {
@@ -614,7 +614,7 @@ public class TestVisibilityLabels {
}
@Test
- public void testLablesWithAppend() throws Throwable {
+ public void testLabelsWithAppend() throws Throwable {
TableName tableName = TableName.valueOf(TEST_NAME.getMethodName());
HTable table = null;
try {