svn commit: r1861582 - in /manifoldcf/trunk: CHANGES.txt connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java

[kwright]

Author: kwright
Date: Tue Jun 18 15:36:38 2019
New Revision: 1861582

URL: http://svn.apache.org/viewvc?rev=1861582&view=rev
Log:
Fix for CONNECTORS-1612.

Modified:
    manifoldcf/trunk/CHANGES.txt
    
manifoldcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java

Modified: manifoldcf/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1861582&r1=1861581&r2=1861582&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Tue Jun 18 15:36:38 2019
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 2.14-dev =====================
 
+CONNECTORS-1612: JCIFS connector: adopt a single retry with a three-hour wait 
for
+unknown SMB errors.
+(Karl Wright)
+
 CONNECTORS-1609: SharePoint: Treat document fetch 403 and 503 errors as meaning
 insufficient permissions, and skip the document.
 (Karl Wright)

Modified: 
manifoldcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java?rev=1861582&r1=1861581&r2=1861582&view=diff
==============================================================================
--- 
manifoldcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java
 (original)
+++ 
manifoldcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java
 Tue Jun 18 15:36:38 2019
@@ -1130,7 +1130,8 @@ public class SharedDriveConnector extend
               Logging.connectors.error("JCIFS: SmbException tossed processing 
"+documentIdentifier,se);
               errorCode = 
se.getClass().getSimpleName().toUpperCase(Locale.ROOT);
               errorDesc = "Unknown: "+se.getMessage();
-              throw new ManifoldCFException("SmbException tossed: 
"+se.getMessage(),se);
+              throw new ServiceInterruption("Unknown SMBException thrown: 
"+se.getMessage(),se,currentTime + 3 * 60 * 60000L,
+                -1L,1,true);
             }
           }
           catch (IOException e)
@@ -1366,8 +1367,9 @@ public class SharedDriveConnector extend
     }
     else
     {
-      Logging.connectors.error("SmbException thrown "+activity+" for 
"+documentIdentifier,se);
-      throw new ManifoldCFException("SmbException thrown: 
"+se.getMessage(),se);
+      Logging.connectors.error("Unrecognized SmbException thrown "+activity+" 
for "+documentIdentifier,se);
+      throw new ServiceInterruption("Timeout or other service interruption: 
"+se.getMessage(),se,currentTime + 3 * 60 * 60000L,
+        -1,1,true);
     }
   }