Return-Path: X-Original-To: apmail-lucene-commits-archive@www.apache.org Delivered-To: apmail-lucene-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B5CE11041B for ; Fri, 3 Jan 2014 13:39:34 +0000 (UTC) Received: (qmail 65667 invoked by uid 500); 3 Jan 2014 13:39:33 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 65387 invoked by uid 99); 3 Jan 2014 13:39:33 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Jan 2014 13:39:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Jan 2014 13:39:32 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7690E23888D7; Fri, 3 Jan 2014 13:39:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1555083 - in /lucene/dev/trunk/solr: CHANGES.txt core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java Date: Fri, 03 Jan 2014 13:39:12 -0000 To: commits@lucene.apache.org From: shalin@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140103133912.7690E23888D7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: shalin Date: Fri Jan 3 13:39:11 2014 New Revision: 1555083 URL: http://svn.apache.org/r1555083 Log: SOLR-5601: Use zkStateReader.getLeaderRetry to find the leader of a newly created temp collection Modified: lucene/dev/trunk/solr/CHANGES.txt lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java Modified: lucene/dev/trunk/solr/CHANGES.txt URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1555083&r1=1555082&r2=1555083&view=diff ============================================================================== --- lucene/dev/trunk/solr/CHANGES.txt (original) +++ lucene/dev/trunk/solr/CHANGES.txt Fri Jan 3 13:39:11 2014 @@ -83,7 +83,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/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java?rev=1555083&r1=1555082&r2=1555083&view=diff ============================================================================== --- lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java (original) +++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java Fri Jan 3 13:39:11 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),