You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2016/02/08 20:11:32 UTC
[1/2] lucene-solr git commit: fix compilation errors
Repository: lucene-solr
Updated Branches:
refs/heads/jira/lucene-5438-nrt-replication 9afa56005 -> 30613c740
fix compilation errors
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/c14fa123
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c14fa123
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c14fa123
Branch: refs/heads/jira/lucene-5438-nrt-replication
Commit: c14fa123da435a34c4f40e6685c3184ecd9a60e0
Parents: f0f4278
Author: Michael McCandless <ma...@mikemccandless.com>
Authored: Mon Feb 8 14:07:14 2016 -0500
Committer: Mike McCandless <mi...@apache.org>
Committed: Mon Feb 8 14:07:14 2016 -0500
----------------------------------------------------------------------
.../test/org/apache/lucene/replicator/nrt/Jobs.java | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c14fa123/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/Jobs.java
----------------------------------------------------------------------
diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/Jobs.java b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/Jobs.java
index a0b9535..de8c0c3 100644
--- a/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/Jobs.java
+++ b/lucene/replicator/src/test/org/apache/lucene/replicator/nrt/Jobs.java
@@ -80,7 +80,12 @@ class Jobs extends Thread implements Closeable {
} else {
node.message("AlreadyClosedException during job.visit job=" + topJob + "; now cancel");
}
- topJob.cancel("unexpected exception in visit", t);
+ try {
+ topJob.cancel("unexpected exception in visit", t);
+ } catch (Throwable t2) {
+ node.message("ignore exception calling cancel: " + t2);
+ t2.printStackTrace(System.out);
+ }
try {
topJob.onceDone.run(topJob);
} catch (Throwable t2) {
@@ -112,7 +117,11 @@ class Jobs extends Thread implements Closeable {
while (queue.isEmpty() == false) {
SimpleCopyJob job = (SimpleCopyJob) queue.poll();
node.message("top: Jobs: now cancel job=" + job);
- job.cancel("jobs closing", null);
+ try {
+ job.cancel("jobs closing", null);
+ } catch (Throwable t) {
+ node.message("ignore exception calling cancel: " + t);
+ }
try {
job.onceDone.run(job);
} catch (Throwable t) {
[2/2] lucene-solr git commit: merged
Posted by mi...@apache.org.
merged
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/30613c74
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/30613c74
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/30613c74
Branch: refs/heads/jira/lucene-5438-nrt-replication
Commit: 30613c74039931cf5ca2ef3f8e8c2cd6b75fee1b
Parents: c14fa12 9afa560
Author: Michael McCandless <ma...@mikemccandless.com>
Authored: Mon Feb 8 14:07:56 2016 -0500
Committer: Mike McCandless <mi...@apache.org>
Committed: Mon Feb 8 14:07:56 2016 -0500
----------------------------------------------------------------------
.../lucene/replicator/nrt/ReplicaNode.java | 21 ++++++--
.../org/apache/lucene/replicator/nrt/Jobs.java | 7 ++-
.../lucene/replicator/nrt/NodeProcess.java | 24 +++------
.../replicator/nrt/SimplePrimaryNode.java | 1 +
.../replicator/nrt/SimpleReplicaNode.java | 5 +-
.../replicator/nrt/TestNRTReplication.java | 6 +--
.../nrt/TestStressNRTReplication.java | 53 +++++++++++++-------
.../lucene/replicator/nrt/ThreadPumper.java | 4 +-
lucene/replicator/test.cmd | 4 +-
.../lucene/store/MockDirectoryWrapper.java | 1 +
10 files changed, 74 insertions(+), 52 deletions(-)
----------------------------------------------------------------------