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 559059CF0 for ; Fri, 13 Jan 2012 20:07:13 +0000 (UTC) Received: (qmail 555 invoked by uid 500); 13 Jan 2012 20:07:13 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 495 invoked by uid 500); 13 Jan 2012 20:07:12 -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 488 invoked by uid 99); 13 Jan 2012 20:07:12 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Jan 2012 20:07:12 +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, 13 Jan 2012 20:07:11 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1C4B12388860 for ; Fri, 13 Jan 2012 20:06:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1231280 - in /hbase/branches/0.92: CHANGES.txt src/main/java/org/apache/hadoop/hbase/HConstants.java src/main/java/org/apache/hadoop/hbase/master/LoadBalancerFactory.java Date: Fri, 13 Jan 2012 20:06:49 -0000 To: commits@hbase.apache.org From: tedyu@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120113200650.1C4B12388860@eris.apache.org> Author: tedyu Date: Fri Jan 13 20:06:49 2012 New Revision: 1231280 URL: http://svn.apache.org/viewvc?rev=1231280&view=rev Log: HBASE-5143 Fix config typo in pluggable load balancer factory (Harsh J) Modified: hbase/branches/0.92/CHANGES.txt hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/HConstants.java hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/LoadBalancerFactory.java Modified: hbase/branches/0.92/CHANGES.txt URL: http://svn.apache.org/viewvc/hbase/branches/0.92/CHANGES.txt?rev=1231280&r1=1231279&r2=1231280&view=diff ============================================================================== --- hbase/branches/0.92/CHANGES.txt (original) +++ hbase/branches/0.92/CHANGES.txt Fri Jan 13 20:06:49 2012 @@ -519,6 +519,7 @@ Release 0.92.0 - Unreleased HBASE-5121 MajorCompaction may affect scan's correctness (chunhui shen and Lars H) HBASE-5163 TestLogRolling#testLogRollOnDatanodeDeath fails sometimes on Jenkins or hadoop QA ("The directory is already locked.") (N Keywal) + HBASE-5143 Fix config typo in pluggable load balancer factory (Harsh J) TESTS HBASE-4492 TestRollingRestart fails intermittently Modified: hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/HConstants.java URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/HConstants.java?rev=1231280&r1=1231279&r2=1231280&view=diff ============================================================================== --- hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/HConstants.java (original) +++ hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/HConstants.java Fri Jan 13 20:06:49 2012 @@ -69,6 +69,9 @@ public final class HConstants { /** Cluster is in distributed mode or not */ public static final String CLUSTER_DISTRIBUTED = "hbase.cluster.distributed"; + /** Config for pluggable load balancers */ + public static final String HBASE_MASTER_LOADBALANCER_CLASS = "hbase.master.loadbalancer.class"; + /** Cluster is standalone or pseudo-distributed */ public static final String CLUSTER_IS_LOCAL = "false"; Modified: hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/LoadBalancerFactory.java URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/LoadBalancerFactory.java?rev=1231280&r1=1231279&r2=1231280&view=diff ============================================================================== --- hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/LoadBalancerFactory.java (original) +++ hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/master/LoadBalancerFactory.java Fri Jan 13 20:06:49 2012 @@ -21,6 +21,7 @@ package org.apache.hadoop.hbase.master; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.util.ReflectionUtils; /** @@ -36,7 +37,9 @@ public class LoadBalancerFactory { public static LoadBalancer getLoadBalancer(Configuration conf) { // Create the balancer - Class balancerKlass = conf.getClass("hbase.maser.loadBalancer.class",DefaultLoadBalancer.class, LoadBalancer.class); + Class balancerKlass = conf.getClass( + HConstants.HBASE_MASTER_LOADBALANCER_CLASS, + DefaultLoadBalancer.class, LoadBalancer.class); return ReflectionUtils.newInstance(balancerKlass, conf); }