From 8c7c6890ad6e6a439975ebfaa19249888f1ee7cb Mon Sep 17 00:00:00 2001
From: Yonik Seeley <yonik@apache.org>
Date: Sun, 4 Mar 2012 17:23:38 +0000
Subject: [PATCH] logging: improve for RecoveryStrategy

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1296839 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/solr/cloud/RecoveryStrategy.java   | 29 +++++++++----------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java b/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
index 9d1ded99f6a..a8c08567d51 100644
--- a/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
+++ b/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java
@@ -201,7 +201,9 @@ public class RecoveryStrategy extends Thread implements SafeStopThread {
     SolrQueryRequest req = new LocalSolrQueryRequest(core, new ModifiableSolrParams());
     SolrQueryResponse rsp = new SolrQueryResponse();
     SolrRequestInfo.setRequestInfo(new SolrRequestInfo(req, rsp));
-    
+
+    log.info("Starting recovery process. recoveringAfterStartup=" + recoveringAfterStartup);
+
     try {
       doRecovery(core);
     } finally {
@@ -247,11 +249,10 @@ public class RecoveryStrategy extends Thread implements SafeStopThread {
 
       if (oldIdx > 0) {
         log.info("####### Found new versions added after startup: num=" + oldIdx);
+        log.info("###### currentVersions=" + startingRecentVersions);
       }
 
-      // TODO: only log at debug level in the future (or move to oldIdx > 0 block)
       log.info("###### startupVersions=" + reallyStartingVersions);
-      log.info("###### currentVersions=" + startingRecentVersions);
     }
     
     if (recoveringAfterStartup) {
@@ -355,7 +356,7 @@ public class RecoveryStrategy extends Thread implements SafeStopThread {
           log.warn("Recovery was interrupted", e);
           retries = INTERRUPTED;
         } catch (Throwable t) {
-          SolrException.log(log, "Error while trying to recover", t);
+          log.error("Error while trying to recover", t);
         } finally {
           if (!replayed) {
             try {
@@ -368,11 +369,9 @@ public class RecoveryStrategy extends Thread implements SafeStopThread {
         }
         
       } catch (Throwable t) {
-        SolrException.log(log, "Error while trying to recover", t);
+        log.error("Error while trying to recover... closing core.", t);
       } finally {
-        if (core != null) {
-          core.close();
-        }
+        core.close();
       }
       
       if (!successfulRecovery) {
@@ -381,21 +380,20 @@ public class RecoveryStrategy extends Thread implements SafeStopThread {
         // Or do a fall off retry...
         try {
           
-          SolrException.log(log, "Recovery failed - trying again...");
+          log.error("Recovery failed - trying again...");
           retries++;
           if (retries >= MAX_RETRIES) {
             if (retries == INTERRUPTED) {
               
             } else {
+              log.error("Recovery failed - max retries exceeded.");
               // TODO: for now, give up after X tries - should we do more?
               core = cc.getCore(coreName);
               try {
                 recoveryFailed(core, zkController, baseUrl, coreZkNodeName,
                     core.getCoreDescriptor());
               } finally {
-                if (core != null) {
-                  core.close();
-                }
+                core.close();
               }
             }
             break;
@@ -413,11 +411,10 @@ public class RecoveryStrategy extends Thread implements SafeStopThread {
           retries = INTERRUPTED;
         }
       }
-    
-      
-      log.info("Finished recovery process");
-      
+
     }
+    log.info("Finished recovery process");
+
   }
 
   private Future<RecoveryInfo> replay(UpdateLog ulog)