From commits-return-4415-apmail-helix-commits-archive=helix.apache.org@helix.apache.org Thu Jul 10 17:04:46 2014 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 E148711C14 for ; Thu, 10 Jul 2014 17:04:46 +0000 (UTC) Received: (qmail 36274 invoked by uid 500); 10 Jul 2014 17:04:46 -0000 Delivered-To: apmail-helix-commits-archive@helix.apache.org Received: (qmail 36168 invoked by uid 500); 10 Jul 2014 17:04:46 -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 35658 invoked by uid 99); 10 Jul 2014 17:04:46 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Jul 2014 17:04:46 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1AE3D9AB742; Thu, 10 Jul 2014 17:04:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kanak@apache.org To: commits@helix.apache.org Date: Thu, 10 Jul 2014 17:05:03 -0000 Message-Id: In-Reply-To: <08883228e2f3400fb2f67d01369d8ca9@git.apache.org> References: <08883228e2f3400fb2f67d01369d8ca9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [20/50] [abbrv] git commit: Fix issue with updating provisioner config Fix issue with updating provisioner config Project: http://git-wip-us.apache.org/repos/asf/helix/repo Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/224c7eaa Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/224c7eaa Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/224c7eaa Branch: refs/heads/master Commit: 224c7eaaa0863ae89da7fe7ed12ce36303faca07 Parents: c072aca Author: Kanak Biscuitwala Authored: Mon Feb 24 10:13:22 2014 -0800 Committer: Kanak Biscuitwala Committed: Mon Feb 24 10:13:22 2014 -0800 ---------------------------------------------------------------------- .../java/org/apache/helix/api/accessor/ResourceAccessor.java | 5 +++++ .../main/java/org/apache/helix/api/config/ResourceConfig.java | 2 ++ 2 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/helix/blob/224c7eaa/helix-core/src/main/java/org/apache/helix/api/accessor/ResourceAccessor.java ---------------------------------------------------------------------- diff --git a/helix-core/src/main/java/org/apache/helix/api/accessor/ResourceAccessor.java b/helix-core/src/main/java/org/apache/helix/api/accessor/ResourceAccessor.java index 8359da5..0052871 100644 --- a/helix-core/src/main/java/org/apache/helix/api/accessor/ResourceAccessor.java +++ b/helix-core/src/main/java/org/apache/helix/api/accessor/ResourceAccessor.java @@ -49,6 +49,7 @@ import org.apache.helix.model.ExternalView; import org.apache.helix.model.IdealState; import org.apache.helix.model.IdealState.RebalanceMode; import org.apache.helix.model.InstanceConfig; +import org.apache.helix.model.ProvisionerConfigHolder; import org.apache.helix.model.ResourceAssignment; import org.apache.helix.model.ResourceConfiguration; import org.apache.helix.model.StateModelDefinition; @@ -260,6 +261,10 @@ public class ResourceAccessor { config.addNamespacedConfig(new RebalancerConfigHolder(resourceConfig.getRebalancerConfig()) .toNamespacedConfig()); } + if (resourceConfig.getProvisionerConfig() != null) { + config.addNamespacedConfig(new ProvisionerConfigHolder(resourceConfig.getProvisionerConfig()) + .toNamespacedConfig()); + } config.setBucketSize(resourceConfig.getBucketSize()); config.setBatchMessageMode(resourceConfig.getBatchMessageMode()); setConfiguration(resourceId, config, resourceConfig.getRebalancerConfig()); http://git-wip-us.apache.org/repos/asf/helix/blob/224c7eaa/helix-core/src/main/java/org/apache/helix/api/config/ResourceConfig.java ---------------------------------------------------------------------- diff --git a/helix-core/src/main/java/org/apache/helix/api/config/ResourceConfig.java b/helix-core/src/main/java/org/apache/helix/api/config/ResourceConfig.java index 5443236..6185383 100644 --- a/helix-core/src/main/java/org/apache/helix/api/config/ResourceConfig.java +++ b/helix-core/src/main/java/org/apache/helix/api/config/ResourceConfig.java @@ -230,6 +230,7 @@ public class ResourceConfig { _updateFields.add(Fields.PROVISIONER_CONFIG); return this; } + /** * Set the user configuration * @param userConfig user-specified properties @@ -273,6 +274,7 @@ public class ResourceConfig { Builder builder = new Builder(orig.getId()).type(orig.getType()) .rebalancerConfig(orig.getRebalancerConfig()) + .provisionerConfig(orig.getProvisionerConfig()) .schedulerTaskConfig(orig.getSchedulerTaskConfig()).userConfig(orig.getUserConfig()) .bucketSize(orig.getBucketSize()).batchMessageMode(orig.getBatchMessageMode()); for (Fields field : _updateFields) {