Commit Graph

1156 Commits

Author SHA1 Message Date
Andrew Wang bb87b70e37 Revert bad HDFS-6268 commit from branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599807 13f79535-47bb-0310-9956-ffa450edef68
2014-06-03 22:06:11 +00:00
Andrew Wang 2088225632 HDFS-6268. Merged from r1599734. Better sorting in NetworkTopology#pseudoSortByDistance when no local node is found. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599737 13f79535-47bb-0310-9956-ffa450edef68
2014-06-03 18:33:51 +00:00
Aaron Myers 53a0b3c496 HADOOP-10658. SSLFactory expects truststores being configured. Contributed by Alejandro Abdelnur.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599436 13f79535-47bb-0310-9956-ffa450edef68
2014-06-03 07:24:42 +00:00
Ravi Prakash f8a3041cfe HADOOP-9704. Write metrics sink plugin for Hadoop/Graphite (Chu Tong, Alex Newman and Babak Behzad via raviprak)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599415 13f79535-47bb-0310-9956-ffa450edef68
2014-06-03 05:51:52 +00:00
Jing Zhao adc4dc57c8 HADOOP-10630. Merge change r1599366 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599369 13f79535-47bb-0310-9956-ffa450edef68
2014-06-02 21:43:48 +00:00
Brandon Li c1e2673754 HDFS-6056. Merging change r1598782 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598792 13f79535-47bb-0310-9956-ffa450edef68
2014-05-31 00:26:34 +00:00
Suresh Srinivas c5c3241da8 HADOOP-10342. Merging branch-2 equivalent of commit 1568525 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598754 13f79535-47bb-0310-9956-ffa450edef68
2014-05-30 21:56:58 +00:00
Aaron Myers 452b37a2d7 HADOOP-10638. Updating hadoop-daemon.sh to work as expected when nfs is started as a privileged user. Contributed by Manikandan Narayanaswamy.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598452 13f79535-47bb-0310-9956-ffa450edef68
2014-05-30 01:53:36 +00:00
Arpit Agarwal d1b7433a62 HADOOP-9968 and HADOOP-10448. Merging r1570934 and 1598396 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598440 13f79535-47bb-0310-9956-ffa450edef68
2014-05-29 23:38:07 +00:00
Alejandro Abdelnur 7d3496c7be HADOOP-10639. FileBasedKeyStoresFactory initialization is not using default for SSL_REQUIRE_CLIENT_CERT_KEY. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598415 13f79535-47bb-0310-9956-ffa450edef68
2014-05-29 21:40:15 +00:00
Arpit Agarwal d25d41d49b HADOOP-10566. Refactor proxyservers out of ProxyUsers. (Contributed by Benoy Antony)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598140 13f79535-47bb-0310-9956-ffa450edef68
2014-05-28 21:12:06 +00:00
Xuan Gong 5757def1a1 HADOOP-10625. Trim configuration names when putting/getting them
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598070 13f79535-47bb-0310-9956-ffa450edef68
2014-05-28 17:06:04 +00:00
Arpit Agarwal 517eccb0c7 HADOOP-10618: Merging r1596964 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596965 13f79535-47bb-0310-9956-ffa450edef68
2014-05-22 20:41:44 +00:00
Jing Zhao 50acb4032f MAPREDUCE-5899. Merge change r1596931 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596937 13f79535-47bb-0310-9956-ffa450edef68
2014-05-22 18:50:20 +00:00
Jason Darrell Lowe b6988521f4 Reverted HADOOP-10474 from branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596048 13f79535-47bb-0310-9956-ffa450edef68
2014-05-19 20:31:40 +00:00
Aaron Myers 9962a38eb8 HADOOP-10489. UserGroupInformation#getTokens and UserGroupInformation#addToken can lead to ConcurrentModificationException. Contributed by Robert Kanter.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596027 13f79535-47bb-0310-9956-ffa450edef68
2014-05-19 19:59:08 +00:00
Sanford Ryza fa76a87dbe HADOOP-10614. CBZip2InputStream is not threadsafe (Xiangrui Meng via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595523 13f79535-47bb-0310-9956-ffa450edef68
2014-05-17 18:09:13 +00:00
Chris Nauroth d20f565b4c MAPREDUCE-5809. Merging change r1595283 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595290 13f79535-47bb-0310-9956-ffa450edef68
2014-05-16 18:32:15 +00:00
Kihwal Lee 62d86218ef HADOOP-10588. Workaround for jetty6 acceptor startup issue. Contributed by Kihwal Lee.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595051 13f79535-47bb-0310-9956-ffa450edef68
2014-05-15 21:25:38 +00:00
Chris Nauroth 6af77d3cd3 HDFS-6326. Merging change r1594743 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594746 13f79535-47bb-0310-9956-ffa450edef68
2014-05-14 22:44:21 +00:00
Colin McCabe ba2483f31e HADOOP-10401. ShellBasedUnixGroupsMapping#getGroups does not always return primary group first (ajisakaa via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594717 13f79535-47bb-0310-9956-ffa450edef68
2014-05-14 21:07:01 +00:00
Kihwal Lee fe0180dd6c svn merge -c 1594709 merging from trunk to branch-2 to fix:HDFS-2949. Add check to active state transition to prevent operator-induced split brain. Contributed by Rushabh S Shah.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594710 13f79535-47bb-0310-9956-ffa450edef68
2014-05-14 20:46:38 +00:00
Suresh Srinivas 99025aacd6 Revert the commit r1594283
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594285 13f79535-47bb-0310-9956-ffa450edef68
2014-05-13 17:01:24 +00:00
Suresh Srinivas 196ee73e9a HADOOP-10566. Adding files missed in previous commit 1594280
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594283 13f79535-47bb-0310-9956-ffa450edef68
2014-05-13 17:00:01 +00:00
Jonathan Turner Eagles 8379c0c944 HADOOP-10585. Retry polices ignore interrupted exceptions (Daryn Sharp via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594270 13f79535-47bb-0310-9956-ffa450edef68
2014-05-13 16:32:24 +00:00
Sanford Ryza 29a124d09d YARN-2036. Document yarn.resourcemanager.hostname in ClusterSetup (Ray Chiang via Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593632 13f79535-47bb-0310-9956-ffa450edef68
2014-05-09 22:19:14 +00:00
Kihwal Lee cf7d09e0a2 Correcting the check-in mistake for HADOOP-10581.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593361 13f79535-47bb-0310-9956-ffa450edef68
2014-05-08 18:24:29 +00:00
Kihwal Lee 559fcdc2a6 svn merge -c 1593357 merging from trunk to branch-2 to fix:HADOOP-10581. TestUserGroupInformation#testGetServerSideGroups fails. Contributed by Mit Desai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593358 13f79535-47bb-0310-9956-ffa450edef68
2014-05-08 18:04:59 +00:00
Arpit Agarwal 868e9b6431 HADOOP-10467: Merging r1593162 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593164 13f79535-47bb-0310-9956-ffa450edef68
2014-05-08 00:46:14 +00:00
Alejandro Abdelnur 2d683525d2 HADOOP-10566. Add toLowerCase support to auth_to_local rules for service name. (tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593106 13f79535-47bb-0310-9956-ffa450edef68
2014-05-07 18:22:12 +00:00
Haohui Mai caa1107813 HADOOP-10471. Merge r1592915 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592917 13f79535-47bb-0310-9956-ffa450edef68
2014-05-06 22:45:03 +00:00
Chris Nauroth 7a0d71916d HADOOP-10517. Merging change r1592855 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592856 13f79535-47bb-0310-9956-ffa450edef68
2014-05-06 19:54:12 +00:00
Tsz-wo Sze 75955e7c50 svn merge -c 1592179 from trunk for HDFS-5168. Add cross node dependency support to BlockPlacementPolicy.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592181 13f79535-47bb-0310-9956-ffa450edef68
2014-05-03 11:04:35 +00:00
Aaron Myers 775b27a6fe HADOOP-10568. Add s3 server-side encryption. Contributed by David S. Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592134 13f79535-47bb-0310-9956-ffa450edef68
2014-05-03 00:26:23 +00:00
Chris Nauroth dcf7c356ce HADOOP-10549. Merging change r1592011 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592012 13f79535-47bb-0310-9956-ffa450edef68
2014-05-02 19:15:39 +00:00
Arpit Agarwal cb889486aa HADOOP-10562: Merging r1592002 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592003 13f79535-47bb-0310-9956-ffa450edef68
2014-05-02 18:39:07 +00:00
Arpit Agarwal 86e5a7f96d HADOOP-10562. Undo previous commit.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591784 13f79535-47bb-0310-9956-ffa450edef68
2014-05-01 21:19:58 +00:00
Arpit Agarwal 21c1b0cba4 HADOOP-10562: Merging r1591782 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591783 13f79535-47bb-0310-9956-ffa450edef68
2014-05-01 21:15:25 +00:00
Aaron Myers a85a2a9a0a HADOOP-10543. RemoteException's unwrapRemoteException method failed for PathIOException. Contributed by Yongjun Zhang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591182 13f79535-47bb-0310-9956-ffa450edef68
2014-04-30 03:24:05 +00:00
Arpit Agarwal a325ab0e59 HADOOP-10547: Merging r1591095 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591097 13f79535-47bb-0310-9956-ffa450edef68
2014-04-29 20:41:05 +00:00
Vinod Kumar Vavilapalli 4c1f66d7fa YARN-1929. Fixed a deadlock in ResourceManager that occurs when failover happens right at the time of shutdown. Contributed by Karthik Kambatla.
svn merge --ignore-ancestry -c 1591071 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591072 13f79535-47bb-0310-9956-ffa450edef68
2014-04-29 19:50:17 +00:00
Haohui Mai f37186167a HADOOP-10508. Merge r1590876 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1590877 13f79535-47bb-0310-9956-ffa450edef68
2014-04-29 06:06:18 +00:00
Arpit Agarwal 774b782596 HADOOP-10540: Merging r1589923 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589924 13f79535-47bb-0310-9956-ffa450edef68
2014-04-25 03:10:31 +00:00
Jing Zhao fa6c972283 HADOOP-10535. Merge r1589905 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589906 13f79535-47bb-0310-9956-ffa450edef68
2014-04-24 23:05:25 +00:00
Chris Nauroth 91aad1c7bd HADOOP-10539. Merging change r1589884 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589885 13f79535-47bb-0310-9956-ffa450edef68
2014-04-24 21:26:09 +00:00
Andrew Wang 69a90ff22f HADOOP-10531. hadoop-config.sh - bug in --hosts argument. Contributed by Sebastien Barrier.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589531 13f79535-47bb-0310-9956-ffa450edef68
2014-04-23 22:37:24 +00:00
Uma Maheswara Rao G cdfb1aedd9 Merge HADOOP-10251. Both NameNodes could be in STANDBY State if SNN network is unstable. Contributed by Vinayakumar B.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589495 13f79535-47bb-0310-9956-ffa450edef68
2014-04-23 19:04:33 +00:00
Kihwal Lee f4bba31c92 svn merge -c 1589405 merging from trunk to branch-2 to fix:HADOOP-10527. Fix incorrect return code and allow more retries on EINTR.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589407 13f79535-47bb-0310-9956-ffa450edef68
2014-04-23 13:28:55 +00:00
Chris Nauroth 8296b7e3cc HADOOP-10503. Merging change r1589273 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589275 13f79535-47bb-0310-9956-ffa450edef68
2014-04-22 19:58:02 +00:00
Kihwal Lee f01067d685 svn merge -c 1588970 merging from trunk to branch-2 to fix:HADOOP-10526. Chance for Stream leakage in CompressorStream. Contributed by Rushabh Shah.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588971 13f79535-47bb-0310-9956-ffa450edef68
2014-04-21 19:21:46 +00:00