You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2020/07/17 22:52:54 UTC
[hbase] branch branch-2 updated (e08da3b -> 552008c)
This is an automated email from the ASF dual-hosted git repository.
stack pushed a change to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git.
from e08da3b HBASE-24675: On Master restart all servers are assigned to default rsgroup
add be946b0 HBASE-24722 Update commands with unintentional return values (#2058)
new 552008c HBASE-24698 Turn OFF Canary WebUI as default (#2037)
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/hadoop/hbase/tool/CanaryTool.java | 17 +-
.../src/main/ruby/shell/commands/balance_switch.rb | 2 +-
.../src/main/ruby/shell/commands/balancer.rb | 4 +-
.../ruby/shell/commands/catalogjanitor_enabled.rb | 4 +-
.../ruby/shell/commands/catalogjanitor_switch.rb | 4 +-
.../ruby/shell/commands/cleaner_chore_enabled.rb | 4 +-
.../ruby/shell/commands/cleaner_chore_switch.rb | 4 +-
.../main/ruby/shell/commands/clear_block_cache.rb | 1 +
.../main/ruby/shell/commands/clear_deadservers.rb | 12 +-
.../commands/disable_exceed_throttle_quota.rb | 2 +-
.../ruby/shell/commands/disable_rpc_throttle.rb | 2 +-
.../shell/commands/enable_exceed_throttle_quota.rb | 2 +-
.../ruby/shell/commands/enable_rpc_throttle.rb | 2 +-
.../src/main/ruby/shell/commands/is_disabled.rb | 6 +-
.../src/main/ruby/shell/commands/normalize.rb | 4 +-
.../main/ruby/shell/commands/normalizer_enabled.rb | 4 +-
.../main/ruby/shell/commands/normalizer_switch.rb | 4 +-
.../ruby/shell/commands/snapshot_cleanup_switch.rb | 2 +-
.../ruby/shell/commands/splitormerge_enabled.rb | 6 +-
.../ruby/shell/commands/splitormerge_switch.rb | 4 +-
hbase-shell/src/test/ruby/hbase/admin_test.rb | 198 ++++++++++++++++++++-
hbase-shell/src/test/ruby/hbase/quotas_test.rb | 18 +-
22 files changed, 261 insertions(+), 45 deletions(-)
[hbase] 01/01: HBASE-24698 Turn OFF Canary WebUI as default (#2037)
Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
stack pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 552008c57713c25d939e3cffd393bc1e1316f64f
Author: Michael Stack <sa...@users.noreply.github.com>
AuthorDate: Fri Jul 17 15:07:43 2020 -0700
HBASE-24698 Turn OFF Canary WebUI as default (#2037)
Signed-off-by: Duo Zhang <zh...@apache.org>
Signed-off-by: Nick Dimiduk <nd...@apache.org>
---
.../java/org/apache/hadoop/hbase/tool/CanaryTool.java | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/CanaryTool.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/CanaryTool.java
index b7edccb..9ed2b91 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/CanaryTool.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/CanaryTool.java
@@ -1,5 +1,4 @@
-/**
- *
+/*
* 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
@@ -21,7 +20,6 @@ package org.apache.hadoop.hbase.tool;
import static org.apache.hadoop.hbase.HConstants.DEFAULT_ZOOKEEPER_ZNODE_PARENT;
import static org.apache.hadoop.hbase.HConstants.ZOOKEEPER_ZNODE_PARENT;
-
import java.io.Closeable;
import java.io.IOException;
import java.net.BindException;
@@ -50,7 +48,6 @@ import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.LongAdder;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-
import org.apache.commons.lang3.time.StopWatch;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.AuthUtil;
@@ -102,7 +99,6 @@ import org.apache.zookeeper.client.ConnectStringParser;
import org.apache.zookeeper.data.Stat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;
import org.apache.hbase.thirdparty.com.google.common.collect.Lists;
@@ -127,15 +123,10 @@ import org.apache.hbase.thirdparty.com.google.common.collect.Lists;
@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.TOOLS)
public class CanaryTool implements Tool, Canary {
public static final String HBASE_CANARY_INFO_PORT = "hbase.canary.info.port";
-
- public static final int DEFAULT_CANARY_INFOPORT = 16050;
-
public static final String HBASE_CANARY_INFO_BINDADDRESS = "hbase.canary.info.bindAddress";
- private InfoServer infoServer;
-
private void putUpWebUI() throws IOException {
- int port = conf.getInt(HBASE_CANARY_INFO_PORT, DEFAULT_CANARY_INFOPORT);
+ int port = conf.getInt(HBASE_CANARY_INFO_PORT, -1);
// -1 is for disabling info server
if (port < 0) {
return;
@@ -147,7 +138,7 @@ public class CanaryTool implements Tool, Canary {
} else {
String addr = conf.get(HBASE_CANARY_INFO_BINDADDRESS, "0.0.0.0");
try {
- infoServer = new InfoServer("canary", addr, port, false, conf);
+ InfoServer infoServer = new InfoServer("canary", addr, port, false, conf);
infoServer.addUnprivilegedServlet("canary", "/canary-status", CanaryStatusServlet.class);
infoServer.setAttribute("sink", this.sink);
infoServer.start();
@@ -1114,6 +1105,8 @@ public class CanaryTool implements Tool, Canary {
System.err.println(" -D<configProperty>=<value> to assign or override configuration params");
System.err.println(" -Dhbase.canary.read.raw.enabled=<true/false> Set to enable/disable " +
"raw scan; default=false");
+ System.err.println(" -Dhbase.canary.info.port=PORT_NUMBER Set for a Canary UI; " +
+ "default=-1 (None)");
System.err.println("");
System.err.println("Canary runs in one of three modes: region (default), regionserver, or " +
"zookeeper.");