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 <[email protected]> Authored: Thu Apr 2 16:07:11 2015 -0700 Committer: rmani <[email protected]> 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); }
