Commit Graph

1369 Commits

Author SHA1 Message Date
Tsz-wo Sze a537b9745d svn merge -c 1577710 from trunk for HADOOP-10407. Fix the javac warnings in org.apache.hadoop.ipc package.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577720 13f79535-47bb-0310-9956-ffa450edef68
2014-03-14 21:19:29 +00:00
Christopher Douglas 8f915e55fd HADOOP-3679. Fixup assert ordering in unit tests to yield meaningful error
messages. Contributed by Jay Vyas


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577397 13f79535-47bb-0310-9956-ffa450edef68
2014-03-14 00:47:04 +00:00
Christopher Douglas 9695bc7af6 YARN-1771. Reduce the number of NameNode operations during localization of
public resources using a cache. Contributed by Sangjin Lee



git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577392 13f79535-47bb-0310-9956-ffa450edef68
2014-03-14 00:31:08 +00:00
Jonathan Turner Eagles e6111498f8 HADOOP-10332. HttpServer's jetty audit log always logs 200 OK (jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577221 13f79535-47bb-0310-9956-ffa450edef68
2014-03-13 16:11:45 +00:00
Michael Stack 243db1c57e HADOOP-10337 ConcurrentModificationException from MetricsDynamicMBeanBase.createMBeanInfo() (Liang Xie via stack)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576189 13f79535-47bb-0310-9956-ffa450edef68
2014-03-11 04:38:06 +00:00
Vinod Kumar Vavilapalli ad5c0e4613 MAPREDUCE-5028. Fixed a bug in MapTask that was causing mappers to fail when a large value of io.sort.mb is set. Contributed by Karthik Kambatla.
svn merge --ignore-ancestry -c 1576170 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576171 13f79535-47bb-0310-9956-ffa450edef68
2014-03-11 01:30:20 +00:00
Arpit Agarwal bb7e14902b HADOOP-10394. Merging r1576145 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576146 13f79535-47bb-0310-9956-ffa450edef68
2014-03-11 00:03:11 +00:00
Arpit Agarwal 4af360d629 HADOOP-10395. Merging r1575562 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576142 13f79535-47bb-0310-9956-ffa450edef68
2014-03-10 23:58:05 +00:00
Tsz-wo Sze 134a29f226 svn merge -c 1574259 from trunk for HDFS-5535.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576128 13f79535-47bb-0310-9956-ffa450edef68
2014-03-10 23:37:46 +00:00
Chris Nauroth 0663d54767 HADOOP-10399. Merging change r1576124 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576126 13f79535-47bb-0310-9956-ffa450edef68
2014-03-10 23:15:51 +00:00
Tsz-wo Sze 325f94b36a svn merge -c 1575470 from trunk for HADOOP-10393. Fix the javac warnings in hadoop-auth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575471 13f79535-47bb-0310-9956-ffa450edef68
2014-03-08 02:19:12 +00:00
Haohui Mai ffaab80c42 Merge r1575381 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575382 13f79535-47bb-0310-9956-ffa450edef68
2014-03-07 19:37:00 +00:00
Colin McCabe fca36dcb4e HDFS-6065. HDFS zero-copy reads should return null on EOF when doing ZCR (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575110 13f79535-47bb-0310-9956-ffa450edef68
2014-03-07 01:19:05 +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
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
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
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 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
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
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
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
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
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
Chris Nauroth 0eb2d3355a HADOOP-10353. Merging change r1572679 and r1572680 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1572682 13f79535-47bb-0310-9956-ffa450edef68
2014-02-27 19:03:58 +00:00
Chris Nauroth 90398cc601 HDFS-4685. Update CHANGES.txt in branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1572315 13f79535-47bb-0310-9956-ffa450edef68
2014-02-26 22:39:45 +00:00
Chris Nauroth 2244459186 HDFS-4685. Merge HDFS ACLs to branch-2. Merging changes r1569870, r1570466, r1570655, r1571573, r1571745, r1572142, r1572189 and r1572190 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1572308 13f79535-47bb-0310-9956-ffa450edef68
2014-02-26 22:32:27 +00:00
Aaron Myers 4812bd1569 HADOOP-9454. Support multipart uploads for s3native. Contributed by Jordan Mendelson and Akira AJISAKA.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1572237 13f79535-47bb-0310-9956-ffa450edef68
2014-02-26 20:31:06 +00:00
Tsz-wo Sze b1d64419ac svn merge -c 1572220 from trunk for HADOOP-10368. InputStream is not closed in VersionInfo ctor.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1572221 13f79535-47bb-0310-9956-ffa450edef68
2014-02-26 19:58:38 +00:00
Jing Zhao 70707e613a HDFS-5939. Merge change r1571781 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1571782 13f79535-47bb-0310-9956-ffa450edef68
2014-02-25 18:39:50 +00:00
Aaron Myers bd10814f31 HADOOP-10070. RPC client doesn't use per-connection conf to determine server's expected Kerberos principal name. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570777 13f79535-47bb-0310-9956-ffa450edef68
2014-02-22 01:12:13 +00:00
Arpit Agarwal 82095e0811 HADOOP-10278. Merging r1570703 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570704 13f79535-47bb-0310-9956-ffa450edef68
2014-02-21 20:54:53 +00:00
Jonathan Turner Eagles 9ffb6429a4 MAPREDUCE-5671. NaN can be created by client and assign to Progress (Chen He via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570623 13f79535-47bb-0310-9956-ffa450edef68
2014-02-21 16:32:52 +00:00
Jing Zhao bb8da67817 HADOOP-10355. Merge change r1570460 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570464 13f79535-47bb-0310-9956-ffa450edef68
2014-02-21 06:17:59 +00:00
Chris Nauroth 631a915b94 HADOOP-10328. Merging change r1570304 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570305 13f79535-47bb-0310-9956-ffa450edef68
2014-02-20 19:04:04 +00:00
Jing Zhao 7ba83fb31b HADOOP-10348. Deprecate hadoop.ssl.configuration in branch-2, and remove it in trunk. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1570297 13f79535-47bb-0310-9956-ffa450edef68
2014-02-20 18:41:06 +00:00
Arpit Agarwal df72553cba HDFS-5318. Merging r1569951 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569959 13f79535-47bb-0310-9956-ffa450edef68
2014-02-19 23:08:29 +00:00
Colin McCabe 287536ef9d HDFS-5973. add DomainSocket#shutdown method. (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569952 13f79535-47bb-0310-9956-ffa450edef68
2014-02-19 23:01:49 +00:00
Vinod Kumar Vavilapalli 0bbc1f4d95 YARN-1666. Modified RM HA handling of include/exclude node-lists to be available across RM failover by making using of a remote configuration-provider. Contributed by Xuan Gong.
svn merge --ignore-ancestry -c 1569856 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569857 13f79535-47bb-0310-9956-ffa450edef68
2014-02-19 17:53:45 +00:00
Jason Darrell Lowe d34f27becf svn merge -c 1569382 FIXES: HADOOP-10346. Deadlock while logging tokens. Contributed by Jason Lowe
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569385 13f79535-47bb-0310-9956-ffa450edef68
2014-02-18 15:27:46 +00:00
Arun Murthy 1ccccb8534 Branching for hadoop-2.4 releases, also set version to 2.5.0-SNAPSHOT in branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1569186 13f79535-47bb-0310-9956-ffa450edef68
2014-02-18 04:41:01 +00:00
Vinod Kumar Vavilapalli ecd71765c0 YARN-1553. Fixed a bug with branch-2 patch that broke compilation. Contributed by Haohui Mai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568540 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 23:05:37 +00:00
Andrew Wang be69bfc2f4 HDFS-3128. Unit tests should not use a test root in /tmp. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568527 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 21:29:36 +00:00
Vinod Kumar Vavilapalli 7e252cdc9d YARN-1553. Modified YARN and MR to stop using HttpConfig.isSecure() and
instead rely on the http policy framework. And also fix some bugs related
to https handling in YARN web-apps. Contributed by Haohui Mai.
svn merge --ignore-ancestry -c 1568501 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568503 13f79535-47bb-0310-9956-ffa450edef68
2014-02-14 20:01:32 +00:00
Suresh Srinivas 42ebc843e9 HADOOP-10249. Merge 1568164 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1568166 13f79535-47bb-0310-9956-ffa450edef68
2014-02-13 23:47:58 +00:00