[24/50] [abbrv] ambari git commit: AMBARI-21623 ADDENDUM Log Search Config should be separated into a Server and Log Feeder interface (mgergely)

2017-08-10 Thread ababiichuk
AMBARI-21623 ADDENDUM Log Search Config should be separated into a Server and 
Log Feeder interface (mgergely)

Change-Id: I9e4c00c38ff3fc17852e589e88067fae911e1a53


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/afa1b488
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/afa1b488
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/afa1b488

Branch: refs/heads/branch-feature-logsearch-ui
Commit: afa1b488c1118b7f54da97cd611a317c3d385a3a
Parents: aa9e16d
Author: Miklos Gergely 
Authored: Sun Aug 6 14:23:22 2017 +0200
Committer: Miklos Gergely 
Committed: Sun Aug 6 14:23:46 2017 +0200

--
 .../ambari/logsearch/configurer/SolrCollectionConfigurer.java  | 1 +
 .../main/java/org/apache/ambari/logsearch/dao/AuditSolrDao.java| 1 -
 .../java/org/apache/ambari/logsearch/dao/ServiceLogsSolrDao.java   | 1 -
 .../src/main/java/org/apache/ambari/logsearch/dao/SolrDaoBase.java | 2 +-
 .../apache/ambari/logsearch/handler/CreateCollectionHandler.java   | 1 -
 5 files changed, 2 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/afa1b488/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java
 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java
