Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-13222 Add isBalancerEnabled method to Master and Admin. 

Include some basic tests for the method on a testing cluster.
Also update master page to show an alert when balancer is disabled.

Signed-off-by: Enis Soztutar <enis@apache.org>

Conflicts:
	hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java
	hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/RequestConverter.java
	hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/MasterProtos.java
This commit is contained in:
Josh Elser 2015-03-24 11:01:16 -04:00 committed by Enis Soztutar
parent 2857b21eaf
commit b9a615e739
14 changed files with 1405 additions and 340 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hbase-client/src/main/java/org/apache/hadoop/hbase/client/Admin.java
View File

@ -698,6 +698,13 @@ public interface Admin extends Abortable, Closeable {
*/
boolean balancer() throws IOException;
/**
* Query the current state of the balancer
*
* @return true if the balancer is enabled, false otherwise.
*/
boolean isBalancerEnabled() throws IOException;
/**
* Enable/Disable the catalog janitor
*

8
hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionManager.java
View File

@ -126,6 +126,8 @@ import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableDescripto
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableDescriptorsResponse;
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableNamesRequest;
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableNamesResponse;
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsBalancerEnabledRequest;
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsBalancerEnabledResponse;
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsCatalogJanitorEnabledRequest;
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsCatalogJanitorEnabledResponse;
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsMasterRunningRequest;
@ -2008,6 +2010,12 @@ class ConnectionManager {
throws ServiceException {
return stub.getLastMajorCompactionTimestampForRegion(controller, request);
}
@Override
public IsBalancerEnabledResponse isBalancerEnabled(RpcController controller,
IsBalancerEnabledRequest request) throws ServiceException {
return stub.isBalancerEnabled(controller, request);
}
};
}

17
hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
View File

@ -1954,6 +1954,23 @@ public class HBaseAdmin implements Admin {
});
}
/**
* Query the state of the balancer from the Master. It's not a guarantee that the balancer is
* actually running this very moment, but that it will run.
*
* @return True if the balancer is enabled, false otherwise.
*/
@Override
public boolean isBalancerEnabled() throws IOException {
return executeCallable(new MasterCallable<Boolean>(getConnection()) {
@Override
public Boolean call(int callTimeout) throws ServiceException {
return master.isBalancerEnabled(null, RequestConverter.buildIsBalancerEnabledRequest())
.getEnabled();
}
});
}
/**
* Enable/Disable the catalog janitor
* @param enable if true enables the catalog janitor

10
hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/RequestConverter.java
View File

@ -93,6 +93,7 @@ import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetClusterStatusR
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetSchemaAlterStatusRequest;
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableDescriptorsRequest;
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableNamesRequest;
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsBalancerEnabledRequest;
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsCatalogJanitorEnabledRequest;
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsMasterRunningRequest;
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.ModifyColumnRequest;
@ -1346,6 +1347,15 @@ public final class RequestConverter {
return SetBalancerRunningRequest.newBuilder().setOn(on).setSynchronous(synchronous).build();
}
/**
* Creates a protocol buffer IsBalancerEnabledRequest
*
* @return a IsBalancerEnabledRequest
*/
public static IsBalancerEnabledRequest buildIsBalancerEnabledRequest() {
return IsBalancerEnabledRequest.newBuilder().build();
}
/**
* @see {@link #buildGetClusterStatusRequest}
*/

1565
hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/MasterProtos.java
View File

File diff suppressed because it is too large Load Diff

13
hbase-protocol/src/main/protobuf/Master.proto
View File

@ -231,6 +231,13 @@ message SetBalancerRunningResponse {
optional bool prev_balance_value = 1;
}
message IsBalancerEnabledRequest {
}
message IsBalancerEnabledResponse {
required bool enabled = 1;
}
message RunCatalogScanRequest {
}
@ -485,6 +492,12 @@ service MasterService {
rpc SetBalancerRunning(SetBalancerRunningRequest)
returns(SetBalancerRunningResponse);
/**
* Query whether the Region Balancer is running.
*/
rpc IsBalancerEnabled(IsBalancerEnabledRequest)
returns(IsBalancerEnabledResponse);
/** Get a run of the catalog janitor */
rpc RunCatalogScan(RunCatalogScanRequest)
returns(RunCatalogScanResponse);

12
hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
View File

@ -159,6 +159,13 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
re-enabled from the hbase shell by running the command 'catalogjanitor_switch true'
</div>
</%if>
<%if !master.isBalancerOn() %>
<div class="alert alert-warning">
The Load Balancer is not enabled which will eventually cause performance degradation
in HBase as Regions will not be distributed across all RegionServers. The balancer
is only expected to be disabled during rolling upgrade scenarios.
</div>
</%if>
<section>
<h2>Region Servers</h2>
@ -299,6 +306,11 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
java.util.Arrays.toString(master.getMasterCoprocessors()) %></td>
<td>Coprocessors currently loaded by the master</td>
</tr>
<tr>
<td>LoadBalancer</td>
<td><% master.getLoadBalancerClassName() %></td>
<td>LoadBalancer to be used in the Master</td>
</tr>
</%if>
</table>
</section>

21
hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
View File

@ -2315,4 +2315,25 @@ public class HMaster extends HRegionServer implements MasterServices, Server {
public long getLastMajorCompactionTimestampForRegion(byte[] regionName) throws IOException {
return getClusterStatus().getLastMajorCompactionTsForRegion(regionName);
}
/**
* Queries the state of the {@link LoadBalancerTracker}. If the balancer is not initialized,
* false is returned.
*
* @return The state of the load balancer, or false if the load balancer isn't defined.
*/
public boolean isBalancerOn() {
if (null == loadBalancerTracker) return false;
return loadBalancerTracker.isBalancerOn();
}
/**
* Fetch the configured {@link LoadBalancer} class name. If none is set, a default is returned.
*
* @return The name of the {@link LoadBalancer} in use.
*/
public String getLoadBalancerClassName() {
return conf.get(HConstants.HBASE_MASTER_LOADBALANCER_CLASS, LoadBalancerFactory
.getDefaultLoadBalancerClass().getName());
}
}

10
hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
View File

@ -91,6 +91,8 @@ import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableDescripto
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableDescriptorsResponse;
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableNamesRequest;
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableNamesResponse;
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsBalancerEnabledRequest;
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsBalancerEnabledResponse;
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsCatalogJanitorEnabledRequest;
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsCatalogJanitorEnabledResponse;
import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsMasterRunningRequest;
@ -1279,4 +1281,12 @@ public class MasterRpcServices extends RSRpcServices
}
return response.build();
}
@Override
public IsBalancerEnabledResponse isBalancerEnabled(RpcController controller,
IsBalancerEnabledRequest request) throws ServiceException {
IsBalancerEnabledResponse.Builder response = IsBalancerEnabledResponse.newBuilder();
response.setEnabled(master.isBalancerOn());
return response.build();
}
}

11
hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/LoadBalancerFactory.java
View File

@ -29,6 +29,15 @@ import org.apache.hadoop.util.ReflectionUtils;
@InterfaceAudience.Private
public class LoadBalancerFactory {
/**
* The default {@link LoadBalancer} class.
*
* @return The Class for the default {@link LoadBalancer}.
*/
public static Class<? extends LoadBalancer> getDefaultLoadBalancerClass() {
return StochasticLoadBalancer.class;
}
/**
* Create a loadbalancer from the given conf.
* @param conf
@ -38,7 +47,7 @@ public class LoadBalancerFactory {
// Create the balancer
Class<? extends LoadBalancer> balancerKlass =
conf.getClass(HConstants.HBASE_MASTER_LOADBALANCER_CLASS, StochasticLoadBalancer.class,
conf.getClass(HConstants.HBASE_MASTER_LOADBALANCER_CLASS, getDefaultLoadBalancerClass(),
LoadBalancer.class);
return ReflectionUtils.newInstance(balancerKlass, conf);

22
hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin2.java
View File

@ -733,4 +733,26 @@ public class TestAdmin2 {
pair = rawAdmin.getRegion(region.getEncodedNameAsBytes());
assertTrue(Bytes.equals(regionName, pair.getFirst().getRegionName()));
}
@Test(timeout = 30000)
public void testBalancer() throws Exception {
boolean initialState = admin.isBalancerEnabled();
// Start the balancer, wait for it.
boolean prevState = admin.setBalancerRunning(!initialState, true);
// The previous state should be the original state we observed
assertEquals(initialState, prevState);
// Current state should be opposite of the original
assertEquals(!initialState, admin.isBalancerEnabled());
// Reset it back to what it was
prevState = admin.setBalancerRunning(initialState, true);
// The previous state should be the opposite of the initial state
assertEquals(!initialState, prevState);
// Current state should be the original state again
assertEquals(initialState, admin.isBalancerEnabled());
}
}

7
hbase-shell/src/main/ruby/hbase/admin.rb
View File

@ -114,6 +114,13 @@ module Hbase
java.lang.Boolean::valueOf(enableDisable), java.lang.Boolean::valueOf(false))
end
#----------------------------------------------------------------------------------------------
# Query the current state of the LoadBalancer.
# Returns the balancer's state (true is enabled).
def balancer_enabled?()
@admin.isBalancerEnabled()
end
#----------------------------------------------------------------------------------------------
# Request a scan of the catalog table (for garbage collection)
# Returns an int signifying the number of entries cleaned

1
hbase-shell/src/main/ruby/shell.rb
View File

@ -306,6 +306,7 @@ Shell.load_command_group(
assign
balancer
balance_switch
balancer_enabled
close_region
compact
flush

41
hbase-shell/src/main/ruby/shell/commands/balancer_enabled.rb Normal file
View File

@ -0,0 +1,41 @@
#!/usr/bin/env hbase-jruby
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with this
# work for additional information regarding copyright ownership. The ASF
# licenses this file to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
# Prints the current balancer status
module Shell
module Commands
class BalancerEnabled < Command
def help
return <<-EOF
Query the balancer's state.
Examples:
hbase> balancer_enabled
EOF
end
def command()
format_simple_command do
formatter.row([
admin.balancer_enabled?.to_s
])
end
end
end
end
end