Author: kwright
Date: Mon Jun 4 17:52:16 2018
New Revision: 1832872
URL: http://svn.apache.org/viewvc?rev=1832872&view=rev
Log:
Fix for CONNECTORS-1507.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1832872&r1=1832871&r2=1832872&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Mon Jun 4 17:52:16 2018
@@ -3,6 +3,10 @@ $Id$
======================= 2.11-dev =====================
+CONNECTORS-1507: Restarting the cluster could leave documents
+that were formerly active in PENDING or PENDINGPURGATORY without
+document priorities.
+
CONNECTORS-1503: Fix for Solr standard update handler
parameter transmission to Solr.
Modified:
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java?rev=1832872&r1=1832871&r2=1832872&view=diff
==============================================================================
---
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java
(original)
+++
manifoldcf/trunk/framework/pull-agent/src/main/java/org/apache/manifoldcf/crawler/jobs/JobQueue.java
Mon Jun 4 17:52:16 2018
@@ -449,6 +449,9 @@ public class JobQueue extends org.apache
list.clear();
map.put(statusField,statusToString(STATUS_PENDING));
map.put(processIDField,null);
+ // This restart is the system one, so make sure that priorities are
generated for records going back to PENDING
+ map.put(needPriorityField,needPriorityToString(NEEDPRIORITY_TRUE));
+ map.put(needPriorityProcessIDField,null);
query = buildConjunctionClause(list,new ClauseDescription[]{
new MultiClause(statusField,new Object[]{
statusToString(STATUS_ACTIVE),
@@ -458,6 +461,9 @@ public class JobQueue extends org.apache
// Map ACTIVEPURGATORY to PENDINGPURGATORY
map.put(statusField,statusToString(STATUS_PENDINGPURGATORY));
map.put(processIDField,null);
+ // This restart is the system one, so make sure that priorities are
generated for records going back to PENDING
+ map.put(needPriorityField,needPriorityToString(NEEDPRIORITY_TRUE));
+ map.put(needPriorityProcessIDField,null);
list.clear();
query = buildConjunctionClause(list,new ClauseDescription[]{
new MultiClause(statusField,new Object[]{
