Commit Graph

6245 Commits

Author SHA1 Message Date
Haohui Mai 59b3646382 Merge r1574997 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574999 13f79535-47bb-0310-9956-ffa450edef68
2014-03-06 18:52:38 +00:00
Colin McCabe a9f2c50805 HDFS-6061. Allow dfs.datanode.shared.file.descriptor.path to contain multiple entries and fall back when needed (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574798 13f79535-47bb-0310-9956-ffa450edef68
2014-03-06 08:26:26 +00:00
Haohui Mai 39b70d4e1f Merge r1574792 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574794 13f79535-47bb-0310-9956-ffa450edef68
2014-03-06 08:16:12 +00:00
Colin McCabe 6f2dd3a25a HDFS-6057. DomainSocketWatcher.watcherThread should be marked as a daemon thread (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574789 13f79535-47bb-0310-9956-ffa450edef68
2014-03-06 08:01:41 +00:00
Haohui Mai 94ac5ba669 Merge r1574716 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574717 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 23:12:22 +00:00
Arpit Agarwal 2f3536ed12 HADOOP-10211. Merging r1574697 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574698 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 22:31:59 +00:00
Aaron Myers a872bdcb60 HDFS-5898. Allow NFS gateway to login/relogin from its kerberos keytab. Contributed by Abin Shahab.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574696 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 22:30:45 +00:00
Haohui Mai b19da33481 Merge r1574683 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574685 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 21:53:04 +00:00
Vinod Kumar Vavilapalli 4bdb4a9b16 YARN-1761. Modified RMAdmin CLI to check whether HA is enabled or not before it executes any of the HA admin related commands. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1574661 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574662 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 21:08:20 +00:00
Jian He 296ad40766 Merge r1574623 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574625 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 19:09:01 +00:00
Brandon Li 5e096ccac7 HDFS-6044. Merging change r1574622 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574624 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 19:05:44 +00:00
Brandon Li b7c98f4912 HDFS-6043. Merging change r1574616 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574620 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 18:53:59 +00:00
Jing Zhao d5da583bda HDFS-5167. Merge change r1574603 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574608 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 18:24:09 +00:00
Karthik Kambatla a2e3fab710 YARN-1785. FairScheduler treats app lookup failures as ERRORs. (bc Wong via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574605 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 18:23:24 +00:00
Ravi Prakash b5e010ca0d YARN-1768. Fixed error message being too verbose when killing a non-existent application. Contributed by Tsuyoshi Ozawa
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574403 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 09:45:28 +00:00
Haohui Mai 4cc5a8dbdb Merge r1574283 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574284 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 01:50:28 +00:00
Haohui Mai ef56b13d05 Merge r1574270 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574271 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 00:30:12 +00:00
Haohui Mai e81398da81 Merge r1574261 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574262 13f79535-47bb-0310-9956-ffa450edef68
2014-03-05 00:03:56 +00:00
Colin McCabe ba862fc744 HDFS-6051. HDFS cannot run on Windows since short-circuit memory segment changes (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574256 13f79535-47bb-0310-9956-ffa450edef68
2014-03-04 23:41:28 +00:00
Vinod Kumar Vavilapalli 75f0ecee01 YARN-1766. Fixed a bug in ResourceManager to use configuration loaded from the configuration-provider when booting up. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1574252 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574253 13f79535-47bb-0310-9956-ffa450edef68
2014-03-04 23:35:51 +00:00
Michael Stack 9c18ac13c0 HDFS-6047 TestPread NPE inside in DFSInputStream hedgedFetchBlockByteRange (stack)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574206 13f79535-47bb-0310-9956-ffa450edef68
2014-03-04 21:11:52 +00:00
Vinod Kumar Vavilapalli 7c17cff55c YARN-986. Changed client side to be able to figure out the right RM Delegation token for the right ResourceManager when HA is enabled. Contributed by Karthik Kambatla.
svn merge --ignore-ancestry -c 1574190 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574191 13f79535-47bb-0310-9956-ffa450edef68
2014-03-04 20:39:33 +00:00
Jing Zhao 45f24de631 HDFS-6053. Fix TestDecommissioningStatus and TestDecommission in branch-2. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574178 13f79535-47bb-0310-9956-ffa450edef68
2014-03-04 19:29:04 +00:00
Vinod Kumar Vavilapalli f2d48add16 YARN-1730. Implemented simple write-locking in the LevelDB based timeline-store. Contributed by Billie Rinaldi.
svn merge --ignore-ancestry -c 1574145 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574146 13f79535-47bb-0310-9956-ffa450edef68
2014-03-04 17:34:01 +00:00
Colin McCabe 91d8ee4be7 HDFS-6046. add dfs.client.mmap.enabled (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573888 13f79535-47bb-0310-9956-ffa450edef68
2014-03-04 06:51:40 +00:00
Colin McCabe c1db6bf511 HDFS-6040. fix DFSClient issue without libhadoop.so and some other ShortCircuitShm cleanups (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573885 13f79535-47bb-0310-9956-ffa450edef68
2014-03-04 06:35:57 +00:00
Chris Nauroth b44dfd6725 HDFS-6039. Merging change r1573879 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573881 13f79535-47bb-0310-9956-ffa450edef68
2014-03-04 06:15:56 +00:00
Zhijie Shen 289be46e09 YARN-1729. Made TimelineWebServices deserialize the string primary- and secondary-filters param into the JSON-compatible object. Contributed by Billie Rinaldi.
svn merge --ignore-ancestry -c 1573825 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573826 13f79535-47bb-0310-9956-ffa450edef68
2014-03-04 00:23:23 +00:00
Vinod Kumar Vavilapalli ecb6019688 YARN-1748. Excluded core-site.xml from hadoop-yarn-server-tests package's jar and thus avoid breaking downstream tests. Contributed by Sravya Tirukkovalur.
svn merge --ignore-ancestry -c 1573795 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573796 13f79535-47bb-0310-9956-ffa450edef68
2014-03-03 23:09:31 +00:00
Suresh Srinivas 70915f68b2 HADOOP-10378. Merge 1573776 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573779 13f79535-47bb-0310-9956-ffa450edef68
2014-03-03 22:12:20 +00:00
Jason Darrell Lowe 8da70ca8e0 svn merge -c 1573775 FIXES: MAPREDUCE-5773. Provide dedicated MRAppMaster syslog length limit. Contributed by Gera Shegalov
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573778 13f79535-47bb-0310-9956-ffa450edef68
2014-03-03 22:12:18 +00:00
Vinod Kumar Vavilapalli 595121a601 YARN-1765. Added test cases to verify that killApplication API works across ResourceManager failover. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1573735 ../../trunk/
svn merge --ignore-ancestry -c 1573736 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573737 13f79535-47bb-0310-9956-ffa450edef68
2014-03-03 20:39:34 +00:00
Vinod Kumar Vavilapalli 5ea4206137 YARN-1704. Modified LICENSE and NOTICE files to reflect newly used levelDB related libraries. Contributed by Billie Rinaldi.
svn merge --ignore-ancestry -c 1573702 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573704 13f79535-47bb-0310-9956-ffa450edef68
2014-03-03 19:53:53 +00:00
Vinod Kumar Vavilapalli dd0942a90d YARN-1758. Fixed ResourceManager to not mandate the presence of site specific configuration files and thus fix failures in downstream tests. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1573695 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573697 13f79535-47bb-0310-9956-ffa450edef68
2014-03-03 19:42:24 +00:00
Haohui Mai 3a4469df97 Merge r1573694 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573696 13f79535-47bb-0310-9956-ffa450edef68
2014-03-03 19:42:22 +00:00
Kihwal Lee 31cf2ef1ca svn merge -c 1573604 merging from trunk to branch-2 to fix:HADOOP-10314. The ls command help still shows outdated 0.16 format. Contributed by Rushabh S Shah.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573605 13f79535-47bb-0310-9956-ffa450edef68
2014-03-03 16:41:46 +00:00
Colin McCabe 1754ca0b90 HDFS-5950. The DFSClient and DataNode should use shared memory segments to communicate short-circuit information (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573435 13f79535-47bb-0310-9956-ffa450edef68
2014-03-03 04:05:58 +00:00
Karthik Kambatla d85cce539d YARN-1760. Addendum patch. TestRMAdminService assumes Capacity Scheduler.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573135 13f79535-47bb-0310-9956-ffa450edef68
2014-03-01 08:47:02 +00:00
Haohui Mai eff8ac4537 HDFS-5956. Merge change r1573078 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573081 13f79535-47bb-0310-9956-ffa450edef68
2014-02-28 21:10:23 +00:00
Arpit Agarwal d333ea34aa HDFS-5821. Merging r1573076 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573077 13f79535-47bb-0310-9956-ffa450edef68
2014-02-28 21:06:17 +00:00
Arpit Agarwal 70f101e536 Update target version to 2.4.0 for HADOOP-10278 and HADOOP-10285 in CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573072 13f79535-47bb-0310-9956-ffa450edef68
2014-02-28 20:47:29 +00:00
Arpit Agarwal e0f27f3755 HADOOP-10285. Merging r1573052 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573063 13f79535-47bb-0310-9956-ffa450edef68
2014-02-28 20:35:44 +00:00
Aaron Myers 08735d92ed HDFS-6033. PBImageXmlWriter incorrectly handles processing cache directives. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573054 13f79535-47bb-0310-9956-ffa450edef68
2014-02-28 19:48:57 +00:00
Jing Zhao b10d601a54 Backport HDFS-4200 from trunk: Reduce the size of synchronized sections in PacketResponder.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573044 13f79535-47bb-0310-9956-ffa450edef68
2014-02-28 19:38:31 +00:00
Jason Darrell Lowe 4d54763a07 svn merge -c 1573035 FIXES: MAPREDUCE-5768. TestMRJobs.testContainerRollingLog fails on trunk. Contributed by Gera Shegalov
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573037 13f79535-47bb-0310-9956-ffa450edef68
2014-02-28 19:28:03 +00:00
Colin McCabe 66c4e5090c HDFS-6030. Remove an unused constructor in INode.java (yzhang via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573034 13f79535-47bb-0310-9956-ffa450edef68
2014-02-28 18:52:46 +00:00
Jing Zhao d744a6d8fe HDFS-5339. Merge change r1573026 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573027 13f79535-47bb-0310-9956-ffa450edef68
2014-02-28 18:40:59 +00:00
Karthik Kambatla 052e6e7fa6 YARN-1528. Allow setting auth for ZK connections. (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573017 13f79535-47bb-0310-9956-ffa450edef68
2014-02-28 17:36:04 +00:00
Karthik Kambatla d00de6418a MAPREDUCE-5665. Add audience annotations to MiniMRYarnCluster and MiniMRCluster. (Anubhav Dhoot via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1572796 13f79535-47bb-0310-9956-ffa450edef68
2014-02-28 00:53:23 +00:00
Arpit Agarwal 3568835899 HADOOP-10374. Merging r1572783 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1572784 13f79535-47bb-0310-9956-ffa450edef68
2014-02-27 23:32:48 +00:00