Commit Graph

6876 Commits

Author SHA1 Message Date
Colin McCabe b929f4a5b0 HADOOP-10962. Flags for posix_fadvise are not valid in some architectures (David Villegas via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617622 13f79535-47bb-0310-9956-ffa450edef68
2014-08-12 23:03:43 +00:00
Arpit Agarwal 1cc3cd28f5 HADOOP-10851: Merging r1617612 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617613 13f79535-47bb-0310-9956-ffa450edef68
2014-08-12 22:32:34 +00:00
Arpit Agarwal f1f1ff8f82 HDFS-6836: Merging r1617603 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617604 13f79535-47bb-0310-9956-ffa450edef68
2014-08-12 21:50:09 +00:00
Arpit Agarwal 004068c391 HDFS-6830: Merging r1617598 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617599 13f79535-47bb-0310-9956-ffa450edef68
2014-08-12 21:43:06 +00:00
Zhijie Shen b2f0fd8961 YARN-2317. Updated the document about how to write YARN applications. Contributed by Li Lu.
svn merge --ignore-ancestry -c 1617594 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617597 13f79535-47bb-0310-9956-ffa450edef68
2014-08-12 21:39:17 +00:00
Jian He ebf92e44f9 Merge r1617555 from trunk. YARN-2373. Changed WebAppUtils to use Configuration#getPassword for accessing SSL passwords. Contributed by Larry McCay
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617557 13f79535-47bb-0310-9956-ffa450edef68
2014-08-12 18:30:57 +00:00
Andrew Wang 70b2499b4b HADOOP-10820. Throw an exception in GenericOptionsParser when passed an empty Path. Contributed by Alex Holmes and Zhihai Xu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617543 13f79535-47bb-0310-9956-ffa450edef68
2014-08-12 17:47:14 +00:00
Junping Du e8d20ad77c Merge r1617448 from trunk: YARN-1337. Recover containers upon nodemanager restart. (Contributed by Jason Lowe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617450 13f79535-47bb-0310-9956-ffa450edef68
2014-08-12 11:02:38 +00:00
Alejandro Abdelnur ff6ef4a430 HADOOP-10835. Implement HTTP proxyuser support in HTTP authentication client/server libraries. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617385 13f79535-47bb-0310-9956-ffa450edef68
2014-08-12 00:11:55 +00:00
Brandon Li afa125ccfd HDFS-6582. Merging change r1617366 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617369 13f79535-47bb-0310-9956-ffa450edef68
2014-08-11 21:38:33 +00:00
Haohui Mai bee0c9b615 HDFS-6838. Merge r1617361 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617363 13f79535-47bb-0310-9956-ffa450edef68
2014-08-11 21:30:17 +00:00
Jian He 285267b2dc Merge r1617341 from trunk. YARN-2138. Cleaned up notifyDone* APIs in RMStateStore. Contributed by Varun Saxena
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617342 13f79535-47bb-0310-9956-ffa450edef68
2014-08-11 18:25:51 +00:00
Jing Zhao f805ac93a9 HDFS-6837. Merge r1617337 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617338 13f79535-47bb-0310-9956-ffa450edef68
2014-08-11 18:02:57 +00:00
Xuan Gong b7958c5df5 YARN-2400: Addendum fix for TestAMRestart failure. Contributed by Jian He
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617334 13f79535-47bb-0310-9956-ffa450edef68
2014-08-11 17:43:19 +00:00
Karthik Kambatla 66cc9c110b YARN-2361. RMAppAttempt state machine entries for KILLED state has duplicate event entries. (Zhihai Xu via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617191 13f79535-47bb-0310-9956-ffa450edef68
2014-08-11 01:44:53 +00:00
Karthik Kambatla b4ea46a111 YARN-2337. ResourceManager sets ClientRMService in RMContext multiple times. (Zhihai Xu via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617184 13f79535-47bb-0310-9956-ffa450edef68
2014-08-11 00:16:15 +00:00
Karthik Kambatla ec3a567117 HADOOP-10402. Configuration.getValByRegex does not substitute for variables. (Robert Kanter via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617174 13f79535-47bb-0310-9956-ffa450edef68
2014-08-10 22:30:09 +00:00
Junping Du 4003d96860 Merge r1617055 from trunk: YARN-2302. Refactor TimelineWebServices. (Contributed by Zhijie Shen)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617056 13f79535-47bb-0310-9956-ffa450edef68
2014-08-10 07:25:49 +00:00
Xuan Gong 775c42d3ea YARN-2400. Fixed TestAMRestart fails intermittently. Contributed by Jian He
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617029 13f79535-47bb-0310-9956-ffa450edef68
2014-08-09 23:32:08 +00:00
Zhijie Shen af83e57e82 YARN-1954. Added waitFor to AMRMClient(Async). Contributed by Tsuyoshi Ozawa.
svn merge --ignore-ancestry -c 1617002 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1617003 13f79535-47bb-0310-9956-ffa450edef68
2014-08-09 18:48:15 +00:00
Karthik Kambatla a6611f2bd1 YARN-2026. Fair scheduler: Consider only active queues for computing fairshare. (Ashwin Shankar via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616916 13f79535-47bb-0310-9956-ffa450edef68
2014-08-09 02:12:52 +00:00
Xuan Gong 4365c4530b YARN-2212 ApplicationMaster needs to find a way to update the AMRMToken periodically. Contributed by Xuan Gong
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616891 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 21:37:35 +00:00
Jing Zhao 0960e67787 HDFS-6828. Merge r1616889 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616890 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 21:35:44 +00:00
Ravi Prakash c89c2e597b HDFS-6823. dfs.web.authentication.kerberos.principal shows up in logs for insecure HDFS
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616847 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 18:26:41 +00:00
Chris Nauroth 97dd53a608 HDFS-573. Merging change r1616814 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616817 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 16:29:07 +00:00
Karthik Kambatla a0bf22947d YARN-2352. FairScheduler: Collect metrics on duration of critical methods that affect performance. (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616785 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 14:40:46 +00:00
Alejandro Abdelnur d6b928b36a HADOOP-10771. Addendum, default realm correction to common test krb5.conf file. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616682 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 05:55:48 +00:00
Arpit Agarwal 8d73cbb8d8 HDFS-6772: Merging r1616680 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616681 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 05:42:00 +00:00
Alejandro Abdelnur 481ac00c65 HADOOP-10771. Refactor HTTP delegation support out of httpfs to common, PART 2. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616674 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 05:01:12 +00:00
Alejandro Abdelnur d17a4da545 HADOOP-10771. Refactor HTTP delegation support out of httpfs to common, PART 1. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616673 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 05:00:28 +00:00
Haohui Mai 061a26631f HDFS-6722. Merge r1616669 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616670 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 04:29:32 +00:00
Andrew Wang 509ed4400a Revert HADOOP-10876.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616659 13f79535-47bb-0310-9956-ffa450edef68
2014-08-08 01:40:15 +00:00
Aaron Myers 1fe7b04863 HDFS-6740. Make FSDataset support adding data volumes dynamically. Contributed by Lei Xu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616624 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 23:01:36 +00:00
Aaron Myers 84d57bbfa8 HDFS-6728. Dynamically add new volumes to DataStorage, formatted if necessary. Contributed by Lei Xu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616620 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 22:53:00 +00:00
Brandon Li 8a3f21cb08 HADOOP-10929. Merging change r1616616 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616618 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 22:50:41 +00:00
Jason Darrell Lowe 16c4bd1a96 svn merge -c 1616585 FIXES: MAPREDUCE-6021. MR AM should have working directory in LD_LIBRARY_PATH. Contributed by Jason Lowe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616591 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 20:29:48 +00:00
Jian He 06a0772d62 Merge r1616580 from trunk. YARN-2008. Fixed CapacityScheduler to calculate headroom based on max available capacity instead of configured max capacity. Contributed by Craig Welch
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616581 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 20:01:14 +00:00
Arpit Agarwal 79d6802d5f HDFS-6781. Add file missed in previous commit.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616577 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 19:46:38 +00:00
Arpit Agarwal 3f54884b46 HDFS-6781. Separate HDFS commands from CommandsManual.apt.vm. (Contributed by Akira Ajisaka)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616576 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 19:46:14 +00:00
Zhijie Shen c6c4a74bef YARN-2288. Made persisted data in LevelDB timeline store be versioned. Contributed by Junping Du.
svn merge --ignore-ancestry -c 1616540 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616541 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 17:03:58 +00:00
Steve Loughran 5a056789ad HADOOP-10931 compile error on tools/hadoop-openstack
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616481 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 12:35:21 +00:00
Tsz-wo Sze 67557212c7 svn merge -c 1616426 from trunk for HDFS-6812. Remove addBlock and replaceBlock from DatanodeDescriptor.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616427 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 07:33:01 +00:00
Tsz-wo Sze 645ca2d8f5 svn merge -c 1616422 from trunk for HDFS-6809. Move Balancer's inner classes MovedBlocks and Matcher as to standalone classes and separates KeyManager from NameNodeConnector.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616423 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 07:23:06 +00:00
Zhijie Shen f55c04a94b YARN-2388. Fixed TestTimelineWebServices failure due to HADOOP-10791. Contributed by Zhijie Shen.
svn merge --ignore-ancestry -c 1616405 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616406 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 05:38:58 +00:00
Karthik Kambatla 290d4e3ec8 YARN-2359. Application hangs when it fails to launch AM container. (Zhihai Xu via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616376 13f79535-47bb-0310-9956-ffa450edef68
2014-08-07 00:08:27 +00:00
Jing Zhao 5c7571fa3f HDFS-6791. Merge change r1616306 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616311 13f79535-47bb-0310-9956-ffa450edef68
2014-08-06 19:15:04 +00:00
Jian He 72d90780c2 Merge r1616302 from trunk. YARN-2374. Fixed TestDistributedShell#testDSShell failure due to hostname dismatch. Contributed by Varun Vasudev
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616305 13f79535-47bb-0310-9956-ffa450edef68
2014-08-06 19:00:26 +00:00
Allen Wittenauer cc5a7495b7 HDFS-6517. Remove hadoop-metrics2.properties from hdfs project (Akira AJISAKA via aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616265 13f79535-47bb-0310-9956-ffa450edef68
2014-08-06 16:13:36 +00:00
Junping Du 8abd45b5bb Merge r1616100 from trunk: YARN-2298. Move TimelineClient to yarn-common project (Zhijie Shen via junping_du)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616102 13f79535-47bb-0310-9956-ffa450edef68
2014-08-06 05:56:34 +00:00
Brandon Li 5e3640eb4f HDFS-6790. Merging change r1616058 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1616072 13f79535-47bb-0310-9956-ffa450edef68
2014-08-06 01:13:36 +00:00