Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-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 62BEBD0AF for ; Tue, 18 Sep 2012 15:01:03 +0000 (UTC) Received: (qmail 17769 invoked by uid 500); 18 Sep 2012 15:01:03 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 17723 invoked by uid 500); 18 Sep 2012 15:01:03 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 17714 invoked by uid 99); 18 Sep 2012 15:01:03 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Sep 2012 15:01:03 +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; Tue, 18 Sep 2012 15:01:01 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3D3D42388A4A for ; Tue, 18 Sep 2012 15:00:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1387210 - /hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java Date: Tue, 18 Sep 2012 15:00:17 -0000 To: commits@hbase.apache.org From: tedyu@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120918150017.3D3D42388A4A@eris.apache.org> Author: tedyu Date: Tue Sep 18 15:00:16 2012 New Revision: 1387210 URL: http://svn.apache.org/viewvc?rev=1387210&view=rev Log: HBASE-6438 Addendum checks regionAlreadyInTransitionException when generating region plan (Chunhui) Modified: hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java Modified: hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java?rev=1387210&r1=1387209&r2=1387210&view=diff ============================================================================== --- hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java (original) +++ hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java Tue Sep 18 15:00:16 2012 @@ -1591,7 +1591,7 @@ public class AssignmentManager extends Z LOG.debug("Server stopped; skipping assign of " + state); return; } - RegionPlan plan = getRegionPlan(state, forceNewPlan); + RegionPlan plan = getRegionPlan(state, !regionAlreadyInTransitionException && forceNewPlan); if (plan == null) { LOG.debug("Unable to determine a plan to assign " + state); this.timeoutMonitor.setAllRegionServersOffline(true);