Skip to content
Closed
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -1251,7 +1251,20 @@ default boolean balancer() throws IOException {
* @return <code>true</code> if balancer ran, <code>false</code> otherwise.
* @throws IOException if a remote or network exception occurs
*/
boolean balance() throws IOException;
default boolean balance() throws IOException {
return balance(BalanceRequest.defaultInstance())
.isBalancerRan();
}

/**
* Invoke the balancer with the given balance request. The BalanceRequest defines how the
* balancer will run. See {@link BalanceRequest} for more details.
*
* @param request defines how the balancer should run
* @return {@link BalanceResponse} with details about the results of the invocation.
* @throws IOException if a remote or network exception occurs
*/
BalanceResponse balance(BalanceRequest request) throws IOException;

/**
* Invoke the balancer. Will run the balancer and if regions to move, it will
Expand All @@ -1262,7 +1275,7 @@ default boolean balancer() throws IOException {
* @return <code>true</code> if balancer ran, <code>false</code> otherwise.
* @throws IOException if a remote or network exception occurs
* @deprecated Since 2.0.0. Will be removed in 3.0.0.
* Use {@link #balance(boolean)} instead.
* Use {@link #balance(BalanceRequest)} instead.
*/
@Deprecated
default boolean balancer(boolean force) throws IOException {
Expand All @@ -1277,8 +1290,17 @@ default boolean balancer(boolean force) throws IOException {
* @param force whether we should force balance even if there is region in transition
* @return <code>true</code> if balancer ran, <code>false</code> otherwise.
* @throws IOException if a remote or network exception occurs
* @deprecated Since 2.5.0. Will be removed in 4.0.0.
* Use {@link #balance(BalanceRequest)} instead.
*/
boolean balance(boolean force) throws IOException;
@Deprecated
default boolean balance(boolean force) throws IOException {
return balance(
BalanceRequest.newBuilder()
.setIgnoreRegionsInTransition(force)
.build()
).isBalancerRan();
}

/**
* Query the current state of the balancer.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1257,7 +1257,8 @@ default CompletableFuture<Boolean> balancerSwitch(boolean on) {
* {@link CompletableFuture}.
*/
default CompletableFuture<Boolean> balance() {
return balance(false);
return balance(BalanceRequest.defaultInstance())
.thenApply(BalanceResponse::isBalancerRan);
}

/**
Expand All @@ -1267,8 +1268,25 @@ default CompletableFuture<Boolean> balance() {
* @param forcible whether we should force balance even if there is region in transition.
* @return True if balancer ran, false otherwise. The return value will be wrapped by a
* {@link CompletableFuture}.
* @deprecated Since 2.5.0. Will be removed in 4.0.0.
* Use {@link #balance(BalanceRequest)} instead.
*/
default CompletableFuture<Boolean> balance(boolean forcible) {
return balance(
BalanceRequest.newBuilder()
.setIgnoreRegionsInTransition(forcible)
.build()
).thenApply(BalanceResponse::isBalancerRan);
}

/**
* Invoke the balancer with the given balance request. The BalanceRequest defines how the
* balancer will run. See {@link BalanceRequest} for more details.
*
* @param request defines how the balancer should run
* @return {@link BalanceResponse} with details about the results of the invocation.
*/
CompletableFuture<Boolean> balance(boolean forcible);
CompletableFuture<BalanceResponse> balance(BalanceRequest request);

/**
* Query the current state of the balancer.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -684,8 +684,8 @@ public CompletableFuture<Boolean> balancerSwitch(boolean on, boolean drainRITs)
}

@Override
public CompletableFuture<Boolean> balance(boolean forcible) {
return wrap(rawAdmin.balance(forcible));
public CompletableFuture<BalanceResponse> balance(BalanceRequest request) {
return wrap(rawAdmin.balance(request));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
/*
*
* 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.
*/
package org.apache.hadoop.hbase.client;

import org.apache.yetus.audience.InterfaceAudience;
import org.apache.yetus.audience.InterfaceStability;

/**
* Encapsulates options for executing a run of the Balancer.
*/
@InterfaceAudience.Public
@InterfaceStability.Evolving
public final class BalanceRequest {
private static final BalanceRequest DEFAULT = BalanceRequest.newBuilder().build();

@InterfaceAudience.Public
@InterfaceStability.Evolving
public final static class Builder {
private boolean dryRun = false;
private boolean ignoreRegionsInTransition = false;

private Builder() {}

/**
* Creates a BalancerRequest which runs the balancer in dryRun mode.
* In this mode, the balancer will try to find a plan but WILL NOT
* execute any region moves or call any coprocessors.
*
* You can run in dryRun mode regardless of whether the balancer switch
* is enabled or disabled, but dryRun mode will not run over an existing
* request or chore.
*
* Dry run is useful for testing out new balance configs. See the logs
* on the active HMaster for the results of the dry run.
*/
public Builder setDryRun(boolean dryRun) {
this.dryRun = dryRun;
return this;
}

/**
* Creates a BalancerRequest to cause the balancer to run even if there
* are regions in transition.
*
* WARNING: Advanced usage only, this could cause more issues than it fixes.
*/
public Builder setIgnoreRegionsInTransition(boolean ignoreRegionsInTransition) {
this.ignoreRegionsInTransition = ignoreRegionsInTransition;
return this;
}

public BalanceRequest build() {
return new BalanceRequest(dryRun, ignoreRegionsInTransition);
}
}

public static Builder newBuilder() {
return new Builder();
}

public static BalanceRequest defaultInstance() {
return DEFAULT;
}

private final boolean dryRun;
private final boolean ignoreRegionsInTransition;

private BalanceRequest(boolean dryRun, boolean ignoreRegionsInTransition) {
this.dryRun = dryRun;
this.ignoreRegionsInTransition = ignoreRegionsInTransition;
}

public boolean isDryRun() {
return dryRun;
}

public boolean isIgnoreRegionsInTransition() {
return ignoreRegionsInTransition;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
/*
*
* 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.
*/
package org.apache.hadoop.hbase.client;

import org.apache.yetus.audience.InterfaceAudience;
import org.apache.yetus.audience.InterfaceStability;

/**
* Response returned from a balancer invocation
*/
@InterfaceAudience.Public
@InterfaceStability.Evolving
public final class BalanceResponse {

@InterfaceAudience.Public
@InterfaceStability.Evolving
public final static class Builder {
private boolean balancerRan;
private int movesCalculated;
private int movesExecuted;

private Builder() {}

public Builder setBalancerRan(boolean balancerRan) {
this.balancerRan = balancerRan;
return this;
}

public Builder setMovesCalculated(int movesCalculated) {
this.movesCalculated = movesCalculated;
return this;
}

public Builder setMovesExecuted(int movesExecuted) {
this.movesExecuted = movesExecuted;
return this;
}

public BalanceResponse build() {
return new BalanceResponse(balancerRan, movesCalculated, movesExecuted);
}
}

public static Builder newBuilder() {
return new Builder();
}

private final boolean balancerRan;
private final int movesCalculated;
private final int movesExecuted;

private BalanceResponse(boolean balancerRan, int movesCalculated, int movesExecuted) {
this.balancerRan = balancerRan;
this.movesCalculated = movesCalculated;
this.movesExecuted = movesExecuted;
}

/**
* Determines whether the balancer ran or not. The balancer may not run for a variety of reasons,
* such as: another balance is running, there are regions in transition, the cluster is in
* maintenance mode, etc.
*/
public boolean isBalancerRan() {
return balancerRan;
}

/**
* The number of moves calculated by the balancer if it ran. This may be zero if
* no better balance could be found.
*/
public int getMovesCalculated() {
return movesCalculated;
}

/**
* The number of moves actually executed by the balancer if it ran. This will be
* zero if {@link #getMovesCalculated()} is zero or if {@link BalanceRequest#isDryRun()}
* was true. It may also not be equal to {@link #getMovesCalculated()} if the balancer
* was interrupted midway through executing the moves due to max run time.
*/
public int getMovesExecuted() {
return movesExecuted;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,25 @@
import org.apache.hadoop.hbase.security.access.Permission;
import org.apache.hadoop.hbase.security.access.ShadedAccessControlUtil;
import org.apache.hadoop.hbase.security.access.UserPermission;
import org.apache.hadoop.hbase.snapshot.ClientSnapshotDescriptionUtils;
import org.apache.hadoop.hbase.snapshot.HBaseSnapshotException;
import org.apache.hadoop.hbase.snapshot.RestoreSnapshotException;
import org.apache.hadoop.hbase.snapshot.SnapshotCreationException;
import org.apache.hadoop.hbase.snapshot.UnknownSnapshotException;
import org.apache.hadoop.hbase.util.Addressing;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
import org.apache.hadoop.hbase.util.ForeignExceptionUtil;
import org.apache.hadoop.hbase.util.Pair;
import org.apache.hadoop.ipc.RemoteException;
import org.apache.hadoop.util.StringUtils;
import org.apache.yetus.audience.InterfaceAudience;
import org.apache.yetus.audience.InterfaceStability;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.hbase.thirdparty.com.google.common.base.Preconditions;
import org.apache.hbase.thirdparty.com.google.protobuf.ServiceException;
import org.apache.hbase.thirdparty.org.apache.commons.collections4.CollectionUtils;
import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
import org.apache.hadoop.hbase.shaded.protobuf.RequestConverter;
import org.apache.hadoop.hbase.shaded.protobuf.generated.AccessControlProtos;
Expand Down Expand Up @@ -163,8 +182,7 @@
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.IsProcedureDoneRequest;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.IsProcedureDoneResponse;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.IsRpcThrottleEnabledRequest;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos
.IsSnapshotCleanupEnabledRequest;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.IsSnapshotCleanupEnabledRequest;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.IsSnapshotDoneRequest;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.IsSnapshotDoneResponse;
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.ListDecommissionedRegionServersRequest;
Expand Down Expand Up @@ -211,25 +229,6 @@
import org.apache.hadoop.hbase.shaded.protobuf.generated.ReplicationProtos.RemoveReplicationPeerResponse;
import org.apache.hadoop.hbase.shaded.protobuf.generated.ReplicationProtos.UpdateReplicationPeerConfigResponse;
import org.apache.hadoop.hbase.shaded.protobuf.generated.SnapshotProtos;
import org.apache.hadoop.hbase.snapshot.ClientSnapshotDescriptionUtils;
import org.apache.hadoop.hbase.snapshot.HBaseSnapshotException;
import org.apache.hadoop.hbase.snapshot.RestoreSnapshotException;
import org.apache.hadoop.hbase.snapshot.SnapshotCreationException;
import org.apache.hadoop.hbase.snapshot.UnknownSnapshotException;
import org.apache.hadoop.hbase.util.Addressing;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
import org.apache.hadoop.hbase.util.ForeignExceptionUtil;
import org.apache.hadoop.hbase.util.Pair;
import org.apache.hadoop.ipc.RemoteException;
import org.apache.hadoop.util.StringUtils;
import org.apache.hbase.thirdparty.com.google.common.base.Preconditions;
import org.apache.hbase.thirdparty.com.google.protobuf.ServiceException;
import org.apache.hbase.thirdparty.org.apache.commons.collections4.CollectionUtils;
import org.apache.yetus.audience.InterfaceAudience;
import org.apache.yetus.audience.InterfaceStability;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
* HBaseAdmin is no longer a client API. It is marked InterfaceAudience.Private indicating that
Expand Down Expand Up @@ -1476,26 +1475,14 @@ protected Boolean rpcCall() throws Exception {
});
}

@Override
public boolean balance() throws IOException {
return executeCallable(new MasterCallable<Boolean>(getConnection(), getRpcControllerFactory()) {
@Override
protected Boolean rpcCall() throws Exception {
return master.balance(getRpcController(),
RequestConverter.buildBalanceRequest(false)).getBalancerRan();
}
});
}

@Override
public boolean balance(final boolean force) throws IOException {
return executeCallable(new MasterCallable<Boolean>(getConnection(), getRpcControllerFactory()) {
@Override
protected Boolean rpcCall() throws Exception {
return master.balance(getRpcController(),
RequestConverter.buildBalanceRequest(force)).getBalancerRan();
}
});
@Override public BalanceResponse balance(BalanceRequest request) throws IOException {
return executeCallable(
new MasterCallable<BalanceResponse>(getConnection(), getRpcControllerFactory()) {
@Override protected BalanceResponse rpcCall() throws Exception {
MasterProtos.BalanceRequest req = ProtobufUtil.toBalanceRequest(request);
return ProtobufUtil.toBalanceResponse(master.balance(getRpcController(), req));
}
});
}

@Override
Expand Down
Loading