Author: kwright
Date: Tue Jan 13 12:43:04 2015
New Revision: 1651332
URL: http://svn.apache.org/r1651332
Log:
Fix for CONNECTORS-1122.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobResetThread.java
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartupThread.java
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1651332&r1=1651331&r2=1651332&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Tue Jan 13 12:43:04 2015
@@ -3,6 +3,12 @@ $Id$
======================= 2.1-dev =====================
+CONNECTORS-1122: Don't reprioritize documents on job start/resume.
+For jobs which share bins with other jobs, this may mean that no
+documents will be processed until the entire current queue of the
+other job is completed, but this is deemed to be a rare situation.
+(Karl Wright)
+
CONNECTORS-1139: Add support for interruptible throttlers.
(Karl Wright)
Modified:
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobResetThread.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobResetThread.java?rev=1651332&r1=1651331&r2=1651332&view=diff
==============================================================================
---
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobResetThread.java
(original)
+++
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/JobResetThread.java
Tue Jan 13 12:43:04 2015
@@ -79,7 +79,7 @@ public class JobResetThread extends Thre
// not predicted by the algorithm that assigned those priorities.
This is, of course, quite expensive,
// but it cannot be helped (at least, I cannot find a way to avoid
it).
//
- if (jobStops.size() > 0 || jobResumes.size() > 0)
+ if (jobStops.size() > 0)
{
Logging.threads.debug("Job reset thread reprioritizing
documents...");
Modified:
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartupThread.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartupThread.java?rev=1651332&r1=1651331&r2=1651332&view=diff
==============================================================================
---
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartupThread.java
(original)
+++
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/system/StartupThread.java
Tue Jan 13 12:43:04 2015
@@ -139,8 +139,6 @@ public class StartupThread extends Threa
model,jobType ==
IJobDescription.TYPE_CONTINUOUS,lastSeedingVersion == null,
requestMinimum);
-
ManifoldCF.resetAllDocumentPriorities(threadContext,processID);
-
if (Logging.threads.isDebugEnabled())
Logging.threads.debug("Prepared job "+jobID.toString()+"
for execution.");
