You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by rm...@apache.org on 2015/04/03 01:07:55 UTC
[1/2] incubator-ranger git commit: Ranger-225:Ranger-LookupResource
and ValidateConfig - Connection Test Failure message issue fix
Repository: incubator-ranger
Updated Branches:
refs/heads/master 399ed34b2 -> 3fae96ce8
Ranger-225:Ranger-LookupResource and ValidateConfig - Connection Test Failure message issue fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/42262d09
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/42262d09
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/42262d09
Branch: refs/heads/master
Commit: 42262d09dddfb5bd4e6706343d6392cc2075a3d9
Parents: be34cc2
Author: rmani <rm...@hortonworks.com>
Authored: Thu Apr 2 16:07:11 2015 -0700
Committer: rmani <rm...@hortonworks.com>
Committed: Thu Apr 2 16:07:11 2015 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/ranger/biz/ServiceMgr.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/42262d09/security-admin/src/main/java/org/apache/ranger/biz/ServiceMgr.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/ServiceMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/ServiceMgr.java
index 4cad883..13756c5 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/ServiceMgr.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/ServiceMgr.java
@@ -30,6 +30,7 @@ import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.ranger.plugin.client.HadoopException;
import org.apache.ranger.plugin.model.RangerService;
import org.apache.ranger.plugin.model.RangerServiceDef;
import org.apache.ranger.plugin.service.RangerBaseService;
@@ -94,8 +95,17 @@ public class ServiceMgr {
ret = generateResponseForTestConn(responseData, "");
} catch (Exception e) {
+ String msg = "Unable to connect repository with given config for " + svc.getServiceName();
+
+ HashMap<String, Object> respData = new HashMap<String, Object>();
+ String message = "";
+ if (e instanceof HadoopException) {
+ respData = ((HadoopException) e).responseData;
+ message = (respData != null && respData.get("message") != null) ? respData.get(
+ "message").toString() : msg;
+ }
+ ret = generateResponseForTestConn(respData, message);
LOG.error("==> ServiceMgr.validateConfig Error:" + e);
- throw e;
} finally {
Thread.currentThread().setContextClassLoader(clsLoader);
}
[2/2] incubator-ranger git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-ranger
Posted by rm...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ranger
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/3fae96ce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/3fae96ce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/3fae96ce
Branch: refs/heads/master
Commit: 3fae96ce8778cb08c3854ca366c1aa96147e22c8
Parents: 42262d0 399ed34
Author: rmani <rm...@hortonworks.com>
Authored: Thu Apr 2 16:07:49 2015 -0700
Committer: rmani <rm...@hortonworks.com>
Committed: Thu Apr 2 16:07:49 2015 -0700
----------------------------------------------------------------------
.../RangerPolicyResourceSignature.java | 19 ++
.../model/validation/RangerPolicyValidator.java | 112 +++++----
.../validation/RangerServiceDefValidator.java | 19 ++
.../ranger/plugin/util/RangerObjectFactory.java | 19 ++
.../service-defs/ranger-servicedef-kafka.json | 112 +++++++++
.../service-defs/ranger-servicedef-solr.json | 13 +-
.../TestRangerPolicyResourceSignature.java | 19 ++
.../validation/TestRangerPolicyValidator.java | 228 +++++++++++-------
.../TestRangerServiceDefValidator.java | 19 ++
plugin-kafka/.gitignore | 1 +
.../conf/ranger-kafka-audit-changes.cfg | 36 +++
plugin-kafka/conf/ranger-kafka-audit.xml | 235 +++++++++++++++++++
.../conf/ranger-kafka-security-changes.cfg | 26 ++
plugin-kafka/conf/ranger-kafka-security.xml | 67 ++++++
.../conf/ranger-policymgr-ssl-changes.cfg | 23 ++
plugin-kafka/conf/ranger-policymgr-ssl.xml | 63 +++++
plugin-kafka/pom.xml | 56 +++++
plugin-kafka/scripts/install.properties | 112 +++++++++
.../scripts/kafka-plugin-install.properties | 23 ++
.../kafka/authorizer/RangerKafkaAuthorizer.java | 33 +++
.../services/kafka/RangerServiceKafka.java | 78 ++++++
.../kafka/client/ServiceKafkaClient.java | 199 ++++++++++++++++
.../kafka/client/ServiceKafkaConnectionMgr.java | 55 +++++
.../services/solr/client/ServiceSolrClient.java | 2 +-
pom.xml | 2 +
.../org/apache/ranger/rest/ServiceREST.java | 10 +-
src/main/assembly/plugin-kafka.xml | 157 +++++++++++++
27 files changed, 1591 insertions(+), 147 deletions(-)
----------------------------------------------------------------------