Repository: ambari Updated Branches: refs/heads/trunk 00e18721e -> 43323f997
http://git-wip-us.apache.org/repos/asf/ambari/blob/43323f99/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/configuration/yarn-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/configuration/yarn-site.xml b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/configuration/yarn-site.xml index 4f30cb9..dd5e9a4 100644 --- a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/configuration/yarn-site.xml +++ b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/configuration/yarn-site.xml @@ -56,7 +56,7 @@ <name>yarn.resourcemanager.scheduler.class</name> <value>org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler</value> <description>The class to use as the resource scheduler.</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.scheduler.minimum-allocation-mb</name> @@ -80,7 +80,7 @@ <name>yarn.nodemanager.resource.memory-mb</name> </property> </depends-on> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.scheduler.maximum-allocation-mb</name> @@ -104,7 +104,7 @@ <name>yarn.nodemanager.resource.memory-mb</name> </property> </depends-on> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.acl.enable</name> @@ -116,7 +116,7 @@ <name>ranger-yarn-plugin-enabled</name> </property> </depends-on> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.admin.acl</name> @@ -125,14 +125,14 @@ <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <!-- NodeManager --> <property> <name>yarn.nodemanager.address</name> <value>0.0.0.0:45454</value> <description>The address of the container manager in the NM.</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.nodemanager.resource.memory-mb</name> @@ -147,13 +147,13 @@ <unit>MB</unit> <increment-step>256</increment-step> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.application.classpath</name> <value>$HADOOP_CONF_DIR,{{stack_root}}/current/hadoop-client/*,{{stack_root}}/current/hadoop-client/lib/*,{{stack_root}}/current/hadoop-hdfs-client/*,{{stack_root}}/current/hadoop-hdfs-client/lib/*,{{stack_root}}/current/hadoop-yarn-client/*,{{stack_root}}/current/hadoop-yarn-client/lib/*</value> <description>Classpath for typical applications.</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.nodemanager.vmem-pmem-ratio</name> @@ -170,7 +170,7 @@ <maximum>5.0</maximum> <increment-step>0.1</increment-step> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.nodemanager.linux-container-executor.group</name> @@ -186,11 +186,12 @@ <name>user_group</name> </property> </depends-on> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.nodemanager.aux-services</name> - <value>mapreduce_shuffle,spark_shuffle,spark2_shuffle</value> + <!-- TODO HDP 3.0, restore back to "mapreduce_shuffle,spark_shuffle,spark2_shuffle" after Spark is added to HDP 3.0 stack. --> + <value>mapreduce_shuffle</value> <description>Auxilliary services of NodeManager. A valid service name should only contain a-zA-Z0-9_ and cannot start with numbers</description> <on-ambari-upgrade add="false"/> </property> @@ -198,7 +199,7 @@ <name>yarn.nodemanager.aux-services.mapreduce_shuffle.class</name> <value>org.apache.hadoop.mapred.ShuffleHandler</value> <description>The auxiliary service class to use </description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.nodemanager.log-dirs</name> @@ -213,7 +214,7 @@ <value-attributes> <type>directories</type> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.nodemanager.local-dirs</name> @@ -228,7 +229,7 @@ <value-attributes> <type>directories</type> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.nodemanager.container-monitor.interval-ms</name> @@ -237,19 +238,19 @@ The interval, in milliseconds, for which the node manager waits between two cycles of monitoring its containers' memory usage. </description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.nodemanager.health-checker.interval-ms</name> <value>135000</value> <description>Frequency of running node health script.</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.nodemanager.health-checker.script.timeout-ms</name> <value>60000</value> <description>Script time out period.</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.nodemanager.log.retain-seconds</name> @@ -258,7 +259,7 @@ Time in seconds to retain user logs. Only applicable if log aggregation is disabled. </description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.log-aggregation-enable</name> @@ -268,14 +269,14 @@ <value-attributes> <type>boolean</type> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.nodemanager.remote-app-log-dir</name> <value>/app-logs</value> <description>Location to aggregate logs to. </description> <property-type>NOT_MANAGED_HDFS_PATH</property-type> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.nodemanager.remote-app-log-dir-suffix</name> @@ -284,7 +285,7 @@ The remote log dir will be created at {yarn.nodemanager.remote-app-log-dir}/${user}/{thisParam}. </description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.nodemanager.log-aggregation.compression-type</name> @@ -292,7 +293,7 @@ <description> T-file compression types used to compress aggregated logs. </description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.nodemanager.delete.debug-delay-sec</name> @@ -312,7 +313,7 @@ of the Yarn applications' log directories is configurable with the yarn.nodemanager.log-dirs property (see also below). </description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.log-aggregation.retain-seconds</name> @@ -321,7 +322,7 @@ How long to keep aggregation logs before deleting them. -1 disables. Be careful set this too small and you will spam the name node. </description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.nodemanager.admin-env</name> @@ -330,7 +331,7 @@ Environment variables that should be forwarded from the NodeManager's environment to the container's. </description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.nodemanager.disk-health-checker.min-healthy-disks</name> @@ -342,7 +343,7 @@ If there are less number of healthy local-dirs (or log-dirs) available, then new containers will not be launched on this node. </description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.resourcemanager.am.max-attempts</name> @@ -355,7 +356,7 @@ the resourcemanager will override it. The default number is set to 2, to allow at least one retry for AM. </description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.resourcemanager.webapp.address</name> @@ -379,7 +380,7 @@ <description> Whether virtual memory limits will be enforced for containers. </description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.log.server.url</name> @@ -398,7 +399,7 @@ file must be specified. If the value is empty, no hosts are excluded. </description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.http.policy</name> @@ -406,7 +407,7 @@ <description> This configures the HTTP endpoint for Yarn Daemons.The following values are supported: - HTTP_ONLY : Service is provided only on http - HTTPS_ONLY : Service is provided only on https </description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <!-- These configs were inherited from HDP 2.1 --> @@ -419,7 +420,7 @@ <value-attributes> <type>boolean</type> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.timeline-service.generic-application-history.store-class</name> @@ -427,7 +428,7 @@ <description> Store class name for history store, defaulting to file system store </description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.timeline-service.webapp.address</name> @@ -461,7 +462,7 @@ <value-attributes> <type>int</type> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.timeline-service.leveldb-timeline-store.ttl-interval-ms</name> @@ -470,7 +471,7 @@ <value-attributes> <type>int</type> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <!-- These properties were inherited from HDP 2.2 --> @@ -480,7 +481,7 @@ <description> Is the registry enabled: does the RM start it up, create the user and system paths, and purge service records when containers, application attempts and applications complete </description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>hadoop.registry.zk.quorum</name> @@ -494,7 +495,7 @@ <name>yarn.nodemanager.recovery.enabled</name> <value>true</value> <description>Enable the node manager to recover after starting</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.nodemanager.recovery.dir</name> @@ -503,19 +504,19 @@ The local filesystem directory in which the node manager will store state when recovery is enabled. </description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.client.nodemanager-connect.retry-interval-ms</name> <value>10000</value> <description>Time interval between each attempt to connect to NM</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.client.nodemanager-connect.max-wait-ms</name> <value>60000</value> <description>Max time to wait to establish a connection to NM</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.resourcemanager.recovery.enabled</name> @@ -524,7 +525,7 @@ Enable RM to recover state after starting. If true, then yarn.resourcemanager.store.class must be specified. </description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.resourcemanager.work-preserving-recovery.enabled</name> @@ -536,7 +537,7 @@ <value-attributes> <type>boolean</type> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.resourcemanager.store.class</name> @@ -547,7 +548,7 @@ the store is implicitly fenced; meaning a single ResourceManager is able to use the store at any point in time. </description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.resourcemanager.zk-address</name> @@ -561,31 +562,31 @@ <name>yarn.resourcemanager.zk-state-store.parent-path</name> <value>/rmstore</value> <description>Full path of the ZooKeeper znode where RM state will be stored. This must be supplied when using org.apache.hadoop.yarn.server.resourcemanager.recovery.ZKRMStateStore as the value for yarn.resourcemanager.store.class</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.resourcemanager.zk-acl</name> <value>world:anyone:rwcda</value> <description>ACL's to be used for ZooKeeper znodes.</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.resourcemanager.work-preserving-recovery.scheduling-wait-ms</name> <value>10000</value> <description>Set the amount of time RM waits before allocating new containers on work-preserving-recovery. Such wait period gives RM a chance to settle down resyncing with NMs in the cluster on recovery, before assigning new containers to applications.</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.resourcemanager.connect.retry-interval.ms</name> <value>30000</value> <description>How often to try connecting to the ResourceManager.</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.resourcemanager.connect.max-wait.ms</name> <value>900000</value> <description>Maximum time to wait to establish connection to ResourceManager</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.resourcemanager.zk-retry-interval-ms</name> @@ -595,43 +596,43 @@ automatically from yarn.resourcemanager.zk-timeout-ms and yarn.resourcemanager.zk-num-retries." </description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.resourcemanager.zk-num-retries</name> <value>1000</value> <description>Number of times RM tries to connect to ZooKeeper.</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.resourcemanager.zk-timeout-ms</name> <value>10000</value> <description>ZooKeeper session timeout in milliseconds. Session expiration is managed by the ZooKeeper cluster itself, not by the client. This value is used by the cluster to determine when the client's session expires. Expirations happens when the cluster does not hear from the client within the specified session timeout period (i.e. no heartbeat).</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.resourcemanager.state-store.max-completed-applications</name> <value>${yarn.resourcemanager.max-completed-applications}</value> <description>The maximum number of completed applications RM state store keeps, less than or equals to ${yarn.resourcemanager.max-completed-applications}. By default, it equals to ${yarn.resourcemanager.max-completed-applications}. This ensures that the applications kept in the state store are consistent with the applications remembered in RM memory. Any values larger than ${yarn.resourcemanager.max-completed-applications} will be reset to ${yarn.resourcemanager.max-completed-applications}. Note that this value impacts the RM recovery performance.Typically, a smaller value indicates better performance on RM recovery.</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.resourcemanager.fs.state-store.retry-policy-spec</name> <value>2000, 500</value> <description>hdfs client retry policy specification. hdfs client retry is always enabled. Specified in pairs of sleep-time and number-of-retries and (t0, n0), (t1, n1), ..., the first n0 retries sleep t0 milliseconds on average, the following n1 retries sleep t1 milliseconds on average, and so on.</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.resourcemanager.fs.state-store.uri</name> <value> </value> <description>RI pointing to the location of the FileSystem path where RM state will be stored. This must be supplied when using org.apache.hadoop.yarn.server.resourcemanager.recovery.FileSystemRMStateStore as the value for yarn.resourcemanager.store.class </description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.resourcemanager.ha.enabled</name> <value>false</value> <description>enable RM HA or not</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.nodemanager.linux-container-executor.resources-handler.class</name> @@ -643,7 +644,7 @@ <name>yarn_cgroups_enabled</name> </property> </depends-on> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.nodemanager.linux-container-executor.cgroups.hierarchy</name> @@ -655,7 +656,7 @@ <name>yarn_cgroups_enabled</name> </property> </depends-on> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.nodemanager.linux-container-executor.cgroups.mount</name> @@ -667,7 +668,7 @@ <name>yarn_cgroups_enabled</name> </property> </depends-on> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.nodemanager.linux-container-executor.cgroups.mount-path</name> @@ -679,13 +680,13 @@ <name>yarn_cgroups_enabled</name> </property> </depends-on> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.nodemanager.linux-container-executor.cgroups.strict-resource-usage</name> <value>false</value> <description>Strictly limit CPU resource usage to allocated usage even if spare CPU is available</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.nodemanager.resource.cpu-vcores</name> @@ -710,7 +711,7 @@ <name>yarn.nodemanager.resource.percentage-physical-cpu-limit</name> </property> </depends-on> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.nodemanager.resource.percentage-physical-cpu-limit</name> @@ -723,7 +724,7 @@ <maximum>100</maximum> <increment-step>1</increment-step> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.node-labels.fs-store.retry-policy-spec</name> @@ -733,19 +734,19 @@ specified by N pairs of sleep-time in milliseconds and number-of-retries "s1,n1,s2,n2,...". </description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.nodemanager.disk-health-checker.min-free-space-per-disk-mb</name> <value>1000</value> <description>This is related to disk size on the machines, admins should set one of yarn.nodemanager.disk-health-checker.min-free-space-per-disk-mb or yarn.nodemanager.disk-health-checker.max-disk-utilization-per-disk-percentage but not both. If both are set, the more conservative value will be used</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.nodemanager.disk-health-checker.max-disk-utilization-per-disk-percentage</name> <value>90</value> <description>This is related to disk size on the machines, admins should set one of yarn.nodemanager.disk-health-checker.min-free-space-per-disk-mb or yarn.nodemanager.disk-health-checker.max-disk-utilization-per-disk-percentage but not both. If both are set, the more conservative value will be used</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.nodemanager.log-aggregation.roll-monitoring-interval-seconds</name> @@ -760,37 +761,37 @@ This configuration is for debug and test purpose. By setting this configuration as true. We can break the lower bound of yarn.nodemanager.log-aggregation.roll-monitoring-interval-seconds</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.nodemanager.log-aggregation.num-log-files-per-app</name> <value>30</value> <description>This is temporary solution. The configuration will be deleted once, we find a more scalable method to only write a single log file per LRS.</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.resourcemanager.system-metrics-publisher.enabled</name> <value>true</value> <description/> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.resourcemanager.system-metrics-publisher.dispatcher.pool-size</name> <value>10</value> <description>Number of worker threads that send the yarn system metrics data.</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.timeline-service.client.max-retries</name> <value>30</value> <description/> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.timeline-service.client.retry-interval-ms</name> <value>1000</value> <description/> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.timeline-service.ttl-enable</name> @@ -801,13 +802,13 @@ <value-attributes> <type>boolean</type> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.timeline-service.state-store-class</name> <value>org.apache.hadoop.yarn.server.timeline.recovery.LeveldbTimelineStateStore</value> <description>Store class name for timeline state store.</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.timeline-service.leveldb-state-store.path</name> @@ -816,7 +817,7 @@ <value-attributes> <type>directory</type> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.timeline-service.leveldb-timeline-store.path</name> @@ -825,7 +826,7 @@ <value-attributes> <type>directory</type> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.timeline-service.leveldb-timeline-store.read-cache-size</name> @@ -833,7 +834,7 @@ <description> Size of read cache for uncompressed blocks for leveldb timeline store in bytes. </description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.timeline-service.leveldb-timeline-store.start-time-read-cache-size</name> @@ -841,7 +842,7 @@ <description> Size of cache for recently read entity start times for leveldb timeline store in number of entities. </description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.timeline-service.leveldb-timeline-store.start-time-write-cache-size</name> @@ -849,7 +850,7 @@ <description> Size of cache for recently written entity start times for leveldb timeline store in number of entities. </description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.timeline-service.http-authentication.type</name> @@ -858,13 +859,13 @@ Defines authentication used for the Timeline Server HTTP endpoint. Supported values are: simple | kerberos | $AUTHENTICATION_HANDLER_CLASSNAME </description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.timeline-service.http-authentication.simple.anonymous.allowed</name> <value>true</value> <description/> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.resourcemanager.webapp.delegation-token-auth-filter.enabled</name> @@ -875,25 +876,25 @@ tokens(fallback to kerberos if the tokens are missing). Only applicable when the http authentication type is kerberos. </description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.resourcemanager.bind-host</name> <value>0.0.0.0</value> <description>Default value is 0.0.0.0, when this is set the service will bind on all interfaces. I think these two options (blank, "0.0.0.0" sans quotes) should be the two available values, with blank as the default.</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.nodemanager.bind-host</name> <value>0.0.0.0</value> <description>Default value is 0.0.0.0, when this is set the service will bind on all interfaces. I think these two options (blank, "0.0.0.0" sans quotes) should be the two available values, with blank as the default.</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.timeline-service.bind-host</name> <value>0.0.0.0</value> <description>Default value is 0.0.0.0, when this is set the service will bind on all interfaces. I think these two options (blank, "0.0.0.0" sans quotes) should be the two available values, with blank as the default.</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.node-labels.fs-store.root-dir</name> @@ -901,7 +902,7 @@ <description> URI for NodeLabelManager. </description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.scheduler.minimum-allocation-vcores</name> @@ -920,7 +921,7 @@ <name>yarn.nodemanager.resource.cpu-vcores</name> </property> </depends-on> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.scheduler.maximum-allocation-vcores</name> @@ -939,7 +940,7 @@ <name>yarn.nodemanager.resource.cpu-vcores</name> </property> </depends-on> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.node-labels.enabled</name> @@ -962,7 +963,7 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.nodemanager.container-executor.class</name> @@ -978,7 +979,7 @@ <name>hadoop.security.authentication</name> </property> </depends-on> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.resourcemanager.scheduler.monitor.enable</name> @@ -1003,7 +1004,7 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <!-- In HDP 2.3, these properties were deleted: yarn.node-labels.manager-class @@ -1017,7 +1018,7 @@ yarn.node-labels.manager-class true, then yarn.timeline-service.state-store-class must be specified. </description> <value>true</value> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.authorization-provider</name> @@ -1028,33 +1029,53 @@ yarn.node-labels.manager-class <name>ranger-yarn-plugin-enabled</name> </property> </depends-on> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> - <!--ats v1.5 properties--> + <!--ats v2.0 properties--> + + <!-- TODO HDP 3.0, set version to 2.0 once ready. --> <property> <name>yarn.timeline-service.version</name> <value>1.5</value> <description>Timeline service version we’re currently using.</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> + </property> + <property> + <name>yarn.system-metricspublisher.enabled</name> + <value>true</value> + <description>Enables YARN to publish metrics to timeline v2</description> + <on-ambari-upgrade add="false"/> + </property> + <property> + <name>yarn.rm.system-metricspublisher.emit-container-events</name> + <value>true</value> + <description>Experimentally enable each container to post timeline events to timeline v2</description> + <on-ambari-upgrade add="false"/> + </property> + <property> + <name>yarn.nodemanager.recovery.supervised</name> + <value>true</value> + <description>Default of false causes NM to kill its containers on shutdown. Should be set to true when NM recovery is enabled.</description> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.timeline-service.store-class</name> <value>org.apache.hadoop.yarn.server.timeline.EntityGroupFSTimelineStore</value> <description>Main storage class for YARN timeline server.</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.timeline-service.entity-group-fs-store.active-dir</name> <value>/ats/active/</value> <description>DFS path to store active application’s timeline data</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.timeline-service.entity-group-fs-store.done-dir</name> <value>/ats/done/</value> <description>DFS path to store done application’s timeline data</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.timeline-service.entity-group-fs-store.group-id-plugin-classes</name> @@ -1063,7 +1084,7 @@ yarn.node-labels.manager-class <value-attributes> <empty-value-valid>true</empty-value-valid> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <!-- advanced ats v1.5 properties--> <property> @@ -1071,7 +1092,7 @@ yarn.node-labels.manager-class <description>Summary storage for ATS v1.5</description> <!-- Use rolling leveldb, advanced --> <value>org.apache.hadoop.yarn.server.timeline.RollingLevelDBTimelineStore</value> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.timeline-service.entity-group-fs-store.scan-interval-seconds</name> @@ -1082,7 +1103,7 @@ yarn.node-labels.manager-class </description> <!-- Default is 60 seconds, advanced --> <value>60</value> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.timeline-service.entity-group-fs-store.cleaner-interval-seconds</name> @@ -1093,7 +1114,7 @@ yarn.node-labels.manager-class </description> <!-- 3600 is default, advanced --> <value>3600</value> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>yarn.timeline-service.entity-group-fs-store.retain-seconds</name> @@ -1103,7 +1124,7 @@ yarn.node-labels.manager-class </description> <!-- 7 days is default, advanced --> <value>604800</value> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <!-- These configs were inherited from HDP 2.4 --> @@ -1111,7 +1132,7 @@ yarn.node-labels.manager-class <name>yarn.nodemanager.aux-services.spark_shuffle.class</name> <value>org.apache.spark.network.yarn.YarnShuffleService</value> <description>The auxiliary service class to use for Spark</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <!-- These configs were inherited from HDP 2.5 --> http://git-wip-us.apache.org/repos/asf/ambari/blob/43323f99/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/metainfo.xml b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/metainfo.xml index 14eae07..b5b6d48 100644 --- a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/metainfo.xml @@ -40,7 +40,7 @@ <timeout>1200</timeout> </commandScript> - <!-- TODO Alejandro add later after UI is fixed, + <!-- TODO HDP 3.0, add later after UI is fixed, <dependencies> <dependency> <name>TEZ/TEZ_CLIENT</name> @@ -73,7 +73,7 @@ <timeout>1200</timeout> </commandScript> - <!-- TODO Alejandro add later after UI is fixed, + <!-- TODO HDP 3.0, add later after UI is fixed, <dependencies> <dependency> <name>TEZ/TEZ_CLIENT</name> @@ -268,7 +268,7 @@ <co-locate>YARN/RESOURCEMANAGER</co-locate> </auto-deploy> - <!-- TODO Alejandro add later after UI is fixed, + <!-- TODO HDP 3.0, add later after UI is fixed, <dependencies> <dependency> <name>HDFS/HDFS_CLIENT</name> http://git-wip-us.apache.org/repos/asf/ambari/blob/43323f99/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/package/scripts/status_params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/package/scripts/status_params.py b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/package/scripts/status_params.py index c2e9d92..7c1b2c7 100644 --- a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/package/scripts/status_params.py +++ b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/package/scripts/status_params.py @@ -46,11 +46,11 @@ else: yarn_pid_dir = format("{yarn_pid_dir_prefix}/{yarn_user}") mapred_pid_dir = format("{mapred_pid_dir_prefix}/{mapred_user}") - resourcemanager_pid_file = format("{yarn_pid_dir}/yarn-{yarn_user}-resourcemanager.pid") - nodemanager_pid_file = format("{yarn_pid_dir}/yarn-{yarn_user}-nodemanager.pid") - yarn_historyserver_pid_file_old = format("{yarn_pid_dir}/yarn-{yarn_user}-historyserver.pid") - yarn_historyserver_pid_file = format("{yarn_pid_dir}/yarn-{yarn_user}-timelineserver.pid") # *-historyserver.pid is deprecated - mapred_historyserver_pid_file = format("{mapred_pid_dir}/mapred-{mapred_user}-historyserver.pid") + resourcemanager_pid_file = format("{yarn_pid_dir}/hadoop-{yarn_user}-resourcemanager.pid") + nodemanager_pid_file = format("{yarn_pid_dir}/hadoop-{yarn_user}-nodemanager.pid") + yarn_historyserver_pid_file_old = format("{yarn_pid_dir}/hadoop-{yarn_user}-historyserver.pid") + yarn_historyserver_pid_file = format("{yarn_pid_dir}/hadoop-{yarn_user}-timelineserver.pid") # *-historyserver.pid is deprecated + mapred_historyserver_pid_file = format("{mapred_pid_dir}/hadoop-{mapred_user}-historyserver.pid") hadoop_conf_dir = functions.conf_select.get_hadoop_conf_dir()
