Repository: hadoop
Updated Branches:
  refs/heads/branch-2 cc2a2a8e0 -> 900e6b435


YARN-8156. Increase the default value of 
yarn.timeline-service.app-collector.linger-period.ms. Contributed by Charan 
Hebri.

(cherry picked from commit 669eb7bdea34f26e9b9b8a2260ae4356791622e7)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/900e6b43
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/900e6b43
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/900e6b43

Branch: refs/heads/branch-2
Commit: 900e6b435a32bb0726275faf86bb5b7382a5572e
Parents: cc2a2a8
Author: Rohith Sharma K S <rohithsharm...@apache.org>
Authored: Sat Apr 14 10:31:28 2018 +0530
Committer: Rohith Sharma K S <rohithsharm...@apache.org>
Committed: Sat Apr 14 11:15:30 2018 +0530

----------------------------------------------------------------------
 .../main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java   | 2 +-
 .../hadoop-yarn-common/src/main/resources/yarn-default.xml         | 2 +-
 .../collector/TestPerNodeTimelineCollectorsAuxService.java         | 2 ++
 .../hadoop-yarn-site/src/site/markdown/TimelineServiceV2.md.vm     | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/900e6b43/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
----------------------------------------------------------------------
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
index b058e83..3f0c735 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
@@ -2338,7 +2338,7 @@ public class YarnConfiguration extends Configuration {
   public static final String ATS_APP_COLLECTOR_LINGER_PERIOD_IN_MS =
       TIMELINE_SERVICE_PREFIX + "app-collector.linger-period.ms";
 
-  public static final int DEFAULT_ATS_APP_COLLECTOR_LINGER_PERIOD_IN_MS = 1000;
+  public static final int DEFAULT_ATS_APP_COLLECTOR_LINGER_PERIOD_IN_MS = 
60000;
 
   public static final String NUMBER_OF_ASYNC_ENTITIES_TO_MERGE =
       TIMELINE_SERVICE_PREFIX

http://git-wip-us.apache.org/repos/asf/hadoop/blob/900e6b43/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
----------------------------------------------------------------------
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
index 24279f5..3e5e5ca 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
@@ -2380,7 +2380,7 @@
     <description>Time period till which the application collector will be alive
      in NM, after the  application master container finishes.</description>
     <name>yarn.timeline-service.app-collector.linger-period.ms</name>
-    <value>1000</value>
+    <value>60000</value>
   </property>
 
   <property>

http://git-wip-us.apache.org/repos/asf/hadoop/blob/900e6b43/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/collector/TestPerNodeTimelineCollectorsAuxService.java
----------------------------------------------------------------------
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/collector/TestPerNodeTimelineCollectorsAuxService.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/collector/TestPerNodeTimelineCollectorsAuxService.java
index 0320739..9d2bb24 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/collector/TestPerNodeTimelineCollectorsAuxService.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/collector/TestPerNodeTimelineCollectorsAuxService.java
@@ -70,6 +70,8 @@ public class TestPerNodeTimelineCollectorsAuxService {
     conf.setFloat(YarnConfiguration.TIMELINE_SERVICE_VERSION, 2.0f);
     conf.setClass(YarnConfiguration.TIMELINE_SERVICE_WRITER_CLASS,
         FileSystemTimelineWriterImpl.class, TimelineWriter.class);
+    conf.setLong(YarnConfiguration.ATS_APP_COLLECTOR_LINGER_PERIOD_IN_MS,
+        1000L);
   }
 
   @After

http://git-wip-us.apache.org/repos/asf/hadoop/blob/900e6b43/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServiceV2.md.vm
----------------------------------------------------------------------
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServiceV2.md.vm
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServiceV2.md.vm
index f073f54..62fff1e 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServiceV2.md.vm
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServiceV2.md.vm
@@ -138,7 +138,7 @@ New configuration parameters that are introduced with v.2 
are marked bold.
 | `yarn.timeline-service.reader.bind-host` | The actual address the timeline 
reader will bind to. If this optional address is set, reader server will bind 
to this address and the port specified in 
yarn.timeline-service.reader.webapp.address. This is most useful for making the 
service listen on all interfaces by setting to 0.0.0.0. |
 | **`yarn.timeline-service.hbase.configuration.file`** | Optional URL to an 
hbase-site.xml configuration file to be used to connect to the timeline-service 
hbase cluster. If empty or not specified, then the HBase configuration will be 
loaded from the classpath. When specified the values in the specified 
configuration file will override those from the ones that are present on the 
classpath. Defaults to `null`. |
 | **`yarn.timeline-service.writer.flush-interval-seconds`** | The setting that 
controls how often the timeline collector flushes the timeline writer. Defaults 
to `60`. |
-| **`yarn.timeline-service.app-collector.linger-period.ms`** | Time period 
till which the application collector will be alive in NM, after the  
application master container finishes. Defaults to `1000` (1 second). |
+| **`yarn.timeline-service.app-collector.linger-period.ms`** | Time period 
till which the application collector will be alive in NM, after the application 
master container finishes. Defaults to `60000` (60 seconds). |
 | 
**`yarn.timeline-service.timeline-client.number-of-async-entities-to-merge`** | 
Time line V2 client tries to merge these many number of async entities (if 
available) and then call the REST ATS V2 API to submit. Defaults to `10`. |
 | 
**`yarn.timeline-service.hbase.coprocessor.app-final-value-retention-milliseconds`**
 | The setting that controls how long the final value of a metric of a 
completed app is retained before merging into the flow sum. Defaults to 
`259200000` (3 days). This should be set in the HBase cluster. |
 | **`yarn.rm.system-metrics-publisher.emit-container-events`** | The setting 
that controls whether yarn container metrics is published to the timeline 
server or not by RM. This configuration setting is for ATS V2. Defaults to 
`false`. |


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

Reply via email to