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

Amend HBASE-15200 ZooKeeper znode ACL checks should only compare the shortname 

Fixes for newly introduced FindBugs warnings
This commit is contained in:
Andrew Purtell 2016-02-04 16:17:41 -08:00
parent f4d9597e1e
commit b80325fb1b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
View File

@ -293,7 +293,7 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable {
if (Ids.ANYONE_ID_UNSAFE.equals(id)) { if (Ids.ANYONE_ID_UNSAFE.equals(id)) {
if (perms != Perms.READ) { if (perms != Perms.READ) {
if (LOG.isDebugEnabled()) { if (LOG.isDebugEnabled()) {
LOG.debug(String.format("permissions for '%s' are not correct: have %0x, want %0x", LOG.debug(String.format("permissions for '%s' are not correct: have 0x%x, want 0x%x",
id, perms, Perms.READ)); id, perms, Perms.READ));
} }
return false; return false;
@ -301,7 +301,7 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable {
} else if (superUsers != null && isSuperUserId(superUsers, id)) { } else if (superUsers != null && isSuperUserId(superUsers, id)) {
if (perms != Perms.ALL) { if (perms != Perms.ALL) {
if (LOG.isDebugEnabled()) { if (LOG.isDebugEnabled()) {
LOG.debug(String.format("permissions for '%s' are not correct: have %0x, want %0x", LOG.debug(String.format("permissions for '%s' are not correct: have 0x%x, want 0x%x",
id, perms, Perms.ALL)); id, perms, Perms.ALL));
} }
return false; return false;
@ -316,8 +316,8 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable {
if (name.equals(hbaseUser)) { if (name.equals(hbaseUser)) {
if (perms != Perms.ALL) { if (perms != Perms.ALL) {
if (LOG.isDebugEnabled()) { if (LOG.isDebugEnabled()) {
LOG.debug(String.format("permissions for '%s' are not correct: have %0x, want %0x", LOG.debug(String.format("permissions for '%s' are not correct: have 0x%x, want 0x%x",
id.toString(), perms, Perms.ALL)); id, perms, Perms.ALL));
} }
return false; return false;
} }
@ -352,7 +352,7 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable {
} else { } else {
if (LOG.isDebugEnabled()) { if (LOG.isDebugEnabled()) {
LOG.debug(String.format( LOG.debug(String.format(
"superuser '%s' does not have correct permissions: have %0x, want %0x", "superuser '%s' does not have correct permissions: have 0x%x, want 0x%x",
acl.getId().getId(), acl.getPerms(), Perms.ALL)); acl.getId().getId(), acl.getPerms(), Perms.ALL));
} }
} }