sentry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From linaataus...@apache.org
Subject sentry git commit: SENTRY-2194: Upgrade Sentry hadoop-version dependency to 2.7.5 (Arjun Mishra, reviewed by Na Li, Kalyan kumar kalvagadda)
Date Mon, 09 Apr 2018 20:48:00 GMT
Repository: sentry
Updated Branches:
  refs/heads/master 252c1e0a9 -> e4dcc8ed2


SENTRY-2194: Upgrade Sentry hadoop-version dependency to 2.7.5 (Arjun Mishra, reviewed by
Na Li, Kalyan kumar kalvagadda)


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

Branch: refs/heads/master
Commit: e4dcc8ed2d61c654fff80fb23da0b41e3b451765
Parents: 252c1e0
Author: lina.li <lina.li@cloudera.com>
Authored: Mon Apr 9 15:45:56 2018 -0500
Committer: lina.li <lina.li@cloudera.com>
Committed: Mon Apr 9 15:45:56 2018 -0500

----------------------------------------------------------------------
 pom.xml                                                            | 2 +-
 .../binding/hbaseindexer/authz/HBaseIndexerAuthzBinding.java       | 2 +-
 .../sentry/binding/hbaseindexer/conf/HBaseIndexerAuthzConf.java    | 2 +-
 .../java/org/apache/sentry/binding/hive/conf/HiveAuthzConf.java    | 2 +-
 .../src/main/java/org/apache/sentry/kafka/conf/KafkaAuthConf.java  | 2 +-
 .../java/org/apache/sentry/binding/solr/conf/SolrAuthzConf.java    | 2 +-
 .../src/main/java/org/apache/sentry/sqoop/conf/SqoopAuthConf.java  | 2 +-
 .../java/org/apache/sentry/hdfs/SentryINodeAttributesProvider.java | 2 +-
 .../apache/sentry/provider/common/HadoopGroupMappingService.java   | 2 +-
 .../provider/db/generic/tools/PermissionsMigrationToolCommon.java  | 2 +-
 .../sentry/provider/db/generic/tools/SentryConfigToolIndexer.java  | 2 +-
 .../sentry/provider/db/generic/tools/SentryConfigToolSolr.java     | 2 +-
 .../sentry/provider/db/generic/tools/SentryShellGeneric.java       | 2 +-
 .../java/org/apache/sentry/provider/db/tools/SentryShellHive.java  | 2 +-
 .../main/java/org/apache/sentry/service/thrift/SentryService.java  | 2 +-
 .../apache/sentry/tests/e2e/tools/CreateSentryTestScaleData.java   | 2 +-
 sentry-tools/src/main/java/org/apache/sentry/shell/SentryCli.java  | 2 +-
 17 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/sentry/blob/e4dcc8ed/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cbe11ad..16a3838 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,7 @@ limitations under the License.
     <easymock.version>3.0</easymock.version>
     <fest.reflect.version>1.4.1</fest.reflect.version>
     <guava.version>14.0.1</guava.version>
-    <hadoop.version>2.7.2</hadoop.version>
+    <hadoop.version>2.7.5</hadoop.version>
     <hamcrest.version>1.3</hamcrest.version>
     <hive.version>2.3.2</hive.version>
     <jackson.version>1.8.8</jackson.version>

http://git-wip-us.apache.org/repos/asf/sentry/blob/e4dcc8ed/sentry-binding/sentry-binding-hbase-indexer/src/main/java/org/apache/sentry/binding/hbaseindexer/authz/HBaseIndexerAuthzBinding.java
----------------------------------------------------------------------
diff --git a/sentry-binding/sentry-binding-hbase-indexer/src/main/java/org/apache/sentry/binding/hbaseindexer/authz/HBaseIndexerAuthzBinding.java
b/sentry-binding/sentry-binding-hbase-indexer/src/main/java/org/apache/sentry/binding/hbaseindexer/authz/HBaseIndexerAuthzBinding.java
index d919fe7..71d1225 100644
--- a/sentry-binding/sentry-binding-hbase-indexer/src/main/java/org/apache/sentry/binding/hbaseindexer/authz/HBaseIndexerAuthzBinding.java
+++ b/sentry-binding/sentry-binding-hbase-indexer/src/main/java/org/apache/sentry/binding/hbaseindexer/authz/HBaseIndexerAuthzBinding.java
@@ -178,7 +178,7 @@ public class HBaseIndexerAuthzBinding {
       }
       for (String file : HADOOP_HBASE_CONF_FILES) {
         if (new File(confDirFile, file).exists()) {
-          conf.addResource(new Path(confDir, file));
+          conf.addResource(new Path(confDir, file), true);
         }
       }
     }

http://git-wip-us.apache.org/repos/asf/sentry/blob/e4dcc8ed/sentry-binding/sentry-binding-hbase-indexer/src/main/java/org/apache/sentry/binding/hbaseindexer/conf/HBaseIndexerAuthzConf.java
----------------------------------------------------------------------
diff --git a/sentry-binding/sentry-binding-hbase-indexer/src/main/java/org/apache/sentry/binding/hbaseindexer/conf/HBaseIndexerAuthzConf.java
b/sentry-binding/sentry-binding-hbase-indexer/src/main/java/org/apache/sentry/binding/hbaseindexer/conf/HBaseIndexerAuthzConf.java
index cfbd37b..26f12b1 100644
--- a/sentry-binding/sentry-binding-hbase-indexer/src/main/java/org/apache/sentry/binding/hbaseindexer/conf/HBaseIndexerAuthzConf.java
+++ b/sentry-binding/sentry-binding-hbase-indexer/src/main/java/org/apache/sentry/binding/hbaseindexer/conf/HBaseIndexerAuthzConf.java
@@ -74,7 +74,7 @@ public class HBaseIndexerAuthzConf extends Configuration {
 
   public HBaseIndexerAuthzConf(URL hbaseIndexerAuthzSiteURL) {
     super(true);
-    addResource(hbaseIndexerAuthzSiteURL);
+    addResource(hbaseIndexerAuthzSiteURL, true);
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/sentry/blob/e4dcc8ed/sentry-binding/sentry-binding-hive-conf/src/main/java/org/apache/sentry/binding/hive/conf/HiveAuthzConf.java
----------------------------------------------------------------------
diff --git a/sentry-binding/sentry-binding-hive-conf/src/main/java/org/apache/sentry/binding/hive/conf/HiveAuthzConf.java
b/sentry-binding/sentry-binding-hive-conf/src/main/java/org/apache/sentry/binding/hive/conf/HiveAuthzConf.java
index 8d5286c..cd4ae4a 100644
--- a/sentry-binding/sentry-binding-hive-conf/src/main/java/org/apache/sentry/binding/hive/conf/HiveAuthzConf.java
+++ b/sentry-binding/sentry-binding-hive-conf/src/main/java/org/apache/sentry/binding/hive/conf/HiveAuthzConf.java
@@ -178,7 +178,7 @@ public class HiveAuthzConf extends Configuration {
     public HiveAuthzConf(URL hiveAuthzSiteURL) {
         super();
         LOG.info("DefaultFS: " + super.get("fs.defaultFS"));
-        addResource(hiveAuthzSiteURL);
+        addResource(hiveAuthzSiteURL, true);
         applySystemProperties();
         this.hiveAuthzSiteFile = hiveAuthzSiteURL.toString();
     }

http://git-wip-us.apache.org/repos/asf/sentry/blob/e4dcc8ed/sentry-binding/sentry-binding-kafka/src/main/java/org/apache/sentry/kafka/conf/KafkaAuthConf.java
----------------------------------------------------------------------
diff --git a/sentry-binding/sentry-binding-kafka/src/main/java/org/apache/sentry/kafka/conf/KafkaAuthConf.java
b/sentry-binding/sentry-binding-kafka/src/main/java/org/apache/sentry/kafka/conf/KafkaAuthConf.java
index 6ca6210..1239dee 100644
--- a/sentry-binding/sentry-binding-kafka/src/main/java/org/apache/sentry/kafka/conf/KafkaAuthConf.java
+++ b/sentry-binding/sentry-binding-kafka/src/main/java/org/apache/sentry/kafka/conf/KafkaAuthConf.java
@@ -82,7 +82,7 @@ public class KafkaAuthConf extends Configuration {
 
   public KafkaAuthConf(URL kafkaAuthzSiteURL) {
     super(true);
-    addResource(kafkaAuthzSiteURL);
+    addResource(kafkaAuthzSiteURL, true);
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/sentry/blob/e4dcc8ed/sentry-binding/sentry-binding-solr/src/main/java/org/apache/sentry/binding/solr/conf/SolrAuthzConf.java
----------------------------------------------------------------------
diff --git a/sentry-binding/sentry-binding-solr/src/main/java/org/apache/sentry/binding/solr/conf/SolrAuthzConf.java
b/sentry-binding/sentry-binding-solr/src/main/java/org/apache/sentry/binding/solr/conf/SolrAuthzConf.java
index 0883e70..ee47461 100644
--- a/sentry-binding/sentry-binding-solr/src/main/java/org/apache/sentry/binding/solr/conf/SolrAuthzConf.java
+++ b/sentry-binding/sentry-binding-solr/src/main/java/org/apache/sentry/binding/solr/conf/SolrAuthzConf.java
@@ -85,7 +85,7 @@ public class SolrAuthzConf extends Configuration {
   public SolrAuthzConf(List<URL> sentryConf) {
     super(true);
     for (URL u : sentryConf) {
-      addResource(u);
+      addResource(u, true);
     }
   }
 

http://git-wip-us.apache.org/repos/asf/sentry/blob/e4dcc8ed/sentry-binding/sentry-binding-sqoop/src/main/java/org/apache/sentry/sqoop/conf/SqoopAuthConf.java
----------------------------------------------------------------------
diff --git a/sentry-binding/sentry-binding-sqoop/src/main/java/org/apache/sentry/sqoop/conf/SqoopAuthConf.java
b/sentry-binding/sentry-binding-sqoop/src/main/java/org/apache/sentry/sqoop/conf/SqoopAuthConf.java
index 7836871..482224d 100644
--- a/sentry-binding/sentry-binding-sqoop/src/main/java/org/apache/sentry/sqoop/conf/SqoopAuthConf.java
+++ b/sentry-binding/sentry-binding-sqoop/src/main/java/org/apache/sentry/sqoop/conf/SqoopAuthConf.java
@@ -68,7 +68,7 @@ public class SqoopAuthConf extends Configuration {
 
   public SqoopAuthConf(URL sqoopAuthzSiteURL) {
     super(true);
-    addResource(sqoopAuthzSiteURL);
+    addResource(sqoopAuthzSiteURL, true);
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/sentry/blob/e4dcc8ed/sentry-hdfs/sentry-hdfs-namenode-plugin/src/main/java/org/apache/sentry/hdfs/SentryINodeAttributesProvider.java
----------------------------------------------------------------------
diff --git a/sentry-hdfs/sentry-hdfs-namenode-plugin/src/main/java/org/apache/sentry/hdfs/SentryINodeAttributesProvider.java
b/sentry-hdfs/sentry-hdfs-namenode-plugin/src/main/java/org/apache/sentry/hdfs/SentryINodeAttributesProvider.java
index cf96df4..18b6265 100644
--- a/sentry-hdfs/sentry-hdfs-namenode-plugin/src/main/java/org/apache/sentry/hdfs/SentryINodeAttributesProvider.java
+++ b/sentry-hdfs/sentry-hdfs-namenode-plugin/src/main/java/org/apache/sentry/hdfs/SentryINodeAttributesProvider.java
@@ -293,7 +293,7 @@ public class SentryINodeAttributesProvider extends INodeAttributeProvider
         throw new RuntimeException("HDFS ACLs must be enabled");
       }
       Configuration conf = new Configuration(this.conf);
-      conf.addResource(SentryAuthorizationConstants.CONFIG_FILE);
+      conf.addResource(SentryAuthorizationConstants.CONFIG_FILE, true);
       user = conf.get(SentryAuthorizationConstants.HDFS_USER_KEY,
               SentryAuthorizationConstants.HDFS_USER_DEFAULT);
       group = conf.get(SentryAuthorizationConstants.HDFS_GROUP_KEY,

http://git-wip-us.apache.org/repos/asf/sentry/blob/e4dcc8ed/sentry-provider/sentry-provider-common/src/main/java/org/apache/sentry/provider/common/HadoopGroupMappingService.java
----------------------------------------------------------------------
diff --git a/sentry-provider/sentry-provider-common/src/main/java/org/apache/sentry/provider/common/HadoopGroupMappingService.java
b/sentry-provider/sentry-provider-common/src/main/java/org/apache/sentry/provider/common/HadoopGroupMappingService.java
index 00b5cf6..4f6f9e6 100644
--- a/sentry-provider/sentry-provider-common/src/main/java/org/apache/sentry/provider/common/HadoopGroupMappingService.java
+++ b/sentry-provider/sentry-provider-common/src/main/java/org/apache/sentry/provider/common/HadoopGroupMappingService.java
@@ -45,7 +45,7 @@ public class HadoopGroupMappingService implements GroupMappingService {
           hadoopConf = new Configuration();
           hadoopConf.addResource(conf);
           if (!StringUtils.isEmpty(resource)) {
-            hadoopConf.addResource(resource);
+            hadoopConf.addResource(resource, true);
           }
         }
       }

http://git-wip-us.apache.org/repos/asf/sentry/blob/e4dcc8ed/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/tools/PermissionsMigrationToolCommon.java
----------------------------------------------------------------------
diff --git a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/tools/PermissionsMigrationToolCommon.java
b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/tools/PermissionsMigrationToolCommon.java
index ed28b73..e3d81f8 100644
--- a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/tools/PermissionsMigrationToolCommon.java
+++ b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/tools/PermissionsMigrationToolCommon.java
@@ -330,7 +330,7 @@ public abstract class PermissionsMigrationToolCommon {
   private Configuration getSentryConf() {
     Configuration conf = new Configuration();
     if (confPath.isPresent()) {
-      conf.addResource(new Path(confPath.get()));
+      conf.addResource(new Path(confPath.get()), true);
     }
     return conf;
   }

http://git-wip-us.apache.org/repos/asf/sentry/blob/e4dcc8ed/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/tools/SentryConfigToolIndexer.java
----------------------------------------------------------------------
diff --git a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/tools/SentryConfigToolIndexer.java
b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/tools/SentryConfigToolIndexer.java
index c2341d3..a5996a7 100644
--- a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/tools/SentryConfigToolIndexer.java
+++ b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/tools/SentryConfigToolIndexer.java
@@ -172,7 +172,7 @@ public class SentryConfigToolIndexer {
 
   private Configuration getSentryConf() {
     Configuration conf = new Configuration();
-    conf.addResource(new Path(getConfPath()));
+    conf.addResource(new Path(getConfPath()), true);
     return conf;
   }
 

http://git-wip-us.apache.org/repos/asf/sentry/blob/e4dcc8ed/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/tools/SentryConfigToolSolr.java
----------------------------------------------------------------------
diff --git a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/tools/SentryConfigToolSolr.java
b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/tools/SentryConfigToolSolr.java
index 5649f43..1a4692e 100644
--- a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/tools/SentryConfigToolSolr.java
+++ b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/tools/SentryConfigToolSolr.java
@@ -74,7 +74,7 @@ public class SentryConfigToolSolr extends SentryConfigToolCommon {
 
   private Configuration getSentryConf() {
     Configuration conf = new Configuration();
-    conf.addResource(new Path(getConfPath()));
+    conf.addResource(new Path(getConfPath()), true);
     return conf;
   }
 

http://git-wip-us.apache.org/repos/asf/sentry/blob/e4dcc8ed/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/tools/SentryShellGeneric.java
----------------------------------------------------------------------
diff --git a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/tools/SentryShellGeneric.java
b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/tools/SentryShellGeneric.java
index 907e146..4487685 100644
--- a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/tools/SentryShellGeneric.java
+++ b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/generic/tools/SentryShellGeneric.java
@@ -131,7 +131,7 @@ public class SentryShellGeneric extends SentryShellCommon {
 
   private Configuration getSentryConf() {
     Configuration conf = new Configuration();
-    conf.addResource(new Path(confPath));
+    conf.addResource(new Path(confPath), true);
     return conf;
   }
 

http://git-wip-us.apache.org/repos/asf/sentry/blob/e4dcc8ed/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/tools/SentryShellHive.java
----------------------------------------------------------------------
diff --git a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/tools/SentryShellHive.java
b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/tools/SentryShellHive.java
index 729a518..785e27d 100644
--- a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/tools/SentryShellHive.java
+++ b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/provider/db/tools/SentryShellHive.java
@@ -92,7 +92,7 @@ public class SentryShellHive extends SentryShellCommon {
 
   private Configuration getSentryConf() {
     Configuration conf = new Configuration();
-    conf.addResource(new Path(confPath));
+    conf.addResource(new Path(confPath), true);
     return conf;
   }
 

http://git-wip-us.apache.org/repos/asf/sentry/blob/e4dcc8ed/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/service/thrift/SentryService.java
----------------------------------------------------------------------
diff --git a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/service/thrift/SentryService.java
b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/service/thrift/SentryService.java
index bf5d85b..4236c02 100644
--- a/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/service/thrift/SentryService.java
+++ b/sentry-provider/sentry-provider-db/src/main/java/org/apache/sentry/service/thrift/SentryService.java
@@ -543,7 +543,7 @@ public class SentryService implements Callable, SigUtils.SigListener {
           + configFile);
     }
     Configuration conf = new Configuration(false);
-    conf.addResource(configFile.toURI().toURL());
+    conf.addResource(configFile.toURI().toURL(), true);
     return conf;
   }
 

http://git-wip-us.apache.org/repos/asf/sentry/blob/e4dcc8ed/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/tools/CreateSentryTestScaleData.java
----------------------------------------------------------------------
diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/tools/CreateSentryTestScaleData.java
b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/tools/CreateSentryTestScaleData.java
index b234c85..8341197 100644
--- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/tools/CreateSentryTestScaleData.java
+++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/tools/CreateSentryTestScaleData.java
@@ -114,7 +114,7 @@ public class CreateSentryTestScaleData {
     try {
       url = new File(fullPath.toString()).toURI().toURL();
       System.out.println("Reading config file from url: " + url.toString());
-      scaleConfig.addResource(url);
+      scaleConfig.addResource(url, true);
     } catch (Exception ex) {
       System.err.println("Failed to load config file from local file system: " + url.toString());
       throw new RuntimeException(ex);

http://git-wip-us.apache.org/repos/asf/sentry/blob/e4dcc8ed/sentry-tools/src/main/java/org/apache/sentry/shell/SentryCli.java
----------------------------------------------------------------------
diff --git a/sentry-tools/src/main/java/org/apache/sentry/shell/SentryCli.java b/sentry-tools/src/main/java/org/apache/sentry/shell/SentryCli.java
index 8b68d0d..9c914a3 100644
--- a/sentry-tools/src/main/java/org/apache/sentry/shell/SentryCli.java
+++ b/sentry-tools/src/main/java/org/apache/sentry/shell/SentryCli.java
@@ -141,7 +141,7 @@ public class SentryCli {
     Configuration conf = new Configuration();
 
     if (pathConf != null) {
-      conf.addResource(new Path(pathConf));
+      conf.addResource(new Path(pathConf), true);
     } else {
       conf.set(SECURITY_MODE, SECURITY_MODE_NONE);
     }


Mime
View raw message