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 2014/09/26 22:46:24 UTC

git commit: HBASE-12087 [0.98] [0.98] Changing the default setting of hbase.security.access.early_out to true (Srikanth Srungarapu)

Repository: hbase
Updated Branches:
  refs/heads/0.98 e7ff09210 -> c0d0d7945


HBASE-12087 [0.98] [0.98] Changing the default setting of hbase.security.access.early_out to true (Srikanth Srungarapu)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c0d0d794
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c0d0d794
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c0d0d794

Branch: refs/heads/0.98
Commit: c0d0d794554ad15b9a87f4ccf82aac0643419b9a
Parents: e7ff092
Author: Andrew Purtell <ap...@apache.org>
Authored: Fri Sep 26 13:46:18 2014 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Sep 26 13:46:18 2014 -0700

----------------------------------------------------------------------
 .../hadoop/hbase/security/access/AccessControlConstants.java   | 4 ++--
 .../apache/hadoop/hbase/security/access/AccessController.java  | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/c0d0d794/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlConstants.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlConstants.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlConstants.java
index 49a045f..7bf441a 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlConstants.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/AccessControlConstants.java
@@ -38,8 +38,8 @@ public interface AccessControlConstants {
    * if table or CF permissions grant access. Pre-0.98 compatible behavior
    */
   public static final String CF_ATTRIBUTE_EARLY_OUT = "hbase.security.access.early_out";
-  /** Default setting for hbase.security.access.early_out; false in 0.98 */
-  public static final boolean DEFAULT_ATTRIBUTE_EARLY_OUT = false;
+  /** Default setting for hbase.security.access.early_out; true*/
+  public static final boolean DEFAULT_ATTRIBUTE_EARLY_OUT = true;
 
   // Operation attributes for cell level security
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/c0d0d794/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java
index 66a97ce..4c4c5c7 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java
@@ -864,6 +864,12 @@ public class AccessController extends BaseMasterAndRegionObserver
     } else {
       throw new RuntimeException("Error obtaining TableAuthManager, zk found null.");
     }
+
+    if(!compatibleEarlyTermination && !cellFeaturesEnabled) {
+      LOG.warn("A minimum HFile version of " + HFile.MIN_FORMAT_VERSION_WITH_TAGS
+          + " is required for " + AccessControlConstants.CF_ATTRIBUTE_EARLY_OUT
+          + " to have an effect");
+    }
   }
 
   public void stop(CoprocessorEnvironment env) {