Return-Path: X-Original-To: apmail-helix-commits-archive@minotaur.apache.org Delivered-To: apmail-helix-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 74D4DFA30 for ; Tue, 26 Mar 2013 22:08:00 +0000 (UTC) Received: (qmail 76206 invoked by uid 500); 26 Mar 2013 22:08:00 -0000 Delivered-To: apmail-helix-commits-archive@helix.apache.org Received: (qmail 76178 invoked by uid 500); 26 Mar 2013 22:08:00 -0000 Mailing-List: contact commits-help@helix.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@helix.incubator.apache.org Delivered-To: mailing list commits@helix.incubator.apache.org Received: (qmail 76168 invoked by uid 99); 26 Mar 2013 22:08:00 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Mar 2013 22:08:00 +0000 X-ASF-Spam-Status: No, hits=-2001.3 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 26 Mar 2013 22:07:59 +0000 Received: (qmail 75191 invoked by uid 99); 26 Mar 2013 22:07:38 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Mar 2013 22:07:38 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E0D3B8214C5; Tue, 26 Mar 2013 22:07:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: slu@apache.org To: commits@helix.incubator.apache.org Date: Tue, 26 Mar 2013 22:07:39 -0000 Message-Id: In-Reply-To: <6011cd46cf764106822ae7e21a2a77de@git.apache.org> References: <6011cd46cf764106822ae7e21a2a77de@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-helix X-Virus-Checked: Checked by ClamAV on apache.org Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-helix Project: http://git-wip-us.apache.org/repos/asf/incubator-helix/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-helix/commit/77108e4f Tree: http://git-wip-us.apache.org/repos/asf/incubator-helix/tree/77108e4f Diff: http://git-wip-us.apache.org/repos/asf/incubator-helix/diff/77108e4f Branch: refs/heads/master Commit: 77108e4fe351c829143f50ccd138ffcc6ab5a098 Parents: 8b13937 142dab5 Author: slu2011 Authored: Tue Mar 26 15:05:49 2013 -0700 Committer: slu2011 Committed: Tue Mar 26 15:05:49 2013 -0700 ---------------------------------------------------------------------- .../helix/webapp/TestClusterManagementWebapp.java | 29 ++-- .../src/main/java/org/apache/helix/HelixAdmin.java | 22 ++- .../helix/controller/rebalancer/Rebalancer.java | 54 +++++ .../helix/controller/stages/ClusterDataCache.java | 72 ++++++- .../controller/stages/MessageThrottleStage.java | 2 +- .../org/apache/helix/manager/zk/ZKHelixAdmin.java | 77 ++++--- .../org/apache/helix/model/ClusterConstraints.java | 164 +++++---------- .../org/apache/helix/model/ConstraintItem.java | 101 +++++++++ .../model/builder/ClusterConstraintsBuilder.java | 73 +++++++ .../helix/model/builder/ConstraintItemBuilder.java | 111 ++++++++++ .../stages/TestMessageThrottleStage.java | 2 +- .../helix/integration/TestMessageThrottle.java | 20 ++- .../helix/integration/TestSchedulerMessage.java | 10 +- .../apache/helix/manager/zk/TestZkHelixAdmin.java | 67 ++++++ .../org/apache/helix/model/TestConstraint.java | 1 - .../org/apache/helix/tools/TestClusterSetup.java | 15 +- 16 files changed, 640 insertions(+), 180 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/77108e4f/helix-core/src/main/java/org/apache/helix/HelixAdmin.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/77108e4f/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixAdmin.java ---------------------------------------------------------------------- diff --cc helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixAdmin.java index f0722a4,38da4e7..4e85721 --- a/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixAdmin.java +++ b/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixAdmin.java @@@ -46,8 -44,8 +45,9 @@@ import org.apache.helix.HelixAdmin import org.apache.helix.HelixConstants; import org.apache.helix.HelixDataAccessor; import org.apache.helix.HelixException; +import org.apache.helix.InstanceType; import org.apache.helix.PropertyKey; + import org.apache.helix.PropertyKey.Builder; import org.apache.helix.PropertyPathConfig; import org.apache.helix.PropertyType; import org.apache.helix.ZNRecord; http://git-wip-us.apache.org/repos/asf/incubator-helix/blob/77108e4f/helix-core/src/test/java/org/apache/helix/tools/TestClusterSetup.java ----------------------------------------------------------------------