You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2018/09/07 23:51:51 UTC
[1/8] hbase git commit: HBASE-20307 LoadTestTool prints too much
zookeeper logging (Colin Garcia)
Repository: hbase
Updated Branches:
refs/heads/branch-1 d236a5fab -> 6f4cbde10
refs/heads/branch-1.2 ca8584993 -> 30fe214aa
refs/heads/branch-1.3 386fdb2c3 -> d4440e6bc
refs/heads/branch-1.4 a8b7beb44 -> c9e166577
refs/heads/branch-2 1b65c2f16 -> 7d9e5538b
refs/heads/branch-2.0 fb311bb88 -> 3c06de6b8
refs/heads/branch-2.1 12ffa086c -> f85fba4a5
refs/heads/master c3419be00 -> 9af7bc620
HBASE-20307 LoadTestTool prints too much zookeeper logging (Colin Garcia)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/9af7bc62
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9af7bc62
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9af7bc62
Branch: refs/heads/master
Commit: 9af7bc6204fba6d44fbd9078dfa8d017f0ff993f
Parents: c3419be
Author: Andrew Purtell <ap...@apache.org>
Authored: Fri Sep 7 15:09:09 2018 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Sep 7 15:09:09 2018 -0700
----------------------------------------------------------------------
.../java/org/apache/hadoop/hbase/util/LoadTestTool.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/9af7bc62/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java
----------------------------------------------------------------------
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java
index 4178858..f4f483e 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java
@@ -36,7 +36,10 @@ import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
+import org.apache.log4j.Level;
+import org.apache.log4j.LogManager;
import org.apache.yetus.audience.InterfaceAudience;
+import org.apache.zookeeper.ZooKeeper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.hadoop.hbase.client.Admin;
@@ -113,6 +116,8 @@ public class LoadTestTool extends AbstractHBaseTool {
protected static final String OPT_USAGE_COMPRESSION = "Compression type, " +
"one of " + Arrays.toString(Compression.Algorithm.values());
+ protected static final String OPT_VERBOSE = "verbose";
+
public static final String OPT_BLOOM = "bloom";
public static final String OPT_COMPRESSION = "compression";
public static final String OPT_DEFERRED_LOG_FLUSH = "deferredlogflush";
@@ -186,7 +191,7 @@ public class LoadTestTool extends AbstractHBaseTool {
protected long startKey, endKey;
- protected boolean isWrite, isRead, isUpdate;
+ protected boolean isVerbose, isWrite, isRead, isUpdate;
protected boolean deferredLogFlush;
// Column family options
@@ -314,6 +319,7 @@ public class LoadTestTool extends AbstractHBaseTool {
@Override
protected void addOptions() {
+ addOptNoArg("v", OPT_VERBOSE, "Will display a full readout of logs, including ZooKeeper");
addOptWithArg(OPT_ZK_QUORUM, "ZK quorum as comma-separated host names " +
"without port numbers");
addOptWithArg(OPT_ZK_PARENT_NODE, "name of parent znode in zookeeper");
@@ -416,6 +422,7 @@ public class LoadTestTool extends AbstractHBaseTool {
families = HFileTestUtil.DEFAULT_COLUMN_FAMILIES;
}
+ isVerbose = cmd.hasOption(OPT_VERBOSE);
isWrite = cmd.hasOption(OPT_WRITE);
isRead = cmd.hasOption(OPT_READ);
isUpdate = cmd.hasOption(OPT_UPDATE);
@@ -565,6 +572,9 @@ public class LoadTestTool extends AbstractHBaseTool {
@Override
protected int doWork() throws IOException {
+ if (!isVerbose) {
+ LogManager.getLogger(ZooKeeper.class.getName()).setLevel(Level.WARN);
+ }
if (numTables > 1) {
return parallelLoadTables();
} else {
[3/8] hbase git commit: HBASE-20307 LoadTestTool prints too much
zookeeper logging (Colin Garcia)
Posted by ap...@apache.org.
HBASE-20307 LoadTestTool prints too much zookeeper logging (Colin Garcia)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f85fba4a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f85fba4a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f85fba4a
Branch: refs/heads/branch-2.1
Commit: f85fba4a547baefe4ec6d8466edec754d7b19458
Parents: 12ffa08
Author: Andrew Purtell <ap...@apache.org>
Authored: Fri Sep 7 15:09:09 2018 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Sep 7 15:09:46 2018 -0700
----------------------------------------------------------------------
.../java/org/apache/hadoop/hbase/util/LoadTestTool.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/f85fba4a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java
----------------------------------------------------------------------
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java
index 4178858..f4f483e 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java
@@ -36,7 +36,10 @@ import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
+import org.apache.log4j.Level;
+import org.apache.log4j.LogManager;
import org.apache.yetus.audience.InterfaceAudience;
+import org.apache.zookeeper.ZooKeeper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.hadoop.hbase.client.Admin;
@@ -113,6 +116,8 @@ public class LoadTestTool extends AbstractHBaseTool {
protected static final String OPT_USAGE_COMPRESSION = "Compression type, " +
"one of " + Arrays.toString(Compression.Algorithm.values());
+ protected static final String OPT_VERBOSE = "verbose";
+
public static final String OPT_BLOOM = "bloom";
public static final String OPT_COMPRESSION = "compression";
public static final String OPT_DEFERRED_LOG_FLUSH = "deferredlogflush";
@@ -186,7 +191,7 @@ public class LoadTestTool extends AbstractHBaseTool {
protected long startKey, endKey;
- protected boolean isWrite, isRead, isUpdate;
+ protected boolean isVerbose, isWrite, isRead, isUpdate;
protected boolean deferredLogFlush;
// Column family options
@@ -314,6 +319,7 @@ public class LoadTestTool extends AbstractHBaseTool {
@Override
protected void addOptions() {
+ addOptNoArg("v", OPT_VERBOSE, "Will display a full readout of logs, including ZooKeeper");
addOptWithArg(OPT_ZK_QUORUM, "ZK quorum as comma-separated host names " +
"without port numbers");
addOptWithArg(OPT_ZK_PARENT_NODE, "name of parent znode in zookeeper");
@@ -416,6 +422,7 @@ public class LoadTestTool extends AbstractHBaseTool {
families = HFileTestUtil.DEFAULT_COLUMN_FAMILIES;
}
+ isVerbose = cmd.hasOption(OPT_VERBOSE);
isWrite = cmd.hasOption(OPT_WRITE);
isRead = cmd.hasOption(OPT_READ);
isUpdate = cmd.hasOption(OPT_UPDATE);
@@ -565,6 +572,9 @@ public class LoadTestTool extends AbstractHBaseTool {
@Override
protected int doWork() throws IOException {
+ if (!isVerbose) {
+ LogManager.getLogger(ZooKeeper.class.getName()).setLevel(Level.WARN);
+ }
if (numTables > 1) {
return parallelLoadTables();
} else {
[7/8] hbase git commit: HBASE-20307 LoadTestTool prints too much
zookeeper logging (Colin Garcia)
Posted by ap...@apache.org.
HBASE-20307 LoadTestTool prints too much zookeeper logging (Colin Garcia)
Conflicts:
hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d4440e6b
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d4440e6b
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d4440e6b
Branch: refs/heads/branch-1.3
Commit: d4440e6bce37401e16ecbdde95cc214ad97f5548
Parents: 386fdb2
Author: Andrew Purtell <ap...@apache.org>
Authored: Fri Sep 7 15:09:09 2018 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Sep 7 16:51:11 2018 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/util/LoadTestTool.java | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/d4440e6b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java
index 2867daf..431a38e 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java
@@ -42,6 +42,11 @@ import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.classification.InterfaceAudience;
+import org.apache.log4j.Level;
+import org.apache.log4j.LogManager;
+import org.apache.zookeeper.ZooKeeper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.ConnectionFactory;
import org.apache.hadoop.hbase.client.Durability;
@@ -118,6 +123,8 @@ public class LoadTestTool extends AbstractHBaseTool {
+ "compression) to use for data blocks in the test column family, "
+ "one of " + Arrays.toString(DataBlockEncoding.values()) + ".";
+ protected static final String OPT_VERBOSE = "verbose";
+
public static final String OPT_BLOOM = "bloom";
public static final String OPT_COMPRESSION = "compression";
public static final String OPT_DEFERRED_LOG_FLUSH = "deferredlogflush";
@@ -190,7 +197,7 @@ public class LoadTestTool extends AbstractHBaseTool {
protected long startKey, endKey;
- protected boolean isWrite, isRead, isUpdate;
+ protected boolean isVerbose, isWrite, isRead, isUpdate;
protected boolean deferredLogFlush;
// Column family options
@@ -308,6 +315,7 @@ public class LoadTestTool extends AbstractHBaseTool {
@Override
protected void addOptions() {
+ addOptNoArg("v", OPT_VERBOSE, "Will display a full readout of logs, including ZooKeeper");
addOptWithArg(OPT_ZK_QUORUM, "ZK quorum as comma-separated host names " +
"without port numbers");
addOptWithArg(OPT_ZK_PARENT_NODE, "name of parent znode in zookeeper");
@@ -375,6 +383,7 @@ public class LoadTestTool extends AbstractHBaseTool {
families = DEFAULT_COLUMN_FAMILIES;
}
+ isVerbose = cmd.hasOption(OPT_VERBOSE);
isWrite = cmd.hasOption(OPT_WRITE);
isRead = cmd.hasOption(OPT_READ);
isUpdate = cmd.hasOption(OPT_UPDATE);
@@ -533,6 +542,9 @@ public class LoadTestTool extends AbstractHBaseTool {
@Override
protected int doWork() throws IOException {
+ if (!isVerbose) {
+ LogManager.getLogger(ZooKeeper.class.getName()).setLevel(Level.WARN);
+ }
if (numTables > 1) {
return parallelLoadTables();
} else {
[4/8] hbase git commit: HBASE-20307 LoadTestTool prints too much
zookeeper logging (Colin Garcia)
Posted by ap...@apache.org.
HBASE-20307 LoadTestTool prints too much zookeeper logging (Colin Garcia)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/3c06de6b
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3c06de6b
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3c06de6b
Branch: refs/heads/branch-2.0
Commit: 3c06de6b842c949828c2640b545d1b1cda09e147
Parents: fb311bb
Author: Andrew Purtell <ap...@apache.org>
Authored: Fri Sep 7 15:09:09 2018 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Sep 7 15:09:50 2018 -0700
----------------------------------------------------------------------
.../java/org/apache/hadoop/hbase/util/LoadTestTool.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/3c06de6b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java
----------------------------------------------------------------------
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java
index 0f7c5c0..e33f61a 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java
@@ -36,7 +36,10 @@ import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
+import org.apache.log4j.Level;
+import org.apache.log4j.LogManager;
import org.apache.yetus.audience.InterfaceAudience;
+import org.apache.zookeeper.ZooKeeper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.hadoop.hbase.client.Admin;
@@ -113,6 +116,8 @@ public class LoadTestTool extends AbstractHBaseTool {
protected static final String OPT_USAGE_COMPRESSION = "Compression type, " +
"one of " + Arrays.toString(Compression.Algorithm.values());
+ protected static final String OPT_VERBOSE = "verbose";
+
public static final String OPT_BLOOM = "bloom";
public static final String OPT_COMPRESSION = "compression";
public static final String OPT_DEFERRED_LOG_FLUSH = "deferredlogflush";
@@ -186,7 +191,7 @@ public class LoadTestTool extends AbstractHBaseTool {
protected long startKey, endKey;
- protected boolean isWrite, isRead, isUpdate;
+ protected boolean isVerbose, isWrite, isRead, isUpdate;
protected boolean deferredLogFlush;
// Column family options
@@ -314,6 +319,7 @@ public class LoadTestTool extends AbstractHBaseTool {
@Override
protected void addOptions() {
+ addOptNoArg("v", OPT_VERBOSE, "Will display a full readout of logs, including ZooKeeper");
addOptWithArg(OPT_ZK_QUORUM, "ZK quorum as comma-separated host names " +
"without port numbers");
addOptWithArg(OPT_ZK_PARENT_NODE, "name of parent znode in zookeeper");
@@ -416,6 +422,7 @@ public class LoadTestTool extends AbstractHBaseTool {
families = HFileTestUtil.DEFAULT_COLUMN_FAMILIES;
}
+ isVerbose = cmd.hasOption(OPT_VERBOSE);
isWrite = cmd.hasOption(OPT_WRITE);
isRead = cmd.hasOption(OPT_READ);
isUpdate = cmd.hasOption(OPT_UPDATE);
@@ -565,6 +572,9 @@ public class LoadTestTool extends AbstractHBaseTool {
@Override
protected int doWork() throws IOException {
+ if (!isVerbose) {
+ LogManager.getLogger(ZooKeeper.class.getName()).setLevel(Level.WARN);
+ }
if (numTables > 1) {
return parallelLoadTables();
} else {
[6/8] hbase git commit: HBASE-20307 LoadTestTool prints too much
zookeeper logging (Colin Garcia)
Posted by ap...@apache.org.
HBASE-20307 LoadTestTool prints too much zookeeper logging (Colin Garcia)
Conflicts:
hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/30fe214a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/30fe214a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/30fe214a
Branch: refs/heads/branch-1.2
Commit: 30fe214aa1775d7dc7635634ede776fc0f39b824
Parents: ca85849
Author: Andrew Purtell <ap...@apache.org>
Authored: Fri Sep 7 15:09:09 2018 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Sep 7 16:51:09 2018 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/util/LoadTestTool.java | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/30fe214a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java
index 2867daf..431a38e 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java
@@ -42,6 +42,11 @@ import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.classification.InterfaceAudience;
+import org.apache.log4j.Level;
+import org.apache.log4j.LogManager;
+import org.apache.zookeeper.ZooKeeper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.ConnectionFactory;
import org.apache.hadoop.hbase.client.Durability;
@@ -118,6 +123,8 @@ public class LoadTestTool extends AbstractHBaseTool {
+ "compression) to use for data blocks in the test column family, "
+ "one of " + Arrays.toString(DataBlockEncoding.values()) + ".";
+ protected static final String OPT_VERBOSE = "verbose";
+
public static final String OPT_BLOOM = "bloom";
public static final String OPT_COMPRESSION = "compression";
public static final String OPT_DEFERRED_LOG_FLUSH = "deferredlogflush";
@@ -190,7 +197,7 @@ public class LoadTestTool extends AbstractHBaseTool {
protected long startKey, endKey;
- protected boolean isWrite, isRead, isUpdate;
+ protected boolean isVerbose, isWrite, isRead, isUpdate;
protected boolean deferredLogFlush;
// Column family options
@@ -308,6 +315,7 @@ public class LoadTestTool extends AbstractHBaseTool {
@Override
protected void addOptions() {
+ addOptNoArg("v", OPT_VERBOSE, "Will display a full readout of logs, including ZooKeeper");
addOptWithArg(OPT_ZK_QUORUM, "ZK quorum as comma-separated host names " +
"without port numbers");
addOptWithArg(OPT_ZK_PARENT_NODE, "name of parent znode in zookeeper");
@@ -375,6 +383,7 @@ public class LoadTestTool extends AbstractHBaseTool {
families = DEFAULT_COLUMN_FAMILIES;
}
+ isVerbose = cmd.hasOption(OPT_VERBOSE);
isWrite = cmd.hasOption(OPT_WRITE);
isRead = cmd.hasOption(OPT_READ);
isUpdate = cmd.hasOption(OPT_UPDATE);
@@ -533,6 +542,9 @@ public class LoadTestTool extends AbstractHBaseTool {
@Override
protected int doWork() throws IOException {
+ if (!isVerbose) {
+ LogManager.getLogger(ZooKeeper.class.getName()).setLevel(Level.WARN);
+ }
if (numTables > 1) {
return parallelLoadTables();
} else {
[2/8] hbase git commit: HBASE-20307 LoadTestTool prints too much
zookeeper logging (Colin Garcia)
Posted by ap...@apache.org.
HBASE-20307 LoadTestTool prints too much zookeeper logging (Colin Garcia)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/7d9e5538
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7d9e5538
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7d9e5538
Branch: refs/heads/branch-2
Commit: 7d9e5538ba1936d12a2e056fd732872c3ab9888a
Parents: 1b65c2f
Author: Andrew Purtell <ap...@apache.org>
Authored: Fri Sep 7 15:09:09 2018 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Sep 7 15:09:36 2018 -0700
----------------------------------------------------------------------
.../java/org/apache/hadoop/hbase/util/LoadTestTool.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/7d9e5538/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java
----------------------------------------------------------------------
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java
index 4178858..f4f483e 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java
@@ -36,7 +36,10 @@ import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
+import org.apache.log4j.Level;
+import org.apache.log4j.LogManager;
import org.apache.yetus.audience.InterfaceAudience;
+import org.apache.zookeeper.ZooKeeper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.hadoop.hbase.client.Admin;
@@ -113,6 +116,8 @@ public class LoadTestTool extends AbstractHBaseTool {
protected static final String OPT_USAGE_COMPRESSION = "Compression type, " +
"one of " + Arrays.toString(Compression.Algorithm.values());
+ protected static final String OPT_VERBOSE = "verbose";
+
public static final String OPT_BLOOM = "bloom";
public static final String OPT_COMPRESSION = "compression";
public static final String OPT_DEFERRED_LOG_FLUSH = "deferredlogflush";
@@ -186,7 +191,7 @@ public class LoadTestTool extends AbstractHBaseTool {
protected long startKey, endKey;
- protected boolean isWrite, isRead, isUpdate;
+ protected boolean isVerbose, isWrite, isRead, isUpdate;
protected boolean deferredLogFlush;
// Column family options
@@ -314,6 +319,7 @@ public class LoadTestTool extends AbstractHBaseTool {
@Override
protected void addOptions() {
+ addOptNoArg("v", OPT_VERBOSE, "Will display a full readout of logs, including ZooKeeper");
addOptWithArg(OPT_ZK_QUORUM, "ZK quorum as comma-separated host names " +
"without port numbers");
addOptWithArg(OPT_ZK_PARENT_NODE, "name of parent znode in zookeeper");
@@ -416,6 +422,7 @@ public class LoadTestTool extends AbstractHBaseTool {
families = HFileTestUtil.DEFAULT_COLUMN_FAMILIES;
}
+ isVerbose = cmd.hasOption(OPT_VERBOSE);
isWrite = cmd.hasOption(OPT_WRITE);
isRead = cmd.hasOption(OPT_READ);
isUpdate = cmd.hasOption(OPT_UPDATE);
@@ -565,6 +572,9 @@ public class LoadTestTool extends AbstractHBaseTool {
@Override
protected int doWork() throws IOException {
+ if (!isVerbose) {
+ LogManager.getLogger(ZooKeeper.class.getName()).setLevel(Level.WARN);
+ }
if (numTables > 1) {
return parallelLoadTables();
} else {
[8/8] hbase git commit: HBASE-20307 LoadTestTool prints too much
zookeeper logging (Colin Garcia)
Posted by ap...@apache.org.
HBASE-20307 LoadTestTool prints too much zookeeper logging (Colin Garcia)
Conflicts:
hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c9e16657
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c9e16657
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c9e16657
Branch: refs/heads/branch-1.4
Commit: c9e1665774300bb12c722a84c598b93a60ceaecf
Parents: a8b7beb
Author: Andrew Purtell <ap...@apache.org>
Authored: Fri Sep 7 15:09:09 2018 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Sep 7 16:51:13 2018 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/util/LoadTestTool.java | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/c9e16657/hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java
index e812d7b..8506d44 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java
@@ -43,6 +43,11 @@ import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.classification.InterfaceAudience;
+import org.apache.log4j.Level;
+import org.apache.log4j.LogManager;
+import org.apache.zookeeper.ZooKeeper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.ConnectionFactory;
import org.apache.hadoop.hbase.client.Durability;
@@ -119,6 +124,8 @@ public class LoadTestTool extends AbstractHBaseTool {
+ "compression) to use for data blocks in the test column family, "
+ "one of " + Arrays.toString(DataBlockEncoding.values()) + ".";
+ protected static final String OPT_VERBOSE = "verbose";
+
public static final String OPT_BLOOM = "bloom";
public static final String OPT_COMPRESSION = "compression";
public static final String OPT_DEFERRED_LOG_FLUSH = "deferredlogflush";
@@ -191,7 +198,7 @@ public class LoadTestTool extends AbstractHBaseTool {
protected long startKey, endKey;
- protected boolean isWrite, isRead, isUpdate;
+ protected boolean isVerbose, isWrite, isRead, isUpdate;
protected boolean deferredLogFlush;
// Column family options
@@ -309,6 +316,7 @@ public class LoadTestTool extends AbstractHBaseTool {
@Override
protected void addOptions() {
+ addOptNoArg("v", OPT_VERBOSE, "Will display a full readout of logs, including ZooKeeper");
addOptWithArg(OPT_ZK_QUORUM, "ZK quorum as comma-separated host names " +
"without port numbers");
addOptWithArg(OPT_ZK_PARENT_NODE, "name of parent znode in zookeeper");
@@ -376,6 +384,7 @@ public class LoadTestTool extends AbstractHBaseTool {
families = DEFAULT_COLUMN_FAMILIES;
}
+ isVerbose = cmd.hasOption(OPT_VERBOSE);
isWrite = cmd.hasOption(OPT_WRITE);
isRead = cmd.hasOption(OPT_READ);
isUpdate = cmd.hasOption(OPT_UPDATE);
@@ -534,6 +543,9 @@ public class LoadTestTool extends AbstractHBaseTool {
@Override
protected int doWork() throws IOException {
+ if (!isVerbose) {
+ LogManager.getLogger(ZooKeeper.class.getName()).setLevel(Level.WARN);
+ }
if (numTables > 1) {
return parallelLoadTables();
} else {
[5/8] hbase git commit: HBASE-20307 LoadTestTool prints too much
zookeeper logging (Colin Garcia)
Posted by ap...@apache.org.
HBASE-20307 LoadTestTool prints too much zookeeper logging (Colin Garcia)
Conflicts:
hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6f4cbde1
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6f4cbde1
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6f4cbde1
Branch: refs/heads/branch-1
Commit: 6f4cbde1032aa49e9dc6d4bf8331bfab51114556
Parents: d236a5f
Author: Andrew Purtell <ap...@apache.org>
Authored: Fri Sep 7 15:09:09 2018 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Sep 7 16:50:56 2018 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/util/LoadTestTool.java | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/6f4cbde1/hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java
index e812d7b..8506d44 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java
@@ -43,6 +43,11 @@ import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.classification.InterfaceAudience;
+import org.apache.log4j.Level;
+import org.apache.log4j.LogManager;
+import org.apache.zookeeper.ZooKeeper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.ConnectionFactory;
import org.apache.hadoop.hbase.client.Durability;
@@ -119,6 +124,8 @@ public class LoadTestTool extends AbstractHBaseTool {
+ "compression) to use for data blocks in the test column family, "
+ "one of " + Arrays.toString(DataBlockEncoding.values()) + ".";
+ protected static final String OPT_VERBOSE = "verbose";
+
public static final String OPT_BLOOM = "bloom";
public static final String OPT_COMPRESSION = "compression";
public static final String OPT_DEFERRED_LOG_FLUSH = "deferredlogflush";
@@ -191,7 +198,7 @@ public class LoadTestTool extends AbstractHBaseTool {
protected long startKey, endKey;
- protected boolean isWrite, isRead, isUpdate;
+ protected boolean isVerbose, isWrite, isRead, isUpdate;
protected boolean deferredLogFlush;
// Column family options
@@ -309,6 +316,7 @@ public class LoadTestTool extends AbstractHBaseTool {
@Override
protected void addOptions() {
+ addOptNoArg("v", OPT_VERBOSE, "Will display a full readout of logs, including ZooKeeper");
addOptWithArg(OPT_ZK_QUORUM, "ZK quorum as comma-separated host names " +
"without port numbers");
addOptWithArg(OPT_ZK_PARENT_NODE, "name of parent znode in zookeeper");
@@ -376,6 +384,7 @@ public class LoadTestTool extends AbstractHBaseTool {
families = DEFAULT_COLUMN_FAMILIES;
}
+ isVerbose = cmd.hasOption(OPT_VERBOSE);
isWrite = cmd.hasOption(OPT_WRITE);
isRead = cmd.hasOption(OPT_READ);
isUpdate = cmd.hasOption(OPT_UPDATE);
@@ -534,6 +543,9 @@ public class LoadTestTool extends AbstractHBaseTool {
@Override
protected int doWork() throws IOException {
+ if (!isVerbose) {
+ LogManager.getLogger(ZooKeeper.class.getName()).setLevel(Level.WARN);
+ }
if (numTables > 1) {
return parallelLoadTables();
} else {