svn commit: r1593901 - in /nutch/trunk: CHANGES.txt src/java/org/apache/nutch/crawl/Generator.java

[jnioche]

Author: jnioche
Date: Mon May 12 07:59:01 2014
New Revision: 1593901

URL: http://svn.apache.org/r1593901
Log:
NUTCH-1766

Modified:
    nutch/trunk/CHANGES.txt
    nutch/trunk/src/java/org/apache/nutch/crawl/Generator.java

Modified: nutch/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/nutch/trunk/CHANGES.txt?rev=1593901&r1=1593900&r2=1593901&view=diff
==============================================================================
--- nutch/trunk/CHANGES.txt (original)
+++ nutch/trunk/CHANGES.txt Mon May 12 07:59:01 2014
@@ -2,6 +2,8 @@ Nutch Change Log
 
 Nutch Current Development
 
+* NUTCH-1766 Generator to unlock crawldb and remove tempdir if generate job 
fails (Diaa via jnioche)
+
 * NUTCH-207 Bandwidth target for fetcher rather than a thread count (jnioche)
 
 * NUTCH-1182 fetcher to log hung threads (snagel)

Modified: nutch/trunk/src/java/org/apache/nutch/crawl/Generator.java
URL: 
http://svn.apache.org/viewvc/nutch/trunk/src/java/org/apache/nutch/crawl/Generator.java?rev=1593901&r1=1593900&r2=1593901&view=diff
==============================================================================
--- nutch/trunk/src/java/org/apache/nutch/crawl/Generator.java (original)
+++ nutch/trunk/src/java/org/apache/nutch/crawl/Generator.java Mon May 12 
07:59:01 2014
@@ -547,6 +547,8 @@ public class Generator extends Configure
     try {
       JobClient.runJob(job);
     } catch (IOException e) {
+      LockUtil.removeLockFile(fs, lock);
+      fs.delete(tempDir, true);
       throw e;
     }