Repository: ranger Updated Branches: refs/heads/master c5daf83bc -> f01bcf3d0
RANGER-1723: The Ranger doesn't support solr6. In the HttpSolrClient class of solr6, the setMaxRetries function has been removed, which causes ranger to fail to compile. Signed-off-by: peng.jianhua <peng.jian...@zte.com.cn> Project: http://git-wip-us.apache.org/repos/asf/ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/f01bcf3d Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/f01bcf3d Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/f01bcf3d Branch: refs/heads/master Commit: f01bcf3d003500eaa28c1f48b8eac83fb037298a Parents: c5daf83 Author: peng.jianhua <peng.jian...@zte.com.cn> Authored: Thu Aug 3 09:19:46 2017 +0800 Committer: peng.jianhua <peng.jian...@zte.com.cn> Committed: Tue Aug 8 04:03:08 2017 -0400 ---------------------------------------------------------------------- .../org/apache/ranger/audit/provider/solr/SolrAuditProvider.java | 1 - .../java/org/apache/ranger/patch/cliutil/DbToSolrMigrationUtil.java | 1 - security-admin/src/main/java/org/apache/ranger/solr/SolrMgr.java | 1 - 3 files changed, 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ranger/blob/f01bcf3d/agents-audit/src/main/java/org/apache/ranger/audit/provider/solr/SolrAuditProvider.java ---------------------------------------------------------------------- diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/provider/solr/SolrAuditProvider.java b/agents-audit/src/main/java/org/apache/ranger/audit/provider/solr/SolrAuditProvider.java index 3a4da5a..26633fd 100644 --- a/agents-audit/src/main/java/org/apache/ranger/audit/provider/solr/SolrAuditProvider.java +++ b/agents-audit/src/main/java/org/apache/ranger/audit/provider/solr/SolrAuditProvider.java @@ -108,7 +108,6 @@ public class SolrAuditProvider extends AuditDestination { httpSolrClient.setAllowCompression(true); httpSolrClient.setConnectionTimeout(1000); // solrClient.setSoTimeout(10000); - httpSolrClient.setMaxRetries(1); } } catch (Throwable t) { LOG.fatal("Can't connect to Solr server. URL=" http://git-wip-us.apache.org/repos/asf/ranger/blob/f01bcf3d/security-admin/src/main/java/org/apache/ranger/patch/cliutil/DbToSolrMigrationUtil.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/patch/cliutil/DbToSolrMigrationUtil.java b/security-admin/src/main/java/org/apache/ranger/patch/cliutil/DbToSolrMigrationUtil.java index 89d5f4d..3a1f934 100644 --- a/security-admin/src/main/java/org/apache/ranger/patch/cliutil/DbToSolrMigrationUtil.java +++ b/security-admin/src/main/java/org/apache/ranger/patch/cliutil/DbToSolrMigrationUtil.java @@ -435,7 +435,6 @@ public class DbToSolrMigrationUtil extends BaseLoader { .setAllowCompression(true); httpSolrClient .setConnectionTimeout(1000); - httpSolrClient.setMaxRetries(1); httpSolrClient .setRequestWriter(new BinaryRequestWriter()); } http://git-wip-us.apache.org/repos/asf/ranger/blob/f01bcf3d/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 b1f0be4..795b976 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 @@ -144,7 +144,6 @@ public class SolrMgr { httpSolrClient .setConnectionTimeout(1000); // httpSolrClient.setSoTimeout(10000); - httpSolrClient.setMaxRetries(1); httpSolrClient .setRequestWriter(new BinaryRequestWriter()); }
