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 2014/01/03 14:41:16 UTC
svn commit: r1555084 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/CHANGES.txt solr/core/
solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
Author: shalin
Date: Fri Jan 3 13:41:16 2014
New Revision: 1555084
URL: http://svn.apache.org/r1555084
Log:
SOLR-5601: Use zkStateReader.getLeaderRetry to find the leader of a newly created temp collection
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/solr/core/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1555084&r1=1555083&r2=1555084&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Fri Jan 3 13:41:16 2014
@@ -42,7 +42,7 @@ Detailed Change List
New Features
----------------------
-* SOLR-5308: A new 'migrate' collection API to split all documents with a
+* SOLR-5308: SOLR-5601: A new 'migrate' collection API to split all documents with a
route key into another collection (shalin)
* SOLR-5441: Expose number of transaction log files and their size via JMX.
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java?rev=1555084&r1=1555083&r2=1555084&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java Fri Jan 3 13:41:16 2014
@@ -1191,7 +1191,7 @@ public class OverseerCollectionProcessor
// refresh cluster state
clusterState = zkStateReader.getClusterState();
Slice tempSourceSlice = clusterState.getCollection(tempSourceCollectionName).getSlices().iterator().next();
- Replica tempSourceLeader = clusterState.getLeader(tempSourceCollectionName, tempSourceSlice.getName());
+ Replica tempSourceLeader = zkStateReader.getLeaderRetry(tempSourceCollectionName, tempSourceSlice.getName(), 60000);
String tempCollectionReplica1 = tempSourceCollectionName + "_" + tempSourceSlice.getName() + "_replica1";
String coreNodeName = waitForCoreNodeName(clusterState.getCollection(tempSourceCollectionName),
Re: svn commit: r1555084 - in /lucene/dev/branches/branch_4x: ./
solr/ solr/CHANGES.txt solr/core/ solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
Posted by Shalin Shekhar Mangar <sh...@gmail.com>.
This is a 4.7 feature so there is no need to backport. Thanks for
noticing this bug Hoss.
On Fri, Jan 3, 2014 at 9:07 PM, Chris Hostetter
<ho...@fucit.org> wrote:
>
> Is this a good candidate for 4.6.1?
>
>
> : Date: Fri, 03 Jan 2014 13:41:16 -0000
> : From: shalin@apache.org
> : Reply-To: dev@lucene.apache.org
> : To: commits@lucene.apache.org
> : Subject: svn commit: r1555084 - in /lucene/dev/branches/branch_4x: ./ solr/
> : solr/CHANGES.txt solr/core/
> : solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
> :
> : Author: shalin
> : Date: Fri Jan 3 13:41:16 2014
> : New Revision: 1555084
> :
> : URL: http://svn.apache.org/r1555084
> : Log:
> : SOLR-5601: Use zkStateReader.getLeaderRetry to find the leader of a newly created temp collection
> :
> : Modified:
> : lucene/dev/branches/branch_4x/ (props changed)
> : lucene/dev/branches/branch_4x/solr/ (props changed)
> : lucene/dev/branches/branch_4x/solr/CHANGES.txt (contents, props changed)
> : lucene/dev/branches/branch_4x/solr/core/ (props changed)
> : lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
> :
> : Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
> : URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1555084&r1=1555083&r2=1555084&view=diff
> : ==============================================================================
> : --- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
> : +++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Fri Jan 3 13:41:16 2014
> : @@ -42,7 +42,7 @@ Detailed Change List
> : New Features
> : ----------------------
> :
> : -* SOLR-5308: A new 'migrate' collection API to split all documents with a
> : +* SOLR-5308: SOLR-5601: A new 'migrate' collection API to split all documents with a
> : route key into another collection (shalin)
> :
> : * SOLR-5441: Expose number of transaction log files and their size via JMX.
> :
> : Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
> : URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java?rev=1555084&r1=1555083&r2=1555084&view=diff
> : ==============================================================================
> : --- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java (original)
> : +++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java Fri Jan 3 13:41:16 2014
> : @@ -1191,7 +1191,7 @@ public class OverseerCollectionProcessor
> : // refresh cluster state
> : clusterState = zkStateReader.getClusterState();
> : Slice tempSourceSlice = clusterState.getCollection(tempSourceCollectionName).getSlices().iterator().next();
> : - Replica tempSourceLeader = clusterState.getLeader(tempSourceCollectionName, tempSourceSlice.getName());
> : + Replica tempSourceLeader = zkStateReader.getLeaderRetry(tempSourceCollectionName, tempSourceSlice.getName(), 60000);
> :
> : String tempCollectionReplica1 = tempSourceCollectionName + "_" + tempSourceSlice.getName() + "_replica1";
> : String coreNodeName = waitForCoreNodeName(clusterState.getCollection(tempSourceCollectionName),
> :
> :
> :
>
> -Hoss
> http://www.lucidworks.com/
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
> For additional commands, e-mail: dev-help@lucene.apache.org
>
--
Regards,
Shalin Shekhar Mangar.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org
Re: svn commit: r1555084 - in /lucene/dev/branches/branch_4x: ./
solr/ solr/CHANGES.txt solr/core/
solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
Posted by Chris Hostetter <ho...@fucit.org>.
Is this a good candidate for 4.6.1?
: Date: Fri, 03 Jan 2014 13:41:16 -0000
: From: shalin@apache.org
: Reply-To: dev@lucene.apache.org
: To: commits@lucene.apache.org
: Subject: svn commit: r1555084 - in /lucene/dev/branches/branch_4x: ./ solr/
: solr/CHANGES.txt solr/core/
: solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
:
: Author: shalin
: Date: Fri Jan 3 13:41:16 2014
: New Revision: 1555084
:
: URL: http://svn.apache.org/r1555084
: Log:
: SOLR-5601: Use zkStateReader.getLeaderRetry to find the leader of a newly created temp collection
:
: Modified:
: lucene/dev/branches/branch_4x/ (props changed)
: lucene/dev/branches/branch_4x/solr/ (props changed)
: lucene/dev/branches/branch_4x/solr/CHANGES.txt (contents, props changed)
: lucene/dev/branches/branch_4x/solr/core/ (props changed)
: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
:
: Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
: URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1555084&r1=1555083&r2=1555084&view=diff
: ==============================================================================
: --- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
: +++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Fri Jan 3 13:41:16 2014
: @@ -42,7 +42,7 @@ Detailed Change List
: New Features
: ----------------------
:
: -* SOLR-5308: A new 'migrate' collection API to split all documents with a
: +* SOLR-5308: SOLR-5601: A new 'migrate' collection API to split all documents with a
: route key into another collection (shalin)
:
: * SOLR-5441: Expose number of transaction log files and their size via JMX.
:
: Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
: URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java?rev=1555084&r1=1555083&r2=1555084&view=diff
: ==============================================================================
: --- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java (original)
: +++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java Fri Jan 3 13:41:16 2014
: @@ -1191,7 +1191,7 @@ public class OverseerCollectionProcessor
: // refresh cluster state
: clusterState = zkStateReader.getClusterState();
: Slice tempSourceSlice = clusterState.getCollection(tempSourceCollectionName).getSlices().iterator().next();
: - Replica tempSourceLeader = clusterState.getLeader(tempSourceCollectionName, tempSourceSlice.getName());
: + Replica tempSourceLeader = zkStateReader.getLeaderRetry(tempSourceCollectionName, tempSourceSlice.getName(), 60000);
:
: String tempCollectionReplica1 = tempSourceCollectionName + "_" + tempSourceSlice.getName() + "_replica1";
: String coreNodeName = waitForCoreNodeName(clusterState.getCollection(tempSourceCollectionName),
:
:
:
-Hoss
http://www.lucidworks.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org