Repository: hadoop Updated Branches: refs/heads/trunk d5abd293a -> b68901d7d
YARN-4708. Missing default mapper type in TimelineServer performance test tool usage. Contributed by Kai Sasaki. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b68901d7 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b68901d7 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b68901d7 Branch: refs/heads/trunk Commit: b68901d7dde9cb48545fcf0b94f2ac266b909a5d Parents: d5abd29 Author: Tsuyoshi Ozawa <[email protected]> Authored: Mon Feb 22 07:49:50 2016 +0900 Committer: Tsuyoshi Ozawa <[email protected]> Committed: Mon Feb 22 07:54:53 2016 +0900 ---------------------------------------------------------------------- .../hadoop/mapreduce/TimelineServicePerformance.java | 2 +- hadoop-yarn-project/CHANGES.txt | 2 ++ .../src/site/markdown/TimelineServer.md | 13 +++++++------ 3 files changed, 10 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b68901d7/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TimelineServicePerformance.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TimelineServicePerformance.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TimelineServicePerformance.java index 9f76659..0753d7f 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TimelineServicePerformance.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TimelineServicePerformance.java @@ -48,7 +48,7 @@ public class TimelineServicePerformance extends Configured implements Tool { ")\n" + " [-v] timeline service version\n" + " [-mtype <mapper type in integer>]\n" + - " 1. simple entity write mapper\n" + + " 1. simple entity write mapper (default)\n" + " 2. jobhistory files replay mapper\n" + " [-s <(KBs)test>] number of KB per put (mtype=1, default: " + SimpleEntityWriterV1.KBS_SENT_DEFAULT + " KB)\n" + http://git-wip-us.apache.org/repos/asf/hadoop/blob/b68901d7/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 9b64204..d6aa4e4 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -135,6 +135,8 @@ Release 2.9.0 - UNRELEASED YARN-4689. FairScheduler: Cleanup preemptContainer to be more readable. (Kai Sasaki via kasha) + YARN-4708. Missing default mapper type in TimelineServer performance test tool + usage. (Kai Sasaki via ozawa) OPTIMIZATIONS http://git-wip-us.apache.org/repos/asf/hadoop/blob/b68901d7/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServer.md ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServer.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServer.md index 3e589d3..b10c860 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServer.md +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServer.md @@ -783,8 +783,8 @@ String. | `entitytype` | string | The entity type | | `relatedentities` | map | The related entities' identifiers, which are organized in a map of entityType : [entity1, entity2, ...] | | `events` | list | The events of the entity | -| `primaryfilters` | map | The primary filters of the entity, which are orgainzied in a map of key : [value1, value2, ...] | -| `otherinfo` | map | The other information of the entity, which is orgainzied in a map of key : value | +| `primaryfilters` | map | The primary filters of the entity, which are organized in a map of key : [value1, value2, ...] | +| `otherinfo` | map | The other information of the entity, which is organized in a map of key : value | | `starttime` | long | The start time of the entity | ### Response Examples: @@ -2038,7 +2038,7 @@ this failure *will not* result in an HTTP error code being retured. A status code of 200 will be returned âhowever, there will be an error code in the list of failed entities for each entity which could not be added. -<a name="TIMELINE_SERVER_PERFORMANCE_TEST_TOOL"></a> Timelnine Server Performance Test Tool +<a name="TIMELINE_SERVER_PERFORMANCE_TEST_TOOL"></a> Timeline Server Performance Test Tool ---------- ###<a name="HIGHLIGHTS"></a>Highlights @@ -2054,7 +2054,8 @@ Mapper Types Description: 1. SimpleEntityWriter mapper Each mapper writes a user-specified number of timeline entities - with a user-specified size to the timeline server. + with a user-specified size to the timeline server. SimpleEntityWrite + is a default mapper of the performance test tool. 2. JobHistoryFileReplay mapper Each mapper replays jobhistory files under a specified directory @@ -2071,7 +2072,7 @@ Options: [-m <maps>] number of mappers (default: 1) [-v] timeline service version [-mtype <mapper type in integer>] - 1. simple entity write mapper + 1. simple entity write mapper (default) 2. jobhistory files replay mapper [-s <(KBs)test>] number of KB per put (mtype=1, default: 1 KB) [-t] package sending iterations per mapper (mtype=1, default: 100) @@ -2105,7 +2106,7 @@ Example input of JobHistoryFileReplay mapper test: /testInput/job_2.jhist /testInput/job_2_conf.xml -Eample output of JobHistoryFileReplay test: +Example output of JobHistoryFileReplay test: TRANSACTION RATE (per mapper): 4000.0 ops/s IO RATE (per mapper): 0.0 KB/s
