From 798cab080c52a2604d4554077d0ca3a02c9c67bf Mon Sep 17 00:00:00 2001 From: Mark Rogers Date: Sat, 20 Sep 2014 10:32:41 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 85044: Merged PLATFORM1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud) 84314: ACE-1037: SOLR 4 - Information server implementation - the rest - report and checking index git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@85359 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../java/org/alfresco/solr/TrackerState.java | 72 +++++++++++++++---- .../solr/tracker/IndexHealthReport.java | 13 ++-- .../solr/client/SOLRAPIClientFactoryTest.java | 4 +- 3 files changed, 66 insertions(+), 23 deletions(-) diff --git a/search-services/alfresco-solrclient-lib/source/java/org/alfresco/solr/TrackerState.java b/search-services/alfresco-solrclient-lib/source/java/org/alfresco/solr/TrackerState.java index 631276ce2..a532221f9 100644 --- a/search-services/alfresco-solrclient-lib/source/java/org/alfresco/solr/TrackerState.java +++ b/search-services/alfresco-solrclient-lib/source/java/org/alfresco/solr/TrackerState.java @@ -16,8 +16,8 @@ * You should have received a copy of the GNU Lesser General Public License * along with Alfresco. If not, see . */ -package org.alfresco.solr; +package org.alfresco.solr; /** * This class was moved from org.alfresco.solr.tracker.CoreTracker @@ -48,6 +48,9 @@ public class TrackerState private volatile boolean running = false; private volatile boolean checkedFirstTransactionTime = false; + private volatile boolean checkedFirstAclTransactionTime = false; + private volatile boolean checkedLastAclTransactionTime = false; + private volatile boolean checkedLastTransactionTime = false; private volatile boolean check = false; @@ -55,7 +58,7 @@ public class TrackerState private long lastGoodChangeSetCommitTimeInIndex; - private long lastGoodTxCommitTimeInIndex ; + private long lastGoodTxCommitTimeInIndex; private long timeBeforeWhichThereCanBeNoHoles; @@ -229,22 +232,63 @@ public class TrackerState this.timeBeforeWhichThereCanBeNoHoles = timeBeforeWhichThereCanBeNoHoles; } - /* (non-Javadoc) + /* + * (non-Javadoc) * @see java.lang.Object#toString() */ @Override public String toString() { - return "TrackerState [lastChangeSetIdOnServer=" - + lastChangeSetIdOnServer + ", lastChangeSetCommitTimeOnServer=" + lastChangeSetCommitTimeOnServer + ", lastIndexedChangeSetId=" + lastIndexedChangeSetId - + ", lastIndexedTxCommitTime=" + lastIndexedTxCommitTime + ", lastIndexedTxId=" + lastIndexedTxId + ", lastIndexedChangeSetCommitTime=" - + lastIndexedChangeSetCommitTime + ", lastTxCommitTimeOnServer=" + lastTxCommitTimeOnServer + ", lastTxIdOnServer=" + lastTxIdOnServer - + ", lastIndexedTxIdBeforeHoles=" + lastIndexedTxIdBeforeHoles + ", lastIndexedChangeSetIdBeforeHoles=" + lastIndexedChangeSetIdBeforeHoles + ", running=" - + running + ", checkedFirstTransactionTime=" + checkedFirstTransactionTime + ", check=" + check + ", timeToStopIndexing=" + timeToStopIndexing - + ", lastGoodChangeSetCommitTimeInIndex=" + lastGoodChangeSetCommitTimeInIndex + ", lastGoodTxCommitTimeInIndex=" + lastGoodTxCommitTimeInIndex - + ", timeBeforeWhichThereCanBeNoHoles=" + timeBeforeWhichThereCanBeNoHoles + "]"; + return "TrackerState [lastChangeSetIdOnServer=" + lastChangeSetIdOnServer + + ", lastChangeSetCommitTimeOnServer=" + lastChangeSetCommitTimeOnServer + + ", lastIndexedChangeSetId=" + lastIndexedChangeSetId + + ", lastIndexedTxCommitTime=" + lastIndexedTxCommitTime + + ", lastIndexedTxId=" + lastIndexedTxId + + ", lastIndexedChangeSetCommitTime=" + lastIndexedChangeSetCommitTime + + ", lastTxCommitTimeOnServer=" + lastTxCommitTimeOnServer + + ", lastTxIdOnServer=" + lastTxIdOnServer + + ", lastIndexedTxIdBeforeHoles=" + lastIndexedTxIdBeforeHoles + + ", lastIndexedChangeSetIdBeforeHoles=" + lastIndexedChangeSetIdBeforeHoles + + ", running=" + running + + ", checkedFirstTransactionTime=" + checkedFirstTransactionTime + + ", checkedFirstAclTransactionTime=" + this.checkedFirstAclTransactionTime + + ", checkedLastTransactionTime=" + this.checkedLastTransactionTime + + ", checkedLastAclTransactionTime=" + this.checkedLastAclTransactionTime + + ", check=" + check + + ", timeToStopIndexing=" + timeToStopIndexing + + ", lastGoodChangeSetCommitTimeInIndex=" + lastGoodChangeSetCommitTimeInIndex + + ", lastGoodTxCommitTimeInIndex=" + lastGoodTxCommitTimeInIndex + + ", timeBeforeWhichThereCanBeNoHoles=" + timeBeforeWhichThereCanBeNoHoles + "]"; } - - -} + public boolean isCheckedFirstAclTransactionTime() + { + return checkedFirstAclTransactionTime; + } + + public void setCheckedFirstAclTransactionTime(boolean checkedFirstAclTransactionTime) + { + this.checkedFirstAclTransactionTime = checkedFirstAclTransactionTime; + } + + public boolean isCheckedLastTransactionTime() + { + return checkedLastTransactionTime; + } + + public void setCheckedLastTransactionTime(boolean checkedLastTransactionTime) + { + this.checkedLastTransactionTime = checkedLastTransactionTime; + } + + public boolean isCheckedLastAclTransactionTime() + { + return checkedLastAclTransactionTime; + } + + public void setCheckedLastAclTransactionTime(boolean checkedLastAclTransactionTime) + { + this.checkedLastAclTransactionTime = checkedLastAclTransactionTime; + } + +} diff --git a/search-services/alfresco-solrclient-lib/source/java/org/alfresco/solr/tracker/IndexHealthReport.java b/search-services/alfresco-solrclient-lib/source/java/org/alfresco/solr/tracker/IndexHealthReport.java index 40390c7f3..1ac1e7c73 100644 --- a/search-services/alfresco-solrclient-lib/source/java/org/alfresco/solr/tracker/IndexHealthReport.java +++ b/search-services/alfresco-solrclient-lib/source/java/org/alfresco/solr/tracker/IndexHealthReport.java @@ -366,12 +366,11 @@ public class IndexHealthReport } /** - * @param txid + * @param dbId */ - public void setDuplicatedUnindexedInIndex(long txid) + public void setDuplicatedUnindexedInIndex(long dbId) { - duplicatedUnindexedInIndex.set(txid); - + duplicatedUnindexedInIndex.set(dbId); } /** @@ -383,11 +382,11 @@ public class IndexHealthReport } /** - * @param txid + * @param dbId */ - public void setDuplicatedErrorInIndex(long txid) + public void setDuplicatedErrorInIndex(long dbId) { - duplicatedErrorInIndex.set(txid); + duplicatedErrorInIndex.set(dbId); } diff --git a/search-services/alfresco-solrclient-lib/source/test-java/org/alfresco/solr/client/SOLRAPIClientFactoryTest.java b/search-services/alfresco-solrclient-lib/source/test-java/org/alfresco/solr/client/SOLRAPIClientFactoryTest.java index 64428cb4d..05d7f24c5 100644 --- a/search-services/alfresco-solrclient-lib/source/test-java/org/alfresco/solr/client/SOLRAPIClientFactoryTest.java +++ b/search-services/alfresco-solrclient-lib/source/test-java/org/alfresco/solr/client/SOLRAPIClientFactoryTest.java @@ -57,8 +57,8 @@ public class SOLRAPIClientFactoryTest when(props.getProperty("alfresco.port.ssl", "8443")).thenReturn("8443"); when(props.getProperty("alfresco.maxTotalConnections", "40")).thenReturn("40"); when(props.getProperty("alfresco.maxHostConnections", "40")).thenReturn("40"); - when(props.getProperty("alfresco.socketTimeout", "0")).thenReturn("0"); - when(props.getProperty("alfresco.secureComms", "https")).thenReturn("none"); + when(props.getProperty("alfresco.socketTimeout", "60000")).thenReturn("0"); + when(props.getProperty("alfresco.secureComms", "none")).thenReturn("none"); when(props.getProperty("alfresco.encryption.ssl.keystore.location", "ssl.repo.client.keystore")).thenReturn("ssl.repo.client.keystore"); when(props.getProperty("alfresco.encryption.ssl.truststore.location",