Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-10005 TestVisibilityLabels fails occasionally (addendum) 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1546408 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
anoopsamjohn 2013-11-28 17:52:27 +00:00
parent b4f0a38daa
commit fd7ee9e29c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hbase-server/src/main/java/org/apache/hadoop/hbase/security/visibility/VisibilityController.java
View File

@ -1166,7 +1166,7 @@ public class VisibilityController extends BaseRegionObserver implements MasterOb
GetAuthsResponse.Builder response = GetAuthsResponse.newBuilder(); GetAuthsResponse.Builder response = GetAuthsResponse.newBuilder();
response.setUser(request.getUser()); response.setUser(request.getUser());
try { try {
List<String> labels = getUserAuthsFromLablesTable(user); List<String> labels = getUserAuthsFromLabelsTable(user);
for (String label : labels) { for (String label : labels) {
response.addAuth(ZeroCopyLiteralByteString.wrap(Bytes.toBytes(label))); response.addAuth(ZeroCopyLiteralByteString.wrap(Bytes.toBytes(label)));
} }
@ -1176,7 +1176,7 @@ public class VisibilityController extends BaseRegionObserver implements MasterOb
done.run(response.build()); done.run(response.build());
} }
private List<String> getUserAuthsFromLablesTable(byte[] user) throws IOException { private List<String> getUserAuthsFromLabelsTable(byte[] user) throws IOException {
Scan s = new Scan(); Scan s = new Scan();
s.addColumn(LABELS_TABLE_FAMILY, user); s.addColumn(LABELS_TABLE_FAMILY, user);
Filter filter = createVisibilityLabelFilter(this.regionEnv.getRegion(), new Authorizations( Filter filter = createVisibilityLabelFilter(this.regionEnv.getRegion(), new Authorizations(
@ -1210,7 +1210,7 @@ public class VisibilityController extends BaseRegionObserver implements MasterOb
byte[] user = request.getUser().toByteArray(); byte[] user = request.getUser().toByteArray();
try { try {
checkCallingUserAuth(); checkCallingUserAuth();
List<String> currentAuths = this.getUserAuthsFromLablesTable(user); List<String> currentAuths = this.getUserAuthsFromLabelsTable(user);
List<Mutation> deletes = new ArrayList<Mutation>(auths.size()); List<Mutation> deletes = new ArrayList<Mutation>(auths.size());
RegionActionResult successResult = RegionActionResult.newBuilder().build(); RegionActionResult successResult = RegionActionResult.newBuilder().build();
for (ByteString authBS : auths) { for (ByteString authBS : auths) {

6
hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabels.java
View File

@ -550,7 +550,7 @@ public class TestVisibilityLabels {
} }
@Test @Test
public void testLablesWithCheckAndPut() throws Throwable { public void testLabelsWithCheckAndPut() throws Throwable {
TableName tableName = TableName.valueOf(TEST_NAME.getMethodName()); TableName tableName = TableName.valueOf(TEST_NAME.getMethodName());
HTable table = null; HTable table = null;
try { try {
@ -582,7 +582,7 @@ public class TestVisibilityLabels {
} }
@Test @Test
public void testLablesWithIncrement() throws Throwable { public void testLabelsWithIncrement() throws Throwable {
TableName tableName = TableName.valueOf(TEST_NAME.getMethodName()); TableName tableName = TableName.valueOf(TEST_NAME.getMethodName());
HTable table = null; HTable table = null;
try { try {
@ -614,7 +614,7 @@ public class TestVisibilityLabels {
} }
@Test @Test
public void testLablesWithAppend() throws Throwable { public void testLabelsWithAppend() throws Throwable {
TableName tableName = TableName.valueOf(TEST_NAME.getMethodName()); TableName tableName = TableName.valueOf(TEST_NAME.getMethodName());
HTable table = null; HTable table = null;
try { try {