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 D9E16F336 for ; Mon, 1 Apr 2013 18:22:47 +0000 (UTC) Received: (qmail 86751 invoked by uid 500); 1 Apr 2013 18:22:47 -0000 Delivered-To: apmail-helix-commits-archive@helix.apache.org Received: (qmail 86719 invoked by uid 500); 1 Apr 2013 18:22:47 -0000 Mailing-List: contact commits-help@helix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@helix.apache.org Delivered-To: mailing list commits@helix.apache.org Received: (qmail 86710 invoked by uid 99); 1 Apr 2013 18:22:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Apr 2013 18:22:47 +0000 X-ASF-Spam-Status: No, hits=-2002.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; Mon, 01 Apr 2013 18:22:46 +0000 Received: (qmail 86079 invoked by uid 99); 1 Apr 2013 18:22:26 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Apr 2013 18:22:26 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8D29D8353DA; Mon, 1 Apr 2013 18:22:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kishoreg@apache.org To: commits@helix.incubator.apache.org Date: Mon, 01 Apr 2013 18:22:27 -0000 Message-Id: <29054278f5da481e8baff769e68e5622@git.apache.org> In-Reply-To: <5bf50fb627df43e7b9886515a0f44149@git.apache.org> References: <5bf50fb627df43e7b9886515a0f44149@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] 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/94eb5324 Tree: http://git-wip-us.apache.org/repos/asf/incubator-helix/tree/94eb5324 Diff: http://git-wip-us.apache.org/repos/asf/incubator-helix/diff/94eb5324 Branch: refs/heads/master Commit: 94eb5324c8050edfacec52694a91746329abd9c2 Parents: 0f4c0f1 cd8272c Author: Kishore Gopalakrishna Authored: Mon Apr 1 11:18:45 2013 -0700 Committer: Kishore Gopalakrishna Committed: Mon Apr 1 11:18:45 2013 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/helix/HelixConstants.java | 4 +- .../java/org/apache/helix/HelixDefinedState.java | 43 +++ .../stages/BestPossibleStateCalcStage.java | 37 ++-- .../controller/stages/BestPossibleStateOutput.java | 4 + .../stages/ExternalViewComputeStage.java | 3 +- .../controller/stages/ReadClusterDataStage.java | 6 +- .../controller/stages/TaskAssignmentStage.java | 2 +- .../org/apache/helix/manager/zk/ZKHelixAdmin.java | 37 ++-- .../messaging/handling/BatchMessageHandler.java | 2 +- .../messaging/handling/HelixBatchMessageTask.java | 2 +- .../handling/HelixStateTransitionHandler.java | 144 ++++++----- .../apache/helix/messaging/handling/HelixTask.java | 10 +- .../helix/messaging/handling/HelixTaskResult.java | 2 +- .../org/apache/helix/model/InstanceConfig.java | 19 +-- .../apache/helix/model/StateModelDefinition.java | 53 ++++- .../helix/monitoring/mbeans/ResourceMonitor.java | 3 +- .../helix/participant/statemachine/StateModel.java | 15 +- .../participant/statemachine/StateModelParser.java | 2 +- .../apache/helix/tools/ClusterStateVerifier.java | 26 ++- .../helix/tools/StateModelConfigGenerator.java | 1 + .../org/apache/helix/integration/TestDrop.java | 203 ++++++++++++++- .../integration/TestStateTransitionTimeout.java | 2 +- .../helix/mock/participant/MockMSStateModel.java | 25 ++- .../helix/mock/participant/MockTransition.java | 2 +- .../helix/mock/participant/SleepTransition.java | 9 +- .../participant/StoreAccessDiffNodeTransition.java | 2 +- .../participant/StoreAccessOneNodeTransition.java | 2 +- .../statemachine/TestStateModelParser.java | 93 +++++++ 28 files changed, 605 insertions(+), 148 deletions(-) ----------------------------------------------------------------------