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 2017/08/08 04:11:43 UTC
[1/2] hbase git commit: HBASE-18511 Default no regions on master
Repository: hbase
Updated Branches:
refs/heads/master 4376233e2 -> b653d1bf0
HBASE-18511 Default no regions on master
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a8e0267c
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a8e0267c
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a8e0267c
Branch: refs/heads/master
Commit: a8e0267c00409da7e3e03cfb34168787873ef075
Parents: 4376233
Author: Michael Stack <st...@apache.org>
Authored: Sat Aug 5 15:28:40 2017 +0800
Committer: Michael Stack <st...@apache.org>
Committed: Tue Aug 8 12:11:02 2017 +0800
----------------------------------------------------------------------
.../hbase/master/balancer/BaseLoadBalancer.java | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/a8e0267c/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java
index 8f5b6f5..445f80f 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java
@@ -1111,12 +1111,8 @@ public abstract class BaseLoadBalancer implements LoadBalancer {
private static final Random RANDOM = new Random(System.currentTimeMillis());
private static final Log LOG = LogFactory.getLog(BaseLoadBalancer.class);
- // Regions of these tables are put on the master by default.
- private static final String[] DEFAULT_TABLES_ON_MASTER =
- new String[] {AccessControlLists.ACL_TABLE_NAME.getNameAsString(),
- TableName.NAMESPACE_TABLE_NAME.getNameAsString(),
- TableName.META_TABLE_NAME.getNameAsString()};
-
+ // Master carries no regions by default.
+ private static final String[] DEFAULT_TABLES_ON_MASTER = new String[] {};
public static final String TABLES_ON_MASTER =
"hbase.balancer.tablesOnMaster";
@@ -1127,18 +1123,18 @@ public abstract class BaseLoadBalancer implements LoadBalancer {
protected MasterServices services;
/**
- * By default, regions of some small system tables such as meta,
- * namespace, and acl are assigned to the active master. If you don't
- * want to assign any region to the active master, you need to
- * configure "hbase.balancer.tablesOnMaster" to "none".
+ * By default, master carries no regions. This method returns null.
+ * If you want master to carry system tables say, then set
+ * TABLES_ON_MASTER to AccessControlLists.ACL_TABLE_NAME.getNameAsString(),
+ * TableName.NAMESPACE_TABLE_NAME.getNameAsString(),
+ * TableName.META_TABLE_NAME.getNameAsString()
*/
protected static String[] getTablesOnMaster(Configuration conf) {
String valueString = conf.get(TABLES_ON_MASTER);
if (valueString == null) {
return DEFAULT_TABLES_ON_MASTER;
}
- valueString = valueString.trim();
- if (valueString.equalsIgnoreCase("none")) {
+ if (valueString == null || valueString.trim().isEmpty()) {
return null;
}
return StringUtils.getStrings(valueString);
[2/2] hbase git commit: HBASE-18517 limit max log message width in
log4j
Posted by st...@apache.org.
HBASE-18517 limit max log message width in log4j
Signed-off-by: Michael Stack <st...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b653d1bf
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b653d1bf
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b653d1bf
Branch: refs/heads/master
Commit: b653d1bf054737ea841a9298f4eb58fb1a00f1be
Parents: a8e0267
Author: Vikas Vishwakarma <vv...@salesforce.com>
Authored: Sat Aug 5 15:14:09 2017 +0530
Committer: Michael Stack <st...@apache.org>
Committed: Tue Aug 8 12:11:13 2017 +0800
----------------------------------------------------------------------
conf/log4j.properties | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/b653d1bf/conf/log4j.properties
----------------------------------------------------------------------
diff --git a/conf/log4j.properties b/conf/log4j.properties
index a6a560e..15545ff 100644
--- a/conf/log4j.properties
+++ b/conf/log4j.properties
@@ -40,7 +40,7 @@ log4j.appender.DRFA.DatePattern=.yyyy-MM-dd
log4j.appender.DRFA.layout=org.apache.log4j.PatternLayout
# Pattern format: Date LogLevel LoggerName LogMessage
-log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{2}: %m%n
+log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{2}: %.1000m%n
# Rolling File Appender properties
hbase.log.maxfilesize=256MB
@@ -54,7 +54,7 @@ log4j.appender.RFA.MaxFileSize=${hbase.log.maxfilesize}
log4j.appender.RFA.MaxBackupIndex=${hbase.log.maxbackupindex}
log4j.appender.RFA.layout=org.apache.log4j.PatternLayout
-log4j.appender.RFA.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{2}: %m%n
+log4j.appender.RFA.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{2}: %.1000m%n
#
# Security audit appender
@@ -67,7 +67,7 @@ log4j.appender.RFAS.File=${hbase.log.dir}/${hbase.security.log.file}
log4j.appender.RFAS.MaxFileSize=${hbase.security.log.maxfilesize}
log4j.appender.RFAS.MaxBackupIndex=${hbase.security.log.maxbackupindex}
log4j.appender.RFAS.layout=org.apache.log4j.PatternLayout
-log4j.appender.RFAS.layout.ConversionPattern=%d{ISO8601} %p %c: %m%n
+log4j.appender.RFAS.layout.ConversionPattern=%d{ISO8601} %p %c: %.1000m%n
log4j.category.SecurityLogger=${hbase.security.logger}
log4j.additivity.SecurityLogger=false
#log4j.logger.SecurityLogger.org.apache.hadoop.hbase.security.access.AccessController=TRACE
@@ -85,7 +85,7 @@ log4j.appender.NullAppender=org.apache.log4j.varia.NullAppender
log4j.appender.console=org.apache.log4j.ConsoleAppender
log4j.appender.console.target=System.err
log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{2}: %m%n
+log4j.appender.console.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{2}: %.1000m%n
log4j.appender.asyncconsole=org.apache.hadoop.hbase.AsyncConsoleAppender
log4j.appender.asyncconsole.target=System.err