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

[te...@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<? extends LoadBalancer> balancerKlass = conf.getClass("hbase.maser.loadBalancer.class",DefaultLoadBalancer.class, LoadBalancer.class);
+    Class<? extends LoadBalancer> balancerKlass = conf.getClass(
+        HConstants.HBASE_MASTER_LOADBALANCER_CLASS,
+        DefaultLoadBalancer.class, LoadBalancer.class);
     return ReflectionUtils.newInstance(balancerKlass, conf);
 
   }