You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2016/08/23 06:11:03 UTC
[1/2] lucene-solr:branch_6x: SOLR-9310: unhandled exception during
parallel indexing
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x f5c54e900 -> a3f58fc54
SOLR-9310: unhandled exception during parallel indexing
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/5d656560
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/5d656560
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/5d656560
Branch: refs/heads/branch_6x
Commit: 5d6565608654d1f0c7e5146f8771b500f2f97c3a
Parents: f50ced3
Author: Noble Paul <no...@apache.org>
Authored: Tue Aug 23 11:36:07 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Tue Aug 23 11:40:31 2016 +0530
----------------------------------------------------------------------
.../test/org/apache/solr/cloud/PeerSyncReplicationTest.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5d656560/solr/core/src/test/org/apache/solr/cloud/PeerSyncReplicationTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/PeerSyncReplicationTest.java b/solr/core/src/test/org/apache/solr/cloud/PeerSyncReplicationTest.java
index abdd646..f85b7f1 100644
--- a/solr/core/src/test/org/apache/solr/cloud/PeerSyncReplicationTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/PeerSyncReplicationTest.java
@@ -177,13 +177,14 @@ public class PeerSyncReplicationTest extends AbstractFullDistribZkTestBase {
new Thread(() -> {
try {
for (int i = 0; i < numDocs; i++) {
- indexDoc(id, docId, i1, 50, tlong, 50, t1, "document number " + docId++);
+ indexDoc(id, docId, i1, 50, tlong, 50, t1, "document number " + docId);
+ docId++;
// slow down adds, to get documents indexed while in PeerSync
Thread.sleep(100);
}
} catch (Exception e) {
- throw new RuntimeException(e);
-
+ log.error("Error indexing doc in background", e);
+ //Throwing an error here will kill the thread
}
}, getClassName())
.start();
[2/2] lucene-solr:branch_6x: Merge remote-tracking branch
'origin/branch_6x' into branch_6x
Posted by no...@apache.org.
Merge remote-tracking branch 'origin/branch_6x' into branch_6x
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/a3f58fc5
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a3f58fc5
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a3f58fc5
Branch: refs/heads/branch_6x
Commit: a3f58fc544bd2ec7bad7fd74d921f5301d11f738
Parents: 5d65656 f5c54e9
Author: Noble Paul <no...@apache.org>
Authored: Tue Aug 23 11:40:56 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Tue Aug 23 11:40:56 2016 +0530
----------------------------------------------------------------------
.../postingshighlight/CustomSeparatorBreakIterator.java | 4 ++--
.../search/postingshighlight/WholeBreakIterator.java | 4 ++--
solr/CHANGES.txt | 11 +++++++++++
3 files changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------