svn commit: r1349378 - in /lucene/dev/trunk/solr/core/src/java/org/apache/solr: core/SolrCore.java handler/SnapPuller.java

[yo...@apache.org]

Author: yonik
Date: Tue Jun 12 14:48:16 2012
New Revision: 1349378

URL: http://svn.apache.org/viewvc?rev=1349378&view=rev
Log:
logging: improve replication logging

Modified:
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java?rev=1349378&r1=1349377&r2=1349378&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrCore.java Tue Jun 12 14:48:16 2012
@@ -209,8 +209,14 @@ public final class SolrCore implements S
           result = dataDir + s;
       }
     }
+    if (!result.equals(lastNewIndexDir)) {
+      log.warn("New index directory detected: old="+lastNewIndexDir + " new=" + result);
+    }
+    lastNewIndexDir = result;
     return result;
   }
+  private String lastNewIndexDir; // for debugging purposes only... access not synchronized, but that's ok
+
   
   public DirectoryFactory getDirectoryFactory() {
     return directoryFactory;

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java?rev=1349378&r1=1349377&r2=1349378&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SnapPuller.java Tue Jun 12 14:48:16 2012
@@ -341,6 +341,7 @@ public class SnapPuller {
       File tmpIndexDir = createTempindexDir(core);
       if (isIndexStale())
         isFullCopyNeeded = true;
+      LOG.info("Starting download to " + tmpIndexDir + " fullCopy=" + isFullCopyNeeded);
       successfulInstall = false;
       boolean deleteTmpIdxDir = true;
       File indexDir = null ;
@@ -387,8 +388,13 @@ public class SnapPuller {
       } catch (Exception e) {
         throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Index fetch failed : ", e);
       } finally {
-        if (deleteTmpIdxDir) delTree(tmpIndexDir);
-        else delTree(indexDir);
+        if (deleteTmpIdxDir) {
+          LOG.info("removing temporary index download directory " + tmpIndexDir);
+          delTree(tmpIndexDir);
+        } else {
+          LOG.info("removing old index directory " + indexDir);
+          delTree(indexDir);
+        }
       }
     } finally {
       if (!successfulInstall) {
@@ -606,8 +612,9 @@ public class SnapPuller {
    * @param latestGeneration         the version number
    */
   private void downloadIndexFiles(boolean downloadCompleteIndex, File tmpIdxDir, long latestGeneration) throws Exception {
+    String indexDir = solrCore.getIndexDir();
     for (Map<String, Object> file : filesToDownload) {
-      File localIndexFile = new File(solrCore.getIndexDir(), (String) file.get(NAME));
+      File localIndexFile = new File(indexDir, (String) file.get(NAME));
       if (!localIndexFile.exists() || downloadCompleteIndex) {
         fileFetcher = new FileFetcher(tmpIdxDir, file, (String) file.get(NAME), false, latestGeneration);
         currentFile = file;
@@ -742,7 +749,7 @@ public class SnapPuller {
    * If the index is stale by any chance, load index from a different dir in the data dir.
    */
   private boolean modifyIndexProps(String tmpIdxDirName) {
-    LOG.info("New index installed. Updating index properties...");
+    LOG.info("New index installed. Updating index properties... index="+tmpIdxDirName);
     File idxprops = new File(solrCore.getDataDir() + "index.properties");
     Properties p = new Properties();
     if (idxprops.exists()) {