You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2016/02/05 02:51:22 UTC
[1/6] hbase git commit: Amend HBASE-15200 ZooKeeper znode ACL checks
should only compare the shortname
Repository: hbase
Updated Branches:
refs/heads/0.98 8172c6c4b -> f6e5c3290
refs/heads/branch-1 846a2f31c -> 1b420be56
refs/heads/branch-1.0 b43442c58 -> 7f42fcd6f
refs/heads/branch-1.1 bc564d3a6 -> 1a23f4126
refs/heads/branch-1.2 0e36afd2d -> d52625de8
refs/heads/master f4d9597e1 -> b80325fb1
Amend HBASE-15200 ZooKeeper znode ACL checks should only compare the shortname
Fixes for newly introduced FindBugs warnings
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1a23f412
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1a23f412
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1a23f412
Branch: refs/heads/branch-1.1
Commit: 1a23f4126412254d54bf720da471f7cfd9fb9394
Parents: bc564d3
Author: Andrew Purtell <ap...@apache.org>
Authored: Thu Feb 4 16:17:41 2016 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu Feb 4 16:59:39 2016 -0800
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/1a23f412/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
index 08a089c..49b32c9 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
@@ -303,7 +303,7 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable {
if (Ids.ANYONE_ID_UNSAFE.equals(id)) {
if (perms != Perms.READ) {
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));
}
return false;
@@ -318,7 +318,7 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable {
if (name.equals(hbaseUser)) {
if (perms != Perms.ALL) {
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));
}
return false;
@@ -354,7 +354,7 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable {
} else {
if (LOG.isDebugEnabled()) {
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));
}
}
[2/6] hbase git commit: Amend HBASE-15200 ZooKeeper znode ACL checks
should only compare the shortname
Posted by ap...@apache.org.
Amend HBASE-15200 ZooKeeper znode ACL checks should only compare the shortname
Fixes for newly introduced FindBugs warnings
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/7f42fcd6
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7f42fcd6
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7f42fcd6
Branch: refs/heads/branch-1.0
Commit: 7f42fcd6f9db1decd06dfb9484dd22c5704dd917
Parents: b43442c
Author: Andrew Purtell <ap...@apache.org>
Authored: Thu Feb 4 16:17:41 2016 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu Feb 4 17:00:23 2016 -0800
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/7f42fcd6/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
index 983153f..3ad3a20 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
@@ -297,7 +297,7 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable {
if (Ids.ANYONE_ID_UNSAFE.equals(id)) {
if (perms != Perms.READ) {
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));
}
return false;
@@ -312,7 +312,7 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable {
if (name.equals(hbaseUser)) {
if (perms != Perms.ALL) {
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));
}
return false;
@@ -348,7 +348,7 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable {
} else {
if (LOG.isDebugEnabled()) {
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));
}
}
[4/6] hbase git commit: Amend HBASE-15200 ZooKeeper znode ACL checks
should only compare the shortname
Posted by ap...@apache.org.
Amend HBASE-15200 ZooKeeper znode ACL checks should only compare the shortname
Fixes for newly introduced FindBugs warnings
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1b420be5
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1b420be5
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1b420be5
Branch: refs/heads/branch-1
Commit: 1b420be56a530e5b07ed8f478d5aa4916abeb438
Parents: 846a2f3
Author: Andrew Purtell <ap...@apache.org>
Authored: Thu Feb 4 16:17:41 2016 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu Feb 4 17:33:29 2016 -0800
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/1b420be5/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
index c4e8990f..5b6385f 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
@@ -306,7 +306,7 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable {
if (Ids.ANYONE_ID_UNSAFE.equals(id)) {
if (perms != Perms.READ) {
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));
}
return false;
@@ -314,7 +314,7 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable {
} else if (superUsers != null && isSuperUserId(superUsers, id)) {
if (perms != Perms.ALL) {
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));
}
return false;
@@ -329,7 +329,7 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable {
if (name.equals(hbaseUser)) {
if (perms != Perms.ALL) {
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));
}
return false;
@@ -365,7 +365,7 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable {
} else {
if (LOG.isDebugEnabled()) {
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));
}
}
[6/6] hbase git commit: Amend HBASE-15200 ZooKeeper znode ACL checks
should only compare the shortname
Posted by ap...@apache.org.
Amend HBASE-15200 ZooKeeper znode ACL checks should only compare the shortname
Fixes for newly introduced FindBugs warnings
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b80325fb
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b80325fb
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b80325fb
Branch: refs/heads/master
Commit: b80325fb1b6ad4735c8b2cb259b1430eddefd7b7
Parents: f4d9597
Author: Andrew Purtell <ap...@apache.org>
Authored: Thu Feb 4 16:17:41 2016 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu Feb 4 17:33:32 2016 -0800
----------------------------------------------------------------------
.../apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/b80325fb/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
index 2bf4119..36a9bc5 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
@@ -293,7 +293,7 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable {
if (Ids.ANYONE_ID_UNSAFE.equals(id)) {
if (perms != Perms.READ) {
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));
}
return false;
@@ -301,7 +301,7 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable {
} else if (superUsers != null && isSuperUserId(superUsers, id)) {
if (perms != Perms.ALL) {
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));
}
return false;
@@ -316,8 +316,8 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable {
if (name.equals(hbaseUser)) {
if (perms != Perms.ALL) {
if (LOG.isDebugEnabled()) {
- LOG.debug(String.format("permissions for '%s' are not correct: have %0x, want %0x",
- id.toString(), perms, Perms.ALL));
+ LOG.debug(String.format("permissions for '%s' are not correct: have 0x%x, want 0x%x",
+ id, perms, Perms.ALL));
}
return false;
}
@@ -352,7 +352,7 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable {
} else {
if (LOG.isDebugEnabled()) {
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));
}
}
[3/6] hbase git commit: Amend HBASE-15200 ZooKeeper znode ACL checks
should only compare the shortname
Posted by ap...@apache.org.
Amend HBASE-15200 ZooKeeper znode ACL checks should only compare the shortname
Fixes for newly introduced FindBugs warnings
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f6e5c329
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f6e5c329
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f6e5c329
Branch: refs/heads/0.98
Commit: f6e5c3290c5a0b3486c92077f37e55567ce05f57
Parents: 8172c6c
Author: Andrew Purtell <ap...@apache.org>
Authored: Thu Feb 4 16:17:41 2016 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu Feb 4 17:00:58 2016 -0800
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/f6e5c329/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
index db07c98..2d3eaa0 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
@@ -302,7 +302,7 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable {
if (Ids.ANYONE_ID_UNSAFE.equals(id)) {
if (perms != Perms.READ) {
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));
}
return false;
@@ -310,7 +310,7 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable {
} else if (superUsers != null && isSuperUserId(superUsers, id)) {
if (perms != Perms.ALL) {
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));
}
return false;
@@ -325,7 +325,7 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable {
if (name.equals(hbaseUser)) {
if (perms != Perms.ALL) {
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));
}
return false;
@@ -361,7 +361,7 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable {
} else {
if (LOG.isDebugEnabled()) {
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));
}
}
[5/6] hbase git commit: Amend HBASE-15200 ZooKeeper znode ACL checks
should only compare the shortname
Posted by ap...@apache.org.
Amend HBASE-15200 ZooKeeper znode ACL checks should only compare the shortname
Fixes for newly introduced FindBugs warnings
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d52625de
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d52625de
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d52625de
Branch: refs/heads/branch-1.2
Commit: d52625de8fc7dcd7595d3cd019ca6ad77493c96f
Parents: 0e36afd
Author: Andrew Purtell <ap...@apache.org>
Authored: Thu Feb 4 16:17:41 2016 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu Feb 4 17:33:31 2016 -0800
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/d52625de/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
index c4e8990f..5b6385f 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java
@@ -306,7 +306,7 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable {
if (Ids.ANYONE_ID_UNSAFE.equals(id)) {
if (perms != Perms.READ) {
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));
}
return false;
@@ -314,7 +314,7 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable {
} else if (superUsers != null && isSuperUserId(superUsers, id)) {
if (perms != Perms.ALL) {
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));
}
return false;
@@ -329,7 +329,7 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable {
if (name.equals(hbaseUser)) {
if (perms != Perms.ALL) {
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));
}
return false;
@@ -365,7 +365,7 @@ public class ZooKeeperWatcher implements Watcher, Abortable, Closeable {
} else {
if (LOG.isDebugEnabled()) {
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));
}
}