[ranger] branch master updated: RANGER-2811 : Ranger should keep trying to create collection in solr until its successfully created

[madhan]

This is an automated email from the ASF dual-hosted git repository.

madhan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git


The following commit(s) were added to refs/heads/master by this push:
     new 586c856  RANGER-2811 : Ranger should keep trying to create collection 
in solr until its successfully created
586c856 is described below

commit 586c8562043def73ef371e2661c3fccf55a6c6ef
Author: Dhaval B. Shah <dhavalshah9...@gmail.com>
AuthorDate: Tue Apr 28 13:36:28 2020 +0530

    RANGER-2811 : Ranger should keep trying to create collection in solr until 
its successfully created
    
    Signed-off-by: Madhan Neethiraj <mad...@apache.org>
---
 .../server/tomcat/SolrCollectionBootstrapper.java      | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git 
a/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/SolrCollectionBootstrapper.java
 
b/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/SolrCollectionBootstrapper.java
index ce268fd..9e2549e 100644
--- 
a/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/SolrCollectionBootstrapper.java
+++ 
b/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/SolrCollectionBootstrapper.java
@@ -81,7 +81,8 @@ public class SolrCollectionBootstrapper extends Thread {
        public static final String DEFAULT_CONFIG_NAME = "ranger_audits";
        public static final String DEFAULT_SERVICE_NAME = "rangeradmin";
        public static final long DEFAULT_SOLR_TIME_INTERVAL_MS = 60000L;
-       public static final int DEFAULT_SOLR_BOOTSTRP_MAX_RETRY  = 30;
+       private static final int TRY_UNTIL_SUCCESS  = -1;
+       public static final int DEFAULT_SOLR_BOOTSTRP_MAX_RETRY  = 
TRY_UNTIL_SUCCESS;
        private static final String CONFIG_FILE = "ranger-admin-site.xml";
        private static final String CORE_SITE_CONFIG_FILENAME = "core-site.xml";
        private static final String DEFAULT_CONFIG_FILENAME = 
"ranger-admin-default-site.xml";
@@ -190,7 +191,7 @@ public class SolrCollectionBootstrapper extends Thread {
                                                h -> 
h.equalsIgnoreCase("none"))) {
                        logger.info("Solr zkHosts=" + zkHosts + ", 
collectionName="
                                        + solr_collection_name);
-                       while (!is_completed && retry_counter < max_retry) {
+                       while (!is_completed && (max_retry == TRY_UNTIL_SUCCESS 
|| retry_counter < max_retry)) {
                                try {
                                        if (connect(zookeeperHosts)) {
                                                if (solr_cloud_mode) {
@@ -331,11 +332,14 @@ public class SolrCollectionBootstrapper extends Thread {
 
        private void logErrorMessageAndWait(String msg, Exception exception) {
                retry_counter++;
-               String attempMessage = (retry_counter == max_retry) ? ("Maximum 
attempts reached for setting up Solr.")
-                               : ("[retrying after " + time_interval
-                                               + " ms]. No. of attempts left : 
"
-                                               + (max_retry - retry_counter)
-                                               + " . Maximum attempts : " + 
max_retry);
+               String attempMessage;
+               if (max_retry != TRY_UNTIL_SUCCESS) {
+                       attempMessage = (retry_counter == max_retry) ? 
("Maximum attempts reached for setting up Solr.")
+                                       : ("[retrying after " + time_interval + 
" ms]. No. of attempts left : "
+                                                       + (max_retry - 
retry_counter) + " . Maximum attempts : " + max_retry);
+               } else {
+                       attempMessage = "[retrying after " + time_interval + " 
ms]";
+               }
                StringBuilder errorBuilder = new StringBuilder();
                errorBuilder.append(msg);
                if (exception != null) {