svn commit: r924945 - in /lucene/nutch/trunk: CHANGES.txt src/java/org/apache/nutch/searcher/DistributedSearchBean.java src/java/org/apache/nutch/searcher/LuceneSearchBean.java

[ab]

Author: ab
Date: Thu Mar 18 18:44:45 2010
New Revision: 924945

URL: http://svn.apache.org/viewvc?rev=924945&view=rev
Log:
NUTCH-796  Zero results problems difficult to troubleshoot due to lack of 
logging.

Modified:
    lucene/nutch/trunk/CHANGES.txt
    
lucene/nutch/trunk/src/java/org/apache/nutch/searcher/DistributedSearchBean.java
    lucene/nutch/trunk/src/java/org/apache/nutch/searcher/LuceneSearchBean.java

Modified: lucene/nutch/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/lucene/nutch/trunk/CHANGES.txt?rev=924945&r1=924944&r2=924945&view=diff
==============================================================================
--- lucene/nutch/trunk/CHANGES.txt (original)
+++ lucene/nutch/trunk/CHANGES.txt Thu Mar 18 18:44:45 2010
@@ -2,6 +2,8 @@ Nutch Change Log
 
 Unreleased Changes
 
+* NUTCH-796 Zero results problems difficult to troubleshoot due to lack of 
logging (ab)
+
 * NUTCH-801 Remove RTF and MP3 parse plugins (jnioche)
 
 * NUTCH-798 Upgrade to SOLR1.4 and its dependencies (jnioche)

Modified: 
lucene/nutch/trunk/src/java/org/apache/nutch/searcher/DistributedSearchBean.java
URL: 
http://svn.apache.org/viewvc/lucene/nutch/trunk/src/java/org/apache/nutch/searcher/DistributedSearchBean.java?rev=924945&r1=924944&r2=924945&view=diff
==============================================================================
--- 
lucene/nutch/trunk/src/java/org/apache/nutch/searcher/DistributedSearchBean.java
 (original)
+++ 
lucene/nutch/trunk/src/java/org/apache/nutch/searcher/DistributedSearchBean.java
 Thu Mar 18 18:44:45 2010
@@ -140,12 +140,17 @@ public class DistributedSearchBean imple
     List<SearchBean> beanList = new ArrayList<SearchBean>();
 
     if (fs.exists(luceneConfig)) {
+      LOG.info("Adding Nutch searchers in " +
+              luceneConfig.makeQualified(fs).toUri());
       addLuceneBeans(beanList, luceneConfig, conf);
     }
 
     if (fs.exists(solrConfig)) {
+      LOG.info("Adding Solr searchers in " +
+              solrConfig.makeQualified(fs).toUri());
       addSolrBeans(beanList, solrConfig, conf);
     }
+    LOG.info("Added " + beanList.size() + " remote searchers.");
 
     beans = beanList.toArray(new SearchBean[beanList.size()]);
 

Modified: 
lucene/nutch/trunk/src/java/org/apache/nutch/searcher/LuceneSearchBean.java
URL: 
http://svn.apache.org/viewvc/lucene/nutch/trunk/src/java/org/apache/nutch/searcher/LuceneSearchBean.java?rev=924945&r1=924944&r2=924945&view=diff
==============================================================================
--- lucene/nutch/trunk/src/java/org/apache/nutch/searcher/LuceneSearchBean.java 
(original)
+++ lucene/nutch/trunk/src/java/org/apache/nutch/searcher/LuceneSearchBean.java 
Thu Mar 18 18:44:45 2010
@@ -53,12 +53,19 @@ public class LuceneSearchBean implements
 
   private void init(Path indexDir, Path indexesDir)
   throws IOException {
+    Path absIndexDir = indexDir.makeQualified(indexDir.getFileSystem(conf));
+    Path absIndexesDir = 
indexesDir.makeQualified(indexesDir.getFileSystem(conf));
     if (this.fs.exists(indexDir)) {
-      LOG.info("opening merged index in " + indexDir);
+      LOG.info("opening merged index in " + absIndexDir.toUri());
       this.searcher = new IndexSearcher(indexDir, this.conf);
     } else {
-      LOG.info("opening indexes in " + indexesDir);
-
+      if (!this.fs.exists(indexesDir)) {
+        // should throw exception ?
+        LOG.warn("Neither " + absIndexDir.toUri() + " nor " +
+                absIndexesDir.toUri() + " found!");
+      } else {
+        LOG.info("opening indexes in " + absIndexesDir.toUri());
+      }
       List<Path> vDirs = new ArrayList<Path>();
       FileStatus[] fstats = fs.listStatus(indexesDir, 
HadoopFSUtil.getPassDirectoriesFilter(fs));
       Path[] directories = HadoopFSUtil.getPaths(fstats);