AMBARI-18041. Remove default alias support for ranger_audits logs (Hayat Behlim via oleewere)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bac45606 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bac45606 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bac45606 Branch: refs/heads/trunk Commit: bac456060777d7fc9491ddc3005d63c4ed933171 Parents: 9a1719e Author: oleewere <[email protected]> Authored: Fri Aug 5 12:46:16 2016 +0200 Committer: oleewere <[email protected]> Committed: Fri Aug 5 13:57:37 2016 +0200 ---------------------------------------------------------------------- .../org/apache/ambari/logsearch/dao/AuditSolrDao.java | 13 +++++++++---- .../ambari/logsearch/dao/ServiceLogsSolrDao.java | 2 +- .../org/apache/ambari/logsearch/dao/SolrDaoBase.java | 7 +++++-- .../apache/ambari/logsearch/dao/UserConfigSolrDao.java | 2 +- 4 files changed, 16 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/bac45606/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/AuditSolrDao.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/AuditSolrDao.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/AuditSolrDao.java index 98a3cfe..5a56ad7 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/AuditSolrDao.java +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/AuditSolrDao.java @@ -47,8 +47,7 @@ public class AuditSolrDao extends SolrDaoBase { String aliasNameIn = PropertiesUtil.getProperty( "logsearch.solr.audit.logs.alias.name", "audit_logs_alias"); String rangerAuditCollection = PropertiesUtil.getProperty( - "logsearch.ranger.audit.logs.collection.name", "ranger_audits"); - + "logsearch.ranger.audit.logs.collection.name"); String splitInterval = PropertiesUtil.getProperty( "logsearch.audit.logs.split.interval.mins", "none"); String configName = PropertiesUtil.getProperty( @@ -60,9 +59,15 @@ public class AuditSolrDao extends SolrDaoBase { try { connectToSolr(solrUrl, zkConnectString, collection); + boolean createAlias = false; + if (aliasNameIn != null && rangerAuditCollection != null + && rangerAuditCollection.trim().length() > 0) { + createAlias = true; + } + boolean needToPopulateSchemaField = !createAlias; setupCollections(splitInterval, configName, numberOfShards, - replicationFactor); - if(aliasNameIn != null && rangerAuditCollection != null && rangerAuditCollection.trim().length() >0) { + replicationFactor, needToPopulateSchemaField); + if(createAlias) { Collection<String> collectionsIn = new ArrayList<String>(); collectionsIn.add(collection); collectionsIn.add(rangerAuditCollection.trim()); http://git-wip-us.apache.org/repos/asf/ambari/blob/bac45606/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/ServiceLogsSolrDao.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/ServiceLogsSolrDao.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/ServiceLogsSolrDao.java index 8c0f9a6..5aba6d1 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/ServiceLogsSolrDao.java +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/ServiceLogsSolrDao.java @@ -54,7 +54,7 @@ public class ServiceLogsSolrDao extends SolrDaoBase { try { connectToSolr(solrUrl, zkConnectString, collection); setupCollections(splitInterval, configName, numberOfShards, - replicationFactor); + replicationFactor,true); } catch (Exception e) { logger.error( "error while connecting to Solr for service logs : solrUrl=" http://git-wip-us.apache.org/repos/asf/ambari/blob/bac45606/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/SolrDaoBase.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/SolrDaoBase.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/SolrDaoBase.java index 60d7682..672507a 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/SolrDaoBase.java +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/SolrDaoBase.java @@ -219,6 +219,7 @@ public abstract class SolrDaoBase { if( count == collectionListIn.size()) { logger.info("Setup for alias " + aliasNameIn + " is successful. Exiting setup retry thread. Collections=" + collectionListIn); + populateSchemaFields(); break; } } else { @@ -292,7 +293,7 @@ public abstract class SolrDaoBase { } public void setupCollections(final String splitMode, final String configName, - final int numberOfShards, final int replicationFactor) throws Exception { + final int numberOfShards, final int replicationFactor,boolean needToPopulateSchemaField) throws Exception { if (isZkConnectString) { setup_status = createCollectionsIfNeeded(splitMode, configName, numberOfShards, replicationFactor); @@ -334,7 +335,9 @@ public abstract class SolrDaoBase { setupThread.start(); } } - populateSchemaFields(); + if(needToPopulateSchemaField){ + populateSchemaFields(); + } } public boolean createCollectionsIfNeeded(final String splitMode, http://git-wip-us.apache.org/repos/asf/ambari/blob/bac45606/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/UserConfigSolrDao.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/UserConfigSolrDao.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/UserConfigSolrDao.java index cd9fb19..e612475 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/UserConfigSolrDao.java +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/dao/UserConfigSolrDao.java @@ -72,7 +72,7 @@ public class UserConfigSolrDao extends SolrDaoBase { try { connectToSolr(solrUrl, zkConnectString, collection); setupCollections(splitInterval, configName, numberOfShards, - replicationFactor); + replicationFactor,true); intializeLogFeederFilter(); } catch (Exception e) {
