751bba3d14
MAPREDUCE-5806. Fixed a bug in MRAppMaster so as to enable users to properly override HADOOP_ROOT_LOGGER or HADOOP_CLIENT_OPTS. Contributed by Varun Vasudev.
...
svn merge --ignore-ancestry -c 1580100https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580101 13f79535-47bb-0310-9956-ffa450edef68
2014-03-22 00:33:21 +00:00
8f3f0caee1
YARN-1854. Fixed test failure in TestRMHA#testStartAndTransitions. Contributed by Rohith Sharma KS.
...
svn merge --ignore-ancestry -c 1580097 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580098 13f79535-47bb-0310-9956-ffa450edef68
2014-03-22 00:30:11 +00:00
b51df9d67d
YARN-1863. Fixed test failure in TestRMFailover after YARN-1859. Contributed by Xuan Gong.
...
svn merge --ignore-ancestry -c 1580094 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580095 13f79535-47bb-0310-9956-ffa450edef68
2014-03-22 00:25:51 +00:00
08a194fb55
YARN-1775. Enhanced ProcfsBasedProcessTree to optionally add the ability to use smaps for obtaining used memory information. Contributed by Rajesh Balamohan.
...
svn merge --ignore-ancestry -c 1580087 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580088 13f79535-47bb-0310-9956-ffa450edef68
2014-03-22 00:02:26 +00:00
b701a84d37
Merge r1580077 from trunk. YARN-1849. Fixed NPE in ResourceTrackerService#registerNodeManager for UAM. Contributed by Karthik Kambatla
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580078 13f79535-47bb-0310-9956-ffa450edef68
2014-03-21 22:57:09 +00:00
444af8fac5
MAPREDUCE-5787. Added the ability to keep alive shuffle connections in the MapReduce shuffle-handler. Contributed by Rajesh Balamohan.
...
svn merge --ignore-ancestry -c 1580062 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580063 13f79535-47bb-0310-9956-ffa450edef68
2014-03-21 21:44:24 +00:00
8891c7d08b
HDFS-6120. Merging r1580047 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580048 13f79535-47bb-0310-9956-ffa450edef68
2014-03-21 20:57:44 +00:00
e3acf75912
svn merge -c 1580013 from trunk for merging site.xml (missing from previous commit)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580018 13f79535-47bb-0310-9956-ffa450edef68
2014-03-21 18:50:57 +00:00
86277cde7d
svn merge -c 1580013 from trunk for HDFS-6138. Add a user guide for how to use viewfs with federation.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580014 13f79535-47bb-0310-9956-ffa450edef68
2014-03-21 18:48:34 +00:00
d1f2d89a43
YARN-1670. Fixed a bug in log-aggregation that can cause the writer to write more log-data than the log-length that it records. Contributed by Mit Desai.
...
svn merge --ignore-ancestry -c 1580005 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580006 13f79535-47bb-0310-9956-ffa450edef68
2014-03-21 18:36:25 +00:00
2c3feeb727
svn merge -c 1579995 merging from trunk to branch-2 to fix:MAPREDUCE-5804. TestMRJobsWithProfiler#testProfiler timesout. Contributed by Mit Desai.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579998 13f79535-47bb-0310-9956-ffa450edef68
2014-03-21 17:58:33 +00:00
e1bda693dd
YARN-1811. Fixed AMFilters in YARN to correctly accept requests from either web-app proxy or the RMs when HA is enabled. Contributed by Robert Kanter.
...
svn merge --ignore-ancestry -c 1579877 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579878 13f79535-47bb-0310-9956-ffa450edef68
2014-03-21 04:21:14 +00:00
c7b39f75ba
YARN-1859. Fixed WebAppProxyServlet to correctly handle applications absent on the ResourceManager. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1579866 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579867 13f79535-47bb-0310-9956-ffa450edef68
2014-03-21 02:03:41 +00:00
2f8d99f642
YARN-1855. Made Application-history server to be optional in MiniYARNCluster and thus avoid the failure of TestRMFailover#testRMWebAppRedirect. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1579838 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579839 13f79535-47bb-0310-9956-ffa450edef68
2014-03-21 00:18:56 +00:00
2bf6f06235
HDFS-6038. Merge r1579813 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579814 13f79535-47bb-0310-9956-ffa450edef68
2014-03-20 23:08:32 +00:00
1bd3b792dd
YARN-1570. Fixed formatting of the lines in YarnCommands.apt.vm docs source. Contributed by Akira Ajisaka.
...
svn merge --ignore-ancestry -c 1579797 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579798 13f79535-47bb-0310-9956-ffa450edef68
2014-03-20 22:14:39 +00:00
6aa3081681
HDFS-6131. Move HDFSHighAvailabilityWithNFS.apt.vm and HDFSHighAvailabilityWithQJM.apt.vm from Yarn to HDFS. Contributed by Jing Zhao.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579736 13f79535-47bb-0310-9956-ffa450edef68
2014-03-20 21:03:42 +00:00
43c923e930
HDFS-6089. Standby NN while transitioning to active throws a connection refused error when the prior active NN process is suspended. Contributed by Jing Zhao.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579694 13f79535-47bb-0310-9956-ffa450edef68
2014-03-20 17:44:29 +00:00
f94a9c0bd0
svn merge -c 1579670 from trunk for HDFS-6129. When a replica is not found for deletion, do not throw an exception.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579671 13f79535-47bb-0310-9956-ffa450edef68
2014-03-20 15:51:28 +00:00
d955e84f39
HDFS-6127. Merge r1579546 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579548 13f79535-47bb-0310-9956-ffa450edef68
2014-03-20 07:01:35 +00:00
31a3a99f05
MAPREDUCE-2349. Modified FileInputFormat to be able to issue file and block location calls in parallel. Contributed by Siddharth Seth.
...
svn merge --ignore-ancestry -c 1579515 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579516 13f79535-47bb-0310-9956-ffa450edef68
2014-03-20 02:48:48 +00:00
af6b5b8e9a
YARN-1640. Fixed manual failover of ResourceManagers to work correctly in secure clusters. Contributed by Xuan Gong.
...
svn merge --ignore-ancestry -c 1579510 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579511 13f79535-47bb-0310-9956-ffa450edef68
2014-03-20 02:40:54 +00:00
b65d53331e
HDFS-6105. Merge r1579468 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579474 13f79535-47bb-0310-9956-ffa450edef68
2014-03-19 23:58:24 +00:00
75a37d14bb
svn merge -c 1579396 from trunk for HDFS-6123. Do not log stack trace for ReplicaAlreadyExistsException and SocketTimeoutException.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579397 13f79535-47bb-0310-9956-ffa450edef68
2014-03-19 21:05:52 +00:00
a72cbb919b
HADOOP-10221. Merging r1579387 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579388 13f79535-47bb-0310-9956-ffa450edef68
2014-03-19 20:23:28 +00:00
8a65533982
HADOOP-10221. Merging r1579382 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579383 13f79535-47bb-0310-9956-ffa450edef68
2014-03-19 20:18:24 +00:00
6ba1656628
HDFS-6100. Merge r1579301 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579303 13f79535-47bb-0310-9956-ffa450edef68
2014-03-19 17:33:51 +00:00
76f4a32aec
HDFS-6099. Merging change r1579122 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579128 13f79535-47bb-0310-9956-ffa450edef68
2014-03-19 03:55:53 +00:00
e39ccf3b24
YARN-1690. Made DistributedShell send timeline entities+events. Contributed by Mayank Bansal.
...
svn merge --ignore-ancestry -c 1579123 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579124 13f79535-47bb-0310-9956-ffa450edef68
2014-03-19 03:51:27 +00:00
65fd55768d
Merge r1579104 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579106 13f79535-47bb-0310-9956-ffa450edef68
2014-03-19 01:10:50 +00:00
495cc5e128
HDFS-6112. NFS Gateway docs are incorrect for allowed hosts configuration. Contributed by Aaron T. Myers.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579099 13f79535-47bb-0310-9956-ffa450edef68
2014-03-19 00:31:43 +00:00
d33b320214
YARN-1705. Reset cluster-metrics on transition to standby. (Rohith via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579015 13f79535-47bb-0310-9956-ffa450edef68
2014-03-18 19:03:24 +00:00
b18aaa79f5
Merge 1579004 and 1579005 from trunk for HDFS-6068. Disallow snapshot names that are also invalid directory names.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579007 13f79535-47bb-0310-9956-ffa450edef68
2014-03-18 18:36:57 +00:00
c05e10b50a
HDFS-6007. Update documentation about short-circuit local reads (iwasakims via cmccabe)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578995 13f79535-47bb-0310-9956-ffa450edef68
2014-03-18 18:14:53 +00:00
de68e1d6de
YARN-1846. TestRM#testNMTokenSentForNormalContainer assumes CapacityScheduler. (Robert Kanter via kasha)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578767 13f79535-47bb-0310-9956-ffa450edef68
2014-03-18 07:00:29 +00:00
0c6db6af6e
YARN-1512. Enhanced CapacityScheduler to be able to decouple scheduling from node-heartbeats. Contributed by Arun C Murthy.
...
svn merge --ignore-ancestry -c 1578722 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578724 13f79535-47bb-0310-9956-ffa450edef68
2014-03-18 02:53:50 +00:00
f8d157cda8
HADOOP-10383 InterfaceStability annotations should have RetentionPolicy.RUNTIME
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578694 13f79535-47bb-0310-9956-ffa450edef68
2014-03-18 01:07:57 +00:00
d611f42c37
Merge r1578669 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578676 13f79535-47bb-0310-9956-ffa450edef68
2014-03-18 00:10:22 +00:00
80f3726024
YARN-1839. Fixed handling of NMTokens in ResourceManager such that containers launched by AMs running on the same machine as the AM are correctly propagated. Contributed by Jian He.
...
svn merge --ignore-ancestry -c 1578631 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578632 13f79535-47bb-0310-9956-ffa450edef68
2014-03-17 22:22:58 +00:00
597c7d054f
YARN-1591. Fixed AsyncDispatcher to handle interrupts on shutdown in a sane manner and thus fix failure of TestResourceTrackerService. Contributed by Tsuyoshi Ozawa.
...
svn merge --ignore-ancestry -c 1578628 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578629 13f79535-47bb-0310-9956-ffa450edef68
2014-03-17 22:18:09 +00:00
69835b9651
Merge r1578614 from trunk. Fixed AM container log to show on NM web page after application finishes if log-aggregation is disabled. Contributed by Rohith Sharmaks
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578618 13f79535-47bb-0310-9956-ffa450edef68
2014-03-17 21:52:41 +00:00
6aae750762
YARN-1685. Fixed few bugs related to handling of containers' log-URLs on ResourceManager and history-service. Contributed by Zhijie Shen.
...
svn merge --ignore-ancestry -c 1578602 ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578603 13f79535-47bb-0310-9956-ffa450edef68
2014-03-17 21:36:51 +00:00
6db6c6744f
HDFS-5516. Merging change r1578549 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578552 13f79535-47bb-0310-9956-ffa450edef68
2014-03-17 20:30:20 +00:00
8e38068076
YARN-1136. Replace junit.framework.Assert with org.junit.Assert (Chen He via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578546 13f79535-47bb-0310-9956-ffa450edef68
2014-03-17 20:20:22 +00:00
453c36b191
HDFS-6107. When a block cannot be cached due to limited space on the DataNode, it becomes uncacheable (cmccabe)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578515 13f79535-47bb-0310-9956-ffa450edef68
2014-03-17 19:00:53 +00:00
ed83fe61e2
Merge r1578486 from trunk. YARN-1830. Fixed TestRMRestart#testQueueMetricsOnRMRestart failure due to race condition when app is submitted. Contributed by Zhijie Shen
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578487 13f79535-47bb-0310-9956-ffa450edef68
2014-03-17 18:06:17 +00:00
4ea49506cf
HDFS-6094. Merging r1578478 from trunk to branch-2.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578480 13f79535-47bb-0310-9956-ffa450edef68
2014-03-17 17:38:31 +00:00
92db0d3558
YARN-1845. Elapsed time for failed tasks that never started is wrong (Rushabh S Shah via jeagles)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578460 13f79535-47bb-0310-9956-ffa450edef68
2014-03-17 16:56:43 +00:00
d470c7b71a
YARN-1824. Improved NodeManager and clients to be able to handle cross platform application submissions. Contributed by Jian He.
...
MAPREDUCE-4052. Improved MapReduce clients to use NodeManagers' ability to handle cross platform application submissions. Contributed by Jian He.
svn merge --ignore-ancestry -c 1578135 ../../trunk/ with a couple of minor edits for working in branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578139 13f79535-47bb-0310-9956-ffa450edef68
2014-03-16 19:13:16 +00:00
a42d5c79ab
HDFS-6106. Reduce default for dfs.namenode.path.based.cache.refresh.interval.ms (cmccabe)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577799 13f79535-47bb-0310-9956-ffa450edef68
2014-03-15 07:52:46 +00:00
Vinod Kumar Vavilapalli
Jian He
Arpit Agarwal
Tsz-wo Sze
Kihwal Lee
Jing Zhao
Andrew Wang
Haohui Mai
Chris Nauroth
Zhijie Shen
Suresh Srinivas
Aaron Myers
Karthik Kambatla
Colin McCabe
Enis Soztutar
Jonathan Turner Eagles