You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ma...@apache.org on 2015/05/22 00:56:15 UTC
[1/6] incubator-ranger git commit: RANGER-488: updated README.txt
with build steps
Repository: incubator-ranger
Updated Branches:
refs/heads/tag-policy 9578f94cd -> 6568faabb
RANGER-488: updated README.txt with build steps
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/0ed45e38
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/0ed45e38
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/0ed45e38
Branch: refs/heads/tag-policy
Commit: 0ed45e380c02ce606a8c063c75d4ad854537a66f
Parents: 9578f94
Author: sneethiraj <sn...@apache.org>
Authored: Tue May 19 01:44:24 2015 -0400
Committer: Madhan Neethiraj <ma...@apache.org>
Committed: Thu May 21 15:44:03 2015 -0700
----------------------------------------------------------------------
README.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/0ed45e38/README.txt
----------------------------------------------------------------------
diff --git a/README.txt b/README.txt
index d410e18..b5fad2e 100644
--- a/README.txt
+++ b/README.txt
@@ -6,7 +6,7 @@ Build Process
2. On the root folder, please execute the following Maven command:
$ mvn clean compile package install assembly:assembly
- $ mvn eclise:eclipse
+ $ mvn eclipse:eclipse
3. After the above build command execution, you should see the following TAR files in the target folder:
[5/6] incubator-ranger git commit: RANGER-500 - Change URL to Solr
for audit
Posted by ma...@apache.org.
RANGER-500 - Change URL to Solr for audit
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/b8d5bb27
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/b8d5bb27
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/b8d5bb27
Branch: refs/heads/tag-policy
Commit: b8d5bb27f57f6df7be4b527352a1ae70b3bdd495
Parents: ea7f715
Author: Don Bosco Durai <bo...@apache.org>
Authored: Thu May 21 01:02:47 2015 -0700
Committer: Madhan Neethiraj <ma...@apache.org>
Committed: Thu May 21 15:50:16 2015 -0700
----------------------------------------------------------------------
.../java/org/apache/ranger/solr/SolrMgr.java | 25 ++++++++++++++------
1 file changed, 18 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b8d5bb27/security-admin/src/main/java/org/apache/ranger/solr/SolrMgr.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/solr/SolrMgr.java b/security-admin/src/main/java/org/apache/ranger/solr/SolrMgr.java
index 599f1df..ee52992 100644
--- a/security-admin/src/main/java/org/apache/ranger/solr/SolrMgr.java
+++ b/security-admin/src/main/java/org/apache/ranger/solr/SolrMgr.java
@@ -58,8 +58,15 @@ public class SolrMgr {
if (!initDone) {
if (rangerBizUtil.getAuditDBType().equalsIgnoreCase("solr")) {
String solrURL = PropertiesUtil
- .getProperty("ranger.solr.url");
- if (solrURL == null || solrURL.isEmpty()) {
+ .getProperty("ranger.audit.solr.urls");
+
+ if (solrURL == null) {
+ //Let's try older property name
+ solrURL = PropertiesUtil
+ .getProperty("ranger.solr.url");
+ }
+ if (solrURL == null || solrURL.isEmpty()
+ || solrURL.equalsIgnoreCase("none")) {
logger.fatal("Solr URL for Audit is empty");
} else {
try {
@@ -70,18 +77,22 @@ public class SolrMgr {
} else {
if (solrClient instanceof HttpSolrClient) {
HttpSolrClient httpSolrClient = (HttpSolrClient) solrClient;
- httpSolrClient.setAllowCompression(true);
- httpSolrClient.setConnectionTimeout(1000);
+ httpSolrClient
+ .setAllowCompression(true);
+ httpSolrClient
+ .setConnectionTimeout(1000);
// httpSolrClient.setSoTimeout(10000);
httpSolrClient.setMaxRetries(1);
- httpSolrClient.setRequestWriter(new BinaryRequestWriter());
+ httpSolrClient
+ .setRequestWriter(new BinaryRequestWriter());
}
initDone = true;
}
} catch (Throwable t) {
- logger.fatal("Can't connect to Solr server. URL="
- + solrURL, t);
+ logger.fatal(
+ "Can't connect to Solr server. URL="
+ + solrURL, t);
}
}
}
[2/6] incubator-ranger git commit: RANGER-500 - Check for url
property also
Posted by ma...@apache.org.
RANGER-500 - Check for url property also
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/6568faab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/6568faab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/6568faab
Branch: refs/heads/tag-policy
Commit: 6568faabbdb2a593ad276c8a9db2a0523195ed6e
Parents: b8d5bb2
Author: Don Bosco Durai <bo...@apache.org>
Authored: Thu May 21 01:05:58 2015 -0700
Committer: Madhan Neethiraj <ma...@apache.org>
Committed: Thu May 21 15:50:16 2015 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/ranger/solr/SolrMgr.java | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/6568faab/security-admin/src/main/java/org/apache/ranger/solr/SolrMgr.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/solr/SolrMgr.java b/security-admin/src/main/java/org/apache/ranger/solr/SolrMgr.java
index ee52992..2a57fa1 100644
--- a/security-admin/src/main/java/org/apache/ranger/solr/SolrMgr.java
+++ b/security-admin/src/main/java/org/apache/ranger/solr/SolrMgr.java
@@ -48,6 +48,8 @@ public class SolrMgr {
Date lastConnectTime = null;
volatile boolean initDone = false;
+ final static String SOLR_URLS_PROP = "ranger.audit.solr.urls";
+
public SolrMgr() {
}
@@ -58,16 +60,22 @@ public class SolrMgr {
if (!initDone) {
if (rangerBizUtil.getAuditDBType().equalsIgnoreCase("solr")) {
String solrURL = PropertiesUtil
- .getProperty("ranger.audit.solr.urls");
+ .getProperty(SOLR_URLS_PROP);
if (solrURL == null) {
- //Let's try older property name
+ // Try with url
+ solrURL = PropertiesUtil
+ .getProperty("ranger.audit.solr.url");
+ }
+ if (solrURL == null) {
+ // Let's try older property name
solrURL = PropertiesUtil
.getProperty("ranger.solr.url");
}
if (solrURL == null || solrURL.isEmpty()
|| solrURL.equalsIgnoreCase("none")) {
- logger.fatal("Solr URL for Audit is empty");
+ logger.fatal("Solr URL for Audit is empty. Please set property "
+ + SOLR_URLS_PROP);
} else {
try {
solrClient = new HttpSolrClient(solrURL);
[6/6] incubator-ranger git commit: RANGER-496 Fix build failure due
to Kafka API change
Posted by ma...@apache.org.
RANGER-496 Fix build failure due to Kafka API change
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/3c22cfa1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/3c22cfa1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/3c22cfa1
Branch: refs/heads/tag-policy
Commit: 3c22cfa12b86e400bf8d6af4407010b9becd58fc
Parents: b42dfb0
Author: Don Bosco Durai <bo...@apache.org>
Authored: Tue May 19 15:53:49 2015 -0700
Committer: Madhan Neethiraj <ma...@apache.org>
Committed: Thu May 21 15:50:16 2015 -0700
----------------------------------------------------------------------
.../authorization/kafka/authorizer/RangerKafkaAuthorizer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/3c22cfa1/plugin-kafka/src/main/java/org/apache/ranger/authorization/kafka/authorizer/RangerKafkaAuthorizer.java
----------------------------------------------------------------------
diff --git a/plugin-kafka/src/main/java/org/apache/ranger/authorization/kafka/authorizer/RangerKafkaAuthorizer.java b/plugin-kafka/src/main/java/org/apache/ranger/authorization/kafka/authorizer/RangerKafkaAuthorizer.java
index 4689957..655f1b9 100644
--- a/plugin-kafka/src/main/java/org/apache/ranger/authorization/kafka/authorizer/RangerKafkaAuthorizer.java
+++ b/plugin-kafka/src/main/java/org/apache/ranger/authorization/kafka/authorizer/RangerKafkaAuthorizer.java
@@ -108,7 +108,7 @@ public class RangerKafkaAuthorizer implements Authorizer {
rangerResource.setValue(KEY_TOPIC, resource.name());
} else if (resource.resourceType().equals(ResourceType.CLUSTER)) {
rangerResource.setValue(KEY_CLUSTER, resource.name());
- } else if (resource.resourceType().equals(ResourceType.GROUP)) {
+ } else if (resource.resourceType().equals(ResourceType.CONSUMER_GROUP)) {
rangerResource.setValue(KEY_CONSUMER_GROUP, resource.name());
} else {
logger.fatal("Unsupported resourceType=" + resource.resourceType());
[4/6] incubator-ranger git commit: Ranger-495: Coverity Scan for
Apache Ranger : - Null pointer issue on KnoxClient lookup manager
Posted by ma...@apache.org.
Ranger-495: Coverity Scan for Apache Ranger : - Null pointer issue on KnoxClient lookup manager
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/b42dfb0a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/b42dfb0a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/b42dfb0a
Branch: refs/heads/tag-policy
Commit: b42dfb0a57d643374761673bf2c6ec1380d306c2
Parents: 0ed45e3
Author: rmani <rm...@hortonworks.com>
Authored: Tue May 19 15:12:59 2015 -0700
Committer: Madhan Neethiraj <ma...@apache.org>
Committed: Thu May 21 15:50:16 2015 -0700
----------------------------------------------------------------------
.../apache/ranger/services/knox/client/KnoxResourceMgr.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b42dfb0a/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxResourceMgr.java
----------------------------------------------------------------------
diff --git a/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxResourceMgr.java b/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxResourceMgr.java
index cf551b9..34a3c40 100644
--- a/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxResourceMgr.java
+++ b/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxResourceMgr.java
@@ -101,9 +101,10 @@ public class KnoxResourceMgr {
}
final KnoxClient knoxClient = new KnoxConnectionMgr().getKnoxClient(knoxUrl, knoxAdminUser, knoxAdminPassword);
-
- synchronized(knoxClient) {
- resultList = KnoxClient.getKnoxResources(knoxClient, knoxTopologyName, knoxServiceName,knoxTopologyList,knoxServiceList);
+ if ( knoxClient != null) {
+ synchronized(knoxClient) {
+ resultList = KnoxClient.getKnoxResources(knoxClient, knoxTopologyName, knoxServiceName,knoxTopologyList,knoxServiceList);
+ }
}
return resultList;
}
[3/6] incubator-ranger git commit: RANGER-498: added
ranger_credential_helper.py - needed for initial setup
Posted by ma...@apache.org.
RANGER-498: added ranger_credential_helper.py - needed for initial setup
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/ea7f715b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/ea7f715b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/ea7f715b
Branch: refs/heads/tag-policy
Commit: ea7f715bae3a9c96b018b79195c5a7721e79f19d
Parents: 3c22cfa
Author: sneethiraj <sn...@apache.org>
Authored: Wed May 20 17:05:40 2015 -0400
Committer: Madhan Neethiraj <ma...@apache.org>
Committed: Thu May 21 15:50:16 2015 -0700
----------------------------------------------------------------------
src/main/assembly/kms.xml | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/ea7f715b/src/main/assembly/kms.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/kms.xml b/src/main/assembly/kms.xml
index 87d8ea3..0e609ff 100755
--- a/src/main/assembly/kms.xml
+++ b/src/main/assembly/kms.xml
@@ -349,5 +349,10 @@
<destName>enable-kms-plugin.sh</destName>
<fileMode>755</fileMode>
</file>
+ <file>
+ <source>security-admin/scripts/ranger_credential_helper.py</source>
+ <outputDirectory>/</outputDirectory>
+ <fileMode>755</fileMode>
+ </file>
</files>
</assembly>