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 2016/04/17 21:45:50 UTC
svn commit: r1739641 - in /manifoldcf/trunk: ./
connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/
framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/
Author: kwright
Date: Sun Apr 17 19:45:50 2016
New Revision: 1739641
URL: http://svn.apache.org/viewvc?rev=1739641&view=rev
Log:
Fix for CONNECTORS-1297.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/connectors/jcifs/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/sharedrive/SharedDriveConnector.java
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Jobs.java
Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1739641&r1=1739640&r2=1739641&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Sun Apr 17 19:45:50 2016
@@ -3,6 +3,9 @@ $Id$
======================= 2.5-dev =====================
+CONNECTORS-1297: Detect symlink in JCifs connector and explicitly
+skip in that case.
+(Konstantin Avdeev, Karl Wright)
======================= Release 2.4 =====================
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=1739641&r1=1739640&r2=1739641&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 Sun Apr 17 19:45:50 2016
@@ -2305,7 +2305,11 @@ public class SharedDriveConnector extend
if (te.getRootCause() != null && te.getRootCause() instanceof java.lang.InterruptedException)
throw e;
}
-
+ if (e.getMessage().equals("0x8000002D")) {
+ // Symlink
+ Logging.connectors.warn("JCIFS: Symlink detected: "+file);
+ return new SmbFile[0];
+ }
Logging.connectors.warn("JCIFS: Possibly transient exception detected on attempt "+Integer.toString(totalTries)+" while listing files: "+e.getMessage(),e);
if (currentException != null)
{
Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java?rev=1739641&r1=1739640&r2=1739641&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java (original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobManager.java Sun Apr 17 19:45:50 2016
@@ -6005,6 +6005,7 @@ public class JobManager implements IJobM
matchTime = thisMatchTime;
duration = thisDuration;
requestMinimum = sr.getRequestMinimum();
+ System.out.println("Scheduled job start; requestMinimum = "+requestMinimum);
}
}
@@ -6034,6 +6035,7 @@ public class JobManager implements IJobM
// If job was formerly "inactive", do the full startup.
// Start this job! but with no end time.
// This does not get logged because the startup thread does the logging.
+ System.out.println("Starting job with requestMinimum = "+requestMinimum);
jobs.startJob(jobID,windowEnd,requestMinimum);
jobQueue.clearFailTimes(jobID);
Logging.jobs.info("Signalled for job start for job "+jobID);
@@ -7213,6 +7215,7 @@ public class JobManager implements IJobM
failRetryCount = (int)failRetryCountLong.longValue();
boolean requestMinimum = (status == jobs.STATUS_READYFORSTARTUPMINIMAL);
+ System.out.println("When starting the job, requestMinimum = "+requestMinimum);
// Mark status of job as "starting"
jobs.writeTransientStatus(jobID,requestMinimum?jobs.STATUS_STARTINGUPMINIMAL:jobs.STATUS_STARTINGUP,processID);
Modified: manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Jobs.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Jobs.java?rev=1739641&r1=1739640&r2=1739641&view=diff
==============================================================================
--- manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Jobs.java (original)
+++ manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/Jobs.java Sun Apr 17 19:45:50 2016
@@ -978,8 +978,12 @@ public class Jobs extends org.apache.man
if (isSame)
isSame = hopFilterManager.compareRows(id,jobDescription);
- if (!isSame)
+ if (!isSame) {
+ System.out.println("Setting version field to null");
values.put(seedingVersionField,null);
+ } else {
+ System.out.println("NOT setting version field to null");
+ }
params.clear();
query = buildConjunctionClause(params,new ClauseDescription[]{