You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2017/09/05 06:51:21 UTC
svn commit: r1807316 - in /manifoldcf/trunk: CHANGES.txt
connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java
Author: kwright
Date: Tue Sep 5 06:51:21 2017
New Revision: 1807316
URL: http://svn.apache.org/viewvc?rev=1807316&view=rev
Log:
Fix for CONNECTORS-1445.
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=1807316&r1=1807315&r2=1807316&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Tue Sep 5 06:51:21 2017
@@ -3,6 +3,10 @@ $Id$
======================= 2.9-dev =====================
+CONNECTORS-1455: Eventually skip a locked shared drive file, rather
+than aborting the job.
+(Julien Massiera, Karl Wright)
+
CONNECTORS-1452: The runzookeeper.bat/runzookeeper.sh scripts
were not properly starting zookeeper, because the zookeeper "main
process" uses log4j 1.2.x methods not compatible with the log4j-1.2-api
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=1807316&r1=1807315&r2=1807316&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 Sep 5 06:51:21 2017
@@ -1045,13 +1045,16 @@ public class SharedDriveConnector extend
throw new ServiceInterruption("Timeout or other service interruption: "+cause.getMessage(),cause,currentTime + 300000L,
currentTime + 12 * 60 * 60000L,-1,false);
}
- if (se.getMessage().indexOf("reset by peer") != -1 || se.getMessage().indexOf("busy") != -1 || se.getMessage().toLowerCase(Locale.ROOT).indexOf("file in use") != -1 || se.getMessage().toLowerCase(Locale.ROOT).indexOf("is being used") != -1)
+ if (se.getMessage().indexOf("reset by peer") != -1 ||
+ se.getMessage().indexOf("busy") != -1 ||
+ se.getMessage().toLowerCase(Locale.ROOT).indexOf("file in use") != -1 ||
+ se.getMessage().toLowerCase(Locale.ROOT).indexOf("is being used") != -1)
{
Logging.connectors.warn("JCIFS: 'Busy' response when processing document/directory for "+documentIdentifier+": retrying...",se);
errorCode = se.getClass().getSimpleName().toUpperCase(Locale.ROOT);
errorDesc = "Busy: "+se.getMessage();
throw new ServiceInterruption("Timeout or other service interruption: "+se.getMessage(),se,currentTime + 300000L,
- currentTime + 3 * 60 * 60000L,-1,false);
+ currentTime + 3 * 60 * 60000L,-1,true);
}
else if (se.getMessage().indexOf("handle is invalid") != -1)
{
@@ -1310,12 +1313,14 @@ public class SharedDriveConnector extend
throw new ServiceInterruption("Timeout or other service interruption: "+se.getMessage(),se,currentTime + 300000L,
currentTime + 3 * 60 * 60000L,-1,false);
}
- else if (se.getMessage().toLowerCase(Locale.ROOT).indexOf("busy") != -1 || se.getMessage().toLowerCase(Locale.ROOT).indexOf("file in use") != -1 || se.getMessage().toLowerCase(Locale.ROOT).indexOf("is being used") != -1)
+ else if (se.getMessage().toLowerCase(Locale.ROOT).indexOf("busy") != -1 ||
+ se.getMessage().toLowerCase(Locale.ROOT).indexOf("file in use") != -1 ||
+ se.getMessage().toLowerCase(Locale.ROOT).indexOf("is being used") != -1)
{
Logging.connectors.warn("JCIFS: 'File in Use' response when "+activity+" for "+documentIdentifier+": retrying...",se);
// 'File in Use' skip the document and keep going
throw new ServiceInterruption("Timeout or other service interruption: "+se.getMessage(),se,currentTime + 300000L,
- currentTime + 3 * 60 * 60000L,-1,false);
+ currentTime + 3 * 60 * 60000L,-1,true);
}
else if (se.getMessage().indexOf("cannot find") != -1 || se.getMessage().indexOf("cannot be found") != -1)
{