Commit Graph

5171 Commits

Author SHA1 Message Date
Vinod Kumar Vavilapalli fbb55784d9 YARN-562. Modified NM to reject any containers allocated by a previous ResourceManager. Contributed by Jian He.
MAPREDUCE-5167. Update MR App after YARN-562 to use the new builder API for the container. Contributed by Jian He.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1476034 13f79535-47bb-0310-9956-ffa450edef68
2013-04-26 03:50:20 +00:00
Tsz-wo Sze 9da3865841 HDFS-4650. Fix a bug in FSDirectory and add more unit tests for rename with existence of snapshottable directories and snapshots. Contributed by Jing Zhao
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1476012 13f79535-47bb-0310-9956-ffa450edef68
2013-04-26 01:31:43 +00:00
Tsz-wo Sze fa500825fa Merge r1471229 through r1476009 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1476011 13f79535-47bb-0310-9956-ffa450edef68
2013-04-26 01:19:00 +00:00
Tsz-wo Sze 76b80b48ec HDFS-4755. Fix AccessControlException message and moves "implements LinkedElement" from INode to INodeWithAdditionalFields.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1476009 13f79535-47bb-0310-9956-ffa450edef68
2013-04-26 01:05:47 +00:00
Tsz-wo Sze 43ac0739ce svn merge -c -1476006 . for reverting the previous trunk merge.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1476008 13f79535-47bb-0310-9956-ffa450edef68
2013-04-26 01:02:45 +00:00
Tsz-wo Sze a259e0ba79 Merge r1471229 through r1476005 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1476006 13f79535-47bb-0310-9956-ffa450edef68
2013-04-26 00:55:45 +00:00
Tsz-wo Sze 06fb184d4d HDFS-4757. Update FSDirectory#inodeMap when replacing an INodeDirectory while setting quota. Contributed by Jing Zhao
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1476005 13f79535-47bb-0310-9956-ffa450edef68
2013-04-26 00:50:09 +00:00
Tsz-wo Sze e9c83b20f6 HADOOP-9503. Remove sleep between IPC client connect timeouts. Contributed by Varun Sharma
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1475959 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 21:07:38 +00:00
Tsz-wo Sze 36f43dcb4f HDFS-4742. Fix appending to a renamed file with snapshot. Contributed by Jing Zhao
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1475903 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 18:53:14 +00:00
Tsz-wo Sze 745bfa0311 HDFS-4749. Use INodeId to identify the corresponding directory node in FSImage saving/loading. Contributed by Jing Zhao
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1475902 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 18:51:00 +00:00
Suresh Srinivas a89f8e4d95 Cleanup CHANGES.txt and move the jira to appropriate 2.x release section to make it consistent with branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1475779 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 14:03:22 +00:00
Thomas White d10428cab2 YARN-289. Fair scheduler allows reservations that won't fit on node. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1475681 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 09:15:51 +00:00
Thomas White a43c344eee YARN-595. Refactor fair scheduler to use common Resources. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1475670 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 08:33:43 +00:00
Vinod Kumar Vavilapalli 448df18646 YARN-577. Add application-progress also to ApplicationReport. Contributed by Hitesh Shah.
MAPREDUCE-5178. Update MR App to set progress in ApplicationReport after YARN-577. Contributed by Hitesh Shah.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1475636 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 05:42:22 +00:00
Suresh Srinivas 16ef8dd3a5 HDFS-4745. TestDataTransferKeepalive#testSlowReader has race condition that causes sporadic failure. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1475623 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 04:25:58 +00:00
Siddharth Seth e96077aaf4 MAPREDUCE-5181. RMCommunicator should not use AMToken from the env. Contributed by Vinod Kumar Vavilapalli.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1471816 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 02:50:16 +00:00
Siddharth Seth be256a1819 YARN-579. Stop setting the Application Token in the AppMaster env, in favour of the copy present in the container token field. Contributed by Vinod Kumar Vavilapalli.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1471814 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 02:46:47 +00:00
Arun Murthy daaa73b657 MAPREDUCE-5166. Fix ConcurrentModificationException due to insufficient synchronization on updates to task Counters. Contributed by Sandy Ryza.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1471796 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 00:54:04 +00:00
Aaron Myers e6b5b01561 HDFS-4739. NN can miscalculate the number of extra edit log segments to retain. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1471769 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 23:29:30 +00:00
Tsz-wo Sze e8b64d3851 HDFS-4729. Fix OfflineImageViewer and permission checking for snapshot operations. Contributed by Jing Zhao
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1471665 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 20:47:13 +00:00
Tsz-wo Sze 0fa5cad0b2 HDFS-4686. Update quota computation for rename and INodeReference. Contributed by Jing Zhao
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1471647 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 20:31:06 +00:00
Vinod Kumar Vavilapalli a2f97fd9cb YARN-605. Fix failing unit test in TestNMWebServices when versionInfo has parantheses like when running on a git checkout. Contributed by Hitesh Shah.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1471608 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 19:42:47 +00:00
Suresh Srinivas a09c29b8c0 HDFS-4339. Add the missed entry CHANGES.txt from r1465835
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1471595 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 18:41:12 +00:00
Arun Murthy 40e78c2ca2 MAPREDUCE-4737. Ensure that mapreduce APIs are semantically consistent with mapred API w.r.t Mapper.cleanup and Reducer.cleanup; in the sense that cleanup is now called even if there is an error. The old mapred API already ensures that Mapper.close and Reducer.close are invoked during error handling. Note that it is an incompatible change, however end-users can override Mapper.run and Reducer.run to get the old (inconsistent) behaviour. Contributed by Arun C. Murthy.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1471556 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 17:38:43 +00:00
Robert Joseph Evans 0777474cc2 MAPREDUCE-5069. add concrete common implementations of CombineFileInputFormat (Sangjin Lee via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1471424 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 14:11:50 +00:00
Tsz-wo Sze 5f1e3b561a Merge r1470760 through r1471228 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1471229 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 02:21:58 +00:00
Tsz-wo Sze 3a812e9f3a HDFS-4738. Changes AbstractINodeDiff to implement Comparable<Integer>, and fix javadoc and other warnings.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1471228 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 02:11:18 +00:00
Aaron Myers 4c662fd3fe HDFS-4737. JVM path embedded in fuse binaries. Contributed by Sean Mackrory.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1471215 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 00:47:13 +00:00
Tsz-wo Sze 65752c09ab HDFS-4735. DisallowSnapshot throws IllegalStateException for nested snapshottable directories. Contributed by Jing Zhao
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1471214 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 00:28:07 +00:00
Vinod Kumar Vavilapalli cd975d4b64 YARN-581. Added a test to verify that app delegation tokens are restored after RM restart. Contributed by Jian He.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1471187 13f79535-47bb-0310-9956-ffa450edef68
2013-04-23 22:49:44 +00:00
Vinod Kumar Vavilapalli 27e8c86999 YARN-561. Modified NodeManager to set key information into the environment of every container that it launches. Contributed by Xuan Gong.
MAPREDUCE-5175. Updated MR App to not set envs that will be set by NMs anyways after YARN-561. Contributed by Xuan Gong.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1471156 13f79535-47bb-0310-9956-ffa450edef68
2013-04-23 21:39:51 +00:00
Tsz-wo Sze 631be95398 HDFS-4732. Fix TestDFSUpgradeFromImage which fails on Windows due to failure to unpack old image tarball that contains hard links. Chris Nauroth
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1471090 13f79535-47bb-0310-9956-ffa450edef68
2013-04-23 18:47:47 +00:00
Vinod Kumar Vavilapalli ffd7dbb34a YARN-583. Moved application level local resources to be localized under the filecache sub-directory under application directory. Contributed by Omkar Vinit Joshi.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1470812 13f79535-47bb-0310-9956-ffa450edef68
2013-04-23 04:37:45 +00:00
Bikas Saha a1ee2145cf YARN-549. YarnClient.submitApplication should wait for application to be accepted by the RM (Zhijie Shen via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1470797 13f79535-47bb-0310-9956-ffa450edef68
2013-04-23 03:06:41 +00:00
Tsz-wo Sze fd24c6e833 HDFS-4725. Fix HDFS file handle leaks in FSEditLog, NameNode, OfflineEditsBinaryLoader and some tests. Contributed by Chris Nauroth
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1470771 13f79535-47bb-0310-9956-ffa450edef68
2013-04-23 01:18:36 +00:00
Tsz-wo Sze aa7dd50c66 Merge r1470195 through r1470759 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1470760 13f79535-47bb-0310-9956-ffa450edef68
2013-04-23 00:14:06 +00:00
Tsz-wo Sze 10a2d82b45 HDFS-4719. Remove AbstractINodeDiff.Factory and move its methods to AbstractINodeDiffList. Contributed by Arpit Agarwal
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1470759 13f79535-47bb-0310-9956-ffa450edef68
2013-04-23 00:11:51 +00:00
Tsz-wo Sze 92e0416ced HDFS-4727. Update inodeMap after deleting files/directories/snapshots. Contributed by Jing Zhao
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1470756 13f79535-47bb-0310-9956-ffa450edef68
2013-04-23 00:00:47 +00:00
Tsz-wo Sze 43bdc22e92 HDFS-4726. Fix test failures after merging the INodeId-INode mapping from trunk. Contributed by Jing Zhao
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1470735 13f79535-47bb-0310-9956-ffa450edef68
2013-04-22 22:13:58 +00:00
Thomas White 009af54d51 MAPREDUCE-5146. application classloader may be used too early to load classes. Contributed by Sangjin Lee.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1470694 13f79535-47bb-0310-9956-ffa450edef68
2013-04-22 20:07:06 +00:00
Tsz-wo Sze cb229db4bd HDFS-4708. Add snapshot user documentation.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1470665 13f79535-47bb-0310-9956-ffa450edef68
2013-04-22 19:13:18 +00:00
Bikas Saha e24a9b83f1 YARN-594. Update test and add comments in YARN-534 (Jian He via bikas)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1470243 13f79535-47bb-0310-9956-ffa450edef68
2013-04-20 22:04:08 +00:00
Suresh Srinivas 27b3f84fe5 Merge trunk to HDFS-2802 branch. This involves fixing many conflict with HDFS-4434.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1470225 13f79535-47bb-0310-9956-ffa450edef68
2013-04-20 20:22:21 +00:00
Suresh Srinivas 7e122e1009 HADOOP-9443. Port winutils static code analysis change to trunk. Contributed by Chuan Liu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1470224 13f79535-47bb-0310-9956-ffa450edef68
2013-04-20 20:20:44 +00:00
Arun Murthy 794f9bb3e4 MAPREDUCE-5066. Added a timeout for the job.end.notification.url. Contributed by Ivan Mitic.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1470216 13f79535-47bb-0310-9956-ffa450edef68
2013-04-20 19:18:24 +00:00
Suresh Srinivas 0b101bd7e8 HDFS-4434. Reverting change r1470089 that merges trunk to HDFS-2802.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1470194 13f79535-47bb-0310-9956-ffa450edef68
2013-04-20 16:57:44 +00:00
Vinod Kumar Vavilapalli a91067fc5e YARN-542. Changed the default global AM max-attempts value to be not one. Contributed by Zhijie Shen.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1470094 13f79535-47bb-0310-9956-ffa450edef68
2013-04-20 00:35:29 +00:00
Suresh Srinivas 9af0babe7e Merging trunk after fixing conflict with HDFS-4434.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1470089 13f79535-47bb-0310-9956-ffa450edef68
2013-04-20 00:02:43 +00:00
Vinod Kumar Vavilapalli c570309b07 YARN-547. Fixed race conditions in public and private resource localization which used to cause duplicate downloads. Contributed by Omkar Vinit Joshi.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1470076 13f79535-47bb-0310-9956-ffa450edef68
2013-04-19 22:35:43 +00:00
Vinod Kumar Vavilapalli d5556cb5c4 YARN-586. Fixed a typo in ApplicationSubmissionContext#setApplicationId. Contributed by Zhijie Shen.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1470068 13f79535-47bb-0310-9956-ffa450edef68
2013-04-19 22:25:17 +00:00