Repository: hbase Updated Branches: refs/heads/master a292ab7c8 -> e73616856
HBASE-21303 [shell] clear_deadservers with no args fails Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e7361685 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e7361685 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e7361685 Branch: refs/heads/master Commit: e73616856706c695cf3e2fac9b4d2a2c10666f75 Parents: a292ab7 Author: Michael Stack <st...@apache.org> Authored: Fri Oct 12 10:34:59 2018 -0700 Committer: Michael Stack <st...@apache.org> Committed: Fri Oct 12 11:19:56 2018 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/client/HBaseAdmin.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/e7361685/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java index 178e6f9..45961ff 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java @@ -25,6 +25,7 @@ import java.io.IOException; import java.io.InterruptedIOException; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.EnumSet; import java.util.HashMap; import java.util.Iterator; @@ -4313,15 +4314,13 @@ public class HBaseAdmin implements Admin { } @Override - public List<ServerName> clearDeadServers(final List<ServerName> servers) throws IOException { - if (servers == null || servers.size() == 0) { - throw new IllegalArgumentException("servers cannot be null or empty"); - } + public List<ServerName> clearDeadServers(List<ServerName> servers) throws IOException { return executeCallable(new MasterCallable<List<ServerName>>(getConnection(), getRpcControllerFactory()) { @Override protected List<ServerName> rpcCall() throws Exception { - ClearDeadServersRequest req = RequestConverter.buildClearDeadServersRequest(servers); + ClearDeadServersRequest req = RequestConverter. + buildClearDeadServersRequest(servers == null? Collections.EMPTY_LIST: servers); return ProtobufUtil.toServerNameList( master.clearDeadServers(getRpcController(), req).getServerNameList()); }
