You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by aw...@apache.org on 2015/02/17 18:00:05 UTC
hadoop git commit: HADOOP-11575. Daemon log documentation is
misleading (Naganarasimha G R via aw)
Repository: hadoop
Updated Branches:
refs/heads/trunk 8b787e2fd -> 72389c78d
HADOOP-11575. Daemon log documentation is misleading (Naganarasimha G R via aw)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/72389c78
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/72389c78
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/72389c78
Branch: refs/heads/trunk
Commit: 72389c78dba1e2f7727245838180fb51e5241075
Parents: 8b787e2
Author: Allen Wittenauer <aw...@apache.org>
Authored: Tue Feb 17 07:00:00 2015 -1000
Committer: Allen Wittenauer <aw...@apache.org>
Committed: Tue Feb 17 07:00:00 2015 -1000
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
.../java/org/apache/hadoop/log/LogLevel.java | 10 +++++-----
.../src/site/markdown/CommandsManual.md | 10 ++++++----
.../src/site/apt/YarnCommands.apt.vm | 21 +++++++++++---------
4 files changed, 26 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/72389c78/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 0d1ef36..1256ae5 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -175,6 +175,9 @@ Trunk (Unreleased)
HADOOP-11495. Convert site documentation from apt to markdown
(Masatake Iwasaki via aw)
+ HADOOP-11575. Daemon log documentation is misleading
+ (Naganarasimha G R via aw)
+
BUG FIXES
HADOOP-11473. test-patch says "-1 overall" even when all checks are +1
http://git-wip-us.apache.org/repos/asf/hadoop/blob/72389c78/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/log/LogLevel.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/log/LogLevel.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/log/LogLevel.java
index 4749ce1..baf71b6 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/log/LogLevel.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/log/LogLevel.java
@@ -38,8 +38,8 @@ import org.apache.hadoop.util.ServletUtil;
@InterfaceStability.Evolving
public class LogLevel {
public static final String USAGES = "\nUsage: General options are:\n"
- + "\t[-getlevel <host:httpPort> <name>]\n"
- + "\t[-setlevel <host:httpPort> <name> <level>]\n";
+ + "\t[-getlevel <host:httpPort> <classname>]\n"
+ + "\t[-setlevel <host:httpPort> <classname> <level>]\n";
/**
* A command line implementation
@@ -106,7 +106,7 @@ public class LogLevel {
if (logName != null) {
out.println("<br /><hr /><h3>Results</h3>");
out.println(MARKER
- + "Submitted Log Name: <b>" + logName + "</b><br />");
+ + "Submitted Class Name: <b>" + logName + "</b><br />");
Log log = LogFactory.getLog(logName);
out.println(MARKER
@@ -131,10 +131,10 @@ public class LogLevel {
}
static final String FORMS = "\n<br /><hr /><h3>Get / Set</h3>"
- + "\n<form>Log: <input type='text' size='50' name='log' /> "
+ + "\n<form>Class Name: <input type='text' size='50' name='log' /> "
+ "<input type='submit' value='Get Log Level' />"
+ "</form>"
- + "\n<form>Log: <input type='text' size='50' name='log' /> "
+ + "\n<form>Class Name: <input type='text' size='50' name='log' /> "
+ "Level: <input type='text' name='level' /> "
+ "<input type='submit' value='Set Log Level' />"
+ "</form>";
http://git-wip-us.apache.org/repos/asf/hadoop/blob/72389c78/hadoop-common-project/hadoop-common/src/site/markdown/CommandsManual.md
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/site/markdown/CommandsManual.md b/hadoop-common-project/hadoop-common/src/site/markdown/CommandsManual.md
index f0c0367..62235c5 100644
--- a/hadoop-common-project/hadoop-common/src/site/markdown/CommandsManual.md
+++ b/hadoop-common-project/hadoop-common/src/site/markdown/CommandsManual.md
@@ -212,14 +212,16 @@ Commands useful for administrators of a hadoop cluster.
### `daemonlog`
-Usage: `hadoop daemonlog -getlevel <host:port> <name> ` Usage: `hadoop daemonlog -setlevel <host:port> <name> <level> `
+Usage: `hadoop daemonlog -getlevel <host:httpport> <classname> ` Usage: `hadoop daemonlog -setlevel <host:httpport> <classname> <level> `
| COMMAND\_OPTION | Description |
|:---- |:---- |
-| `-getlevel` *host:port* *name* | Prints the log level of the daemon running at *host:port*. This command internally connects to http://host:port/logLevel?log=name |
-| `-setlevel` *host:port* *name* *level* | Sets the log level of the daemon running at *host:port*. This command internally connects to http://host:port/logLevel?log=name |
+| `-getlevel` *host:httpport* *classname* | Prints the log level of the log identified by a qualified *classname*, in the daemon running at *host:httpport*. This command internally connects to `http://<host:httpport>/logLevel?log=<classname>` |
+| `-setlevel` *host:httpport* *classname* *level* | Sets the log level of the log identified by a qualified *classname*, in the daemon running at *host:httpport*. This command internally connects to `http://<host:httpport>/logLevel?log=<classname>&level=<level>` |
-Get/Set the log level for each daemon.
+Get/Set the log level for a Log identified by a qualified class name in the daemon.
+
+ Example: $ bin/hadoop daemonlog -setlevel 127.0.0.1:50070 org.apache.hadoop.hdfs.server.namenode.NameNode DEBUG
Files
-----
http://git-wip-us.apache.org/repos/asf/hadoop/blob/72389c78/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/YarnCommands.apt.vm
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/YarnCommands.apt.vm b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/YarnCommands.apt.vm
index 6333d70..67f8a58 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/YarnCommands.apt.vm
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/YarnCommands.apt.vm
@@ -194,24 +194,27 @@ YARN Commands
Usage:
---------------------------------
- yarn daemonlog -getlevel <host:port> <name>
- yarn daemonlog -setlevel <host:port> <name> <level>
+ yarn daemonlog -getlevel <host:httpport> <classname>
+ yarn daemonlog -setlevel <host:httpport> <classname> <level>
---------------------------------
*---------------+--------------+
|| COMMAND_OPTIONS || Description |
*---------------+--------------+
-| -getlevel \<host:port\> \<name\> | Prints the log level of the daemon running
-| | at \<host:port\>. This command internally connects to
-| | http://\<host:port\>/logLevel?log=\<name\>
+| -getlevel \<host:httpport\> \<classname\> | Prints the log level of the log identified
+| | by a qualified \<classname\>, in the daemon running at \<host:httpport\>. This
+| | command internally connects to http://\<host:httpport\>/logLevel?log=\<classname\>
*---------------+--------------+
-| -setlevel \<host:port\> \<name\> \<level\> | Sets the log level of the daemon
-| | running at \<host:port\>. This command internally connects to
-| | http://\<host:port\>/logLevel?log=\<name\>
+| -setlevel \<host:httpport\> \<classname\> \<level\> | Sets the log level of the log
+| | identified by a qualified \<classname\> in the daemon running at \<host:httpport\>.
+| | This command internally connects to http://\<host:httpport\>/logLevel?log=\<classname\>&level=\<level\>
*---------------+--------------+
- Get/Set the log level for each daemon.
+ Get/Set the log level for a Log identified by a qualified class name in the daemon.
+----
+ Example: $ bin/yarn daemonlog -setlevel 127.0.0.1:8088 org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMAppImpl DEBUG
+----
** <<<nodemanager>>>