You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2018/08/01 11:36:14 UTC
[1/2] lucene-solr:jira/solr-12607: SOLR-12607: Fix warning to log the
shard name of the current replica instead of the failing replica's shard
Repository: lucene-solr
Updated Branches:
refs/heads/jira/solr-12607 05b6ba449 -> c55ce4d0f
SOLR-12607: Fix warning to log the shard name of the current replica instead of the failing replica's shard
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/1125a28f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/1125a28f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/1125a28f
Branch: refs/heads/jira/solr-12607
Commit: 1125a28f1a612612f4e5dc4af88c09a4d2cf15d3
Parents: 05b6ba4
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Wed Aug 1 16:36:29 2018 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Wed Aug 1 16:36:29 2018 +0530
----------------------------------------------------------------------
.../apache/solr/update/processor/DistributedUpdateProcessor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1125a28f/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java b/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
index 76e9cda..aa8c793 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
@@ -896,7 +896,7 @@ public class DistributedUpdateProcessor extends UpdateRequestProcessor {
// not the leader anymore maybe or the error'd node is not my replica?
if (!foundErrorNodeInReplicaList) {
log.warn("Core "+cloudDesc.getCoreNodeName()+" belonging to "+collection+" "+
- shardId+", does not have error'd node " + stdNode.getNodeProps().getCoreUrl() + " as a replica. " +
+ cloudDesc.getShardId()+", does not have error'd node " + stdNode.getNodeProps().getCoreUrl() + " as a replica. " +
"No request recovery command will be sent!");
if (!shardId.equals(cloudDesc.getShardId())) {
// some replicas on other shard did not receive the updates (ex: during splitshard),
[2/2] lucene-solr:jira/solr-12607: SOLR-12607: Removing debug logging
and re-enabling randomized replica type selection
Posted by sh...@apache.org.
SOLR-12607: Removing debug logging and re-enabling randomized replica type selection
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/c55ce4d0
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c55ce4d0
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c55ce4d0
Branch: refs/heads/jira/solr-12607
Commit: c55ce4d0f7bd3fd6ca074489e4dc62fa8ea59e5e
Parents: 1125a28
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Wed Aug 1 17:06:00 2018 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Wed Aug 1 17:06:00 2018 +0530
----------------------------------------------------------------------
.../src/java/org/apache/solr/update/DirectUpdateHandler2.java | 1 -
.../solr/update/processor/DistributedUpdateProcessor.java | 1 -
.../org/apache/solr/cloud/api/collections/ShardSplitTest.java | 5 -----
3 files changed, 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c55ce4d0/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java b/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
index 1f50717..bcc97eb 100644
--- a/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
+++ b/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
@@ -269,7 +269,6 @@ public class DirectUpdateHandler2 extends UpdateHandler implements SolrCoreState
}
try {
if ((cmd.getFlags() & UpdateCommand.IGNORE_INDEXWRITER) != 0) {
- log.info("Ignored command: {} with flags: {}", cmd, cmd.getFlags()); // todo nocommit
if (ulog != null) ulog.add(cmd);
return 1;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c55ce4d0/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java b/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
index aa8c793..a21d906 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
@@ -948,7 +948,6 @@ public class DistributedUpdateProcessor extends UpdateRequestProcessor {
// must be synchronized by bucket
private void doLocalAdd(AddUpdateCommand cmd) throws IOException {
- log.info("Locally adding: {} with flags: {}", cmd, cmd.getFlags()); // todo nocommit
super.processAdd(cmd);
isIndexChanged = true;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c55ce4d0/solr/core/src/test/org/apache/solr/cloud/api/collections/ShardSplitTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/api/collections/ShardSplitTest.java b/solr/core/src/test/org/apache/solr/cloud/api/collections/ShardSplitTest.java
index 9c818d5..5565f4b 100644
--- a/solr/core/src/test/org/apache/solr/cloud/api/collections/ShardSplitTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/api/collections/ShardSplitTest.java
@@ -91,11 +91,6 @@ public class ShardSplitTest extends BasicDistributedZkTest {
useFactory(null);
}
- @Override
- protected boolean useTlogReplicas() {
- return true; // todo nocommit
- }
-
@Test
// 12-Jun-2018 @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028")
public void test() throws Exception {