index ff828a3..7b67482 100644
--- 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java
+++ 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java
@@ -219,6 +219,7 @@ public class SolrCollectionConfigurer implements Configurer 
{
   boolean reloadCollectionNeeded) {
 try {
   List allCollectionList = new 
ListCollectionHandler().handle(solrClient, null);
+  solrDaoBase.waitForLogSearchConfig();
   CreateCollectionHandler handler = new 
CreateCollectionHandler(solrDaoBase.getLogSearchConfig(), allCollectionList);
   boolean collectionCreated = handler.handle(solrClient, solrPropsConfig);
   boolean collectionReloaded = true;

http://git-wip-us.apache.org/repos/asf/ambari/blob/afa1b488/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/AuditSolrDao.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/AuditSolrDao.java
 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/AuditSolrDao.java
index 4142176..3eea08f 100644
--- 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/AuditSolrDao.java
+++ 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/AuditSolrDao.java
@@ -69,7 +69,6 @@ public class AuditSolrDao extends SolrDaoBase {
 String rangerAuditCollection = 
solrAuditLogPropsConfig.getRangerCollection();
 
 try {
-  waitForLogSearchConfig();
   new SolrCollectionConfigurer(this, true).start();
   boolean createAlias = (aliasNameIn != null && 
StringUtils.isNotBlank(rangerAuditCollection));
   if (createAlias) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/afa1b488/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/ServiceLogsSolrDao.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/ServiceLogsSolrDao.java
 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/ServiceLogsSolrDao.java
index 0752ac0..308ef1f 100644
--- 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/ServiceLogsSolrDao.java
+++ 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/ServiceLogsSolrDao.java
@@ -65,7 +65,6 @@ public class ServiceLogsSolrDao extends SolrDaoBase {
   public void postConstructor() {
 LOG.info("postConstructor() called.");
 try {
-  waitForLogSearchConfig();
   new SolrCollectionConfigurer(this, true).start();
 } catch (Exception e) {
   LOG.error("error while connecting to Solr for service logs : solrUrl=" + 
solrServiceLogPropsConfig.getSolrUrl()


[36/52] [abbrv] ambari git commit: AMBARI-21623 ADDENDUM Log Search Config should be separated into a Server and Log Feeder interface (mgergely)

2017-08-09 Thread jluniya
AMBARI-21623 ADDENDUM Log Search Config should be separated into a Server and 
Log Feeder interface (mgergely)

Change-Id: I9e4c00c38ff3fc17852e589e88067fae911e1a53


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/afa1b488
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/afa1b488
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/afa1b488

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: afa1b488c1118b7f54da97cd611a317c3d385a3a
Parents: aa9e16d
Author: Miklos Gergely 
Authored: Sun Aug 6 14:23:22 2017 +0200
Committer: Miklos Gergely 
Committed: Sun Aug 6 14:23:46 2017 +0200

--
 .../ambari/logsearch/configurer/SolrCollectionConfigurer.java  | 1 +
 .../main/java/org/apache/ambari/logsearch/dao/AuditSolrDao.java| 1 -
 .../java/org/apache/ambari/logsearch/dao/ServiceLogsSolrDao.java   | 1 -
 .../src/main/java/org/apache/ambari/logsearch/dao/SolrDaoBase.java | 2 +-
 .../apache/ambari/logsearch/handler/CreateCollectionHandler.java   | 1 -
 5 files changed, 2 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/afa1b488/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java
 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java
index ff828a3..7b67482 100644
--- 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java
+++ 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java
@@ -219,6 +219,7 @@ public class SolrCollectionConfigurer implements Configurer 
{
   boolean reloadCollectionNeeded) {
 try {
   List allCollectionList = new 
ListCollectionHandler().handle(solrClient, null);
+  solrDaoBase.waitForLogSearchConfig();
   CreateCollectionHandler handler = new 
CreateCollectionHandler(solrDaoBase.getLogSearchConfig(), allCollectionList);
   boolean collectionCreated = handler.handle(solrClient, solrPropsConfig);
   boolean collectionReloaded = true;

http://git-wip-us.apache.org/repos/asf/ambari/blob/afa1b488/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/AuditSolrDao.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/AuditSolrDao.java
 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/AuditSolrDao.java
index 4142176..3eea08f 100644
--- 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/AuditSolrDao.java
+++ 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/AuditSolrDao.java
@@ -69,7 +69,6 @@ public class AuditSolrDao extends SolrDaoBase {
 String rangerAuditCollection = 
solrAuditLogPropsConfig.getRangerCollection();
 
 try {
-  waitForLogSearchConfig();
   new SolrCollectionConfigurer(this, true).start();
   boolean createAlias = (aliasNameIn != null && 
StringUtils.isNotBlank(rangerAuditCollection));
   if (createAlias) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/afa1b488/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/ServiceLogsSolrDao.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/ServiceLogsSolrDao.java
 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/ServiceLogsSolrDao.java
index 0752ac0..308ef1f 100644
--- 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/ServiceLogsSolrDao.java
+++ 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/ServiceLogsSolrDao.java
@@ -65,7 +65,6 @@ public class ServiceLogsSolrDao extends SolrDaoBase {
   public void postConstructor() {
 LOG.info("postConstructor() called.");
 try {
-  waitForLogSearchConfig();
   new SolrCollectionConfigurer(this, true).start();
 } catch (Exception e) {
   LOG.error("error while connecting to Solr for service logs : solrUrl=" + 
solrServiceLogPropsConfig.getSolrUrl()


[31/50] [abbrv] ambari git commit: AMBARI-21623 ADDENDUM Log Search Config should be separated into a Server and Log Feeder interface (mgergely)

2017-08-08 Thread lpuskas
AMBARI-21623 ADDENDUM Log Search Config should be separated into a Server and 
Log Feeder interface (mgergely)

Change-Id: I9e4c00c38ff3fc17852e589e88067fae911e1a53


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/afa1b488
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/afa1b488
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/afa1b488

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: afa1b488c1118b7f54da97cd611a317c3d385a3a
Parents: aa9e16d
Author: Miklos Gergely 
Authored: Sun Aug 6 14:23:22 2017 +0200
Committer: Miklos Gergely 
Committed: Sun Aug 6 14:23:46 2017 +0200

--
 .../ambari/logsearch/configurer/SolrCollectionConfigurer.java  | 1 +
 .../main/java/org/apache/ambari/logsearch/dao/AuditSolrDao.java| 1 -
 .../java/org/apache/ambari/logsearch/dao/ServiceLogsSolrDao.java   | 1 -
 .../src/main/java/org/apache/ambari/logsearch/dao/SolrDaoBase.java | 2 +-
 .../apache/ambari/logsearch/handler/CreateCollectionHandler.java   | 1 -
 5 files changed, 2 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/afa1b488/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java
 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java
index ff828a3..7b67482 100644
--- 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java
+++ 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java
@@ -219,6 +219,7 @@ public class SolrCollectionConfigurer implements Configurer 
{
   boolean reloadCollectionNeeded) {
 try {
   List allCollectionList = new 
ListCollectionHandler().handle(solrClient, null);
+  solrDaoBase.waitForLogSearchConfig();
   CreateCollectionHandler handler = new 
CreateCollectionHandler(solrDaoBase.getLogSearchConfig(), allCollectionList);
   boolean collectionCreated = handler.handle(solrClient, solrPropsConfig);
   boolean collectionReloaded = true;

http://git-wip-us.apache.org/repos/asf/ambari/blob/afa1b488/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/AuditSolrDao.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/AuditSolrDao.java
 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/AuditSolrDao.java
index 4142176..3eea08f 100644
--- 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/AuditSolrDao.java
+++ 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/AuditSolrDao.java
@@ -69,7 +69,6 @@ public class AuditSolrDao extends SolrDaoBase {
 String rangerAuditCollection = 
solrAuditLogPropsConfig.getRangerCollection();
 
 try {
-  waitForLogSearchConfig();
   new SolrCollectionConfigurer(this, true).start();
   boolean createAlias = (aliasNameIn != null && 
StringUtils.isNotBlank(rangerAuditCollection));
   if (createAlias) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/afa1b488/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/ServiceLogsSolrDao.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/ServiceLogsSolrDao.java
 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/ServiceLogsSolrDao.java
index 0752ac0..308ef1f 100644
--- 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/ServiceLogsSolrDao.java
+++ 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/ServiceLogsSolrDao.java
@@ -65,7 +65,6 @@ public class ServiceLogsSolrDao extends SolrDaoBase {
   public void postConstructor() {
 LOG.info("postConstructor() called.");
 try {
-  waitForLogSearchConfig();
   new SolrCollectionConfigurer(this, true).start();
 } catch (Exception e) {
   LOG.error("error while connecting to Solr for service logs : solrUrl=" + 
solrServiceLogPropsConfig.getSolrUrl()


ambari git commit: AMBARI-21623 ADDENDUM Log Search Config should be separated into a Server and Log Feeder interface (mgergely)

2017-08-06 Thread mgergely
Repository: ambari
Updated Branches:
  refs/heads/trunk aa9e16d89 -> afa1b488c


AMBARI-21623 ADDENDUM Log Search Config should be separated into a Server and 
Log Feeder interface (mgergely)

Change-Id: I9e4c00c38ff3fc17852e589e88067fae911e1a53


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/afa1b488
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/afa1b488
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/afa1b488

Branch: refs/heads/trunk
Commit: afa1b488c1118b7f54da97cd611a317c3d385a3a
Parents: aa9e16d
Author: Miklos Gergely 
Authored: Sun Aug 6 14:23:22 2017 +0200
Committer: Miklos Gergely 
Committed: Sun Aug 6 14:23:46 2017 +0200

--
 .../ambari/logsearch/configurer/SolrCollectionConfigurer.java  | 1 +
 .../main/java/org/apache/ambari/logsearch/dao/AuditSolrDao.java| 1 -
 .../java/org/apache/ambari/logsearch/dao/ServiceLogsSolrDao.java   | 1 -
 .../src/main/java/org/apache/ambari/logsearch/dao/SolrDaoBase.java | 2 +-
 .../apache/ambari/logsearch/handler/CreateCollectionHandler.java   | 1 -
 5 files changed, 2 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/afa1b488/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java
 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java
index ff828a3..7b67482 100644
--- 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java
+++ 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/configurer/SolrCollectionConfigurer.java
@@ -219,6 +219,7 @@ public class SolrCollectionConfigurer implements Configurer 
{
   boolean reloadCollectionNeeded) {
 try {
   List allCollectionList = new 
ListCollectionHandler().handle(solrClient, null);
+  solrDaoBase.waitForLogSearchConfig();
   CreateCollectionHandler handler = new 
CreateCollectionHandler(solrDaoBase.getLogSearchConfig(), allCollectionList);
   boolean collectionCreated = handler.handle(solrClient, solrPropsConfig);
   boolean collectionReloaded = true;

http://git-wip-us.apache.org/repos/asf/ambari/blob/afa1b488/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/AuditSolrDao.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/AuditSolrDao.java
 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/AuditSolrDao.java
index 4142176..3eea08f 100644
--- 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/AuditSolrDao.java
+++ 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/AuditSolrDao.java
@@ -69,7 +69,6 @@ public class AuditSolrDao extends SolrDaoBase {
 String rangerAuditCollection = 
solrAuditLogPropsConfig.getRangerCollection();
 
 try {
-  waitForLogSearchConfig();
   new SolrCollectionConfigurer(this, true).start();
   boolean createAlias = (aliasNameIn != null && 
StringUtils.isNotBlank(rangerAuditCollection));
   if (createAlias) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/afa1b488/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/ServiceLogsSolrDao.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/ServiceLogsSolrDao.java
 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/ServiceLogsSolrDao.java
index 0752ac0..308ef1f 100644
--- 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/ServiceLogsSolrDao.java
+++ 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/dao/ServiceLogsSolrDao.java
@@ -65,7 +65,6 @@ public class ServiceLogsSolrDao extends SolrDaoBase {
   public void postConstructor() {
 LOG.info("postConstructor() called.");
 try {
-  waitForLogSearchConfig();
   new SolrCollectionConfigurer(this, true).start();
 } catch (Exception e) {
   LOG.error("error while connecting to Solr for service logs : solrUrl=" + 
solrServiceLogPropsConfig.getSolrUrl()