Commit Graph

6821 Commits

Author SHA1 Message Date
Andrew Wang 1fafce595f HADOOP-10927. Fix CredentialShell help behavior and error codes. Contributed by Josh Elser.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615829 13f79535-47bb-0310-9956-ffa450edef68
2014-08-05 00:26:06 +00:00
Andrew Wang fe1b4fc452 HADOOP-10928. Incorrect usage on hadoop credential list. Contributed by Josh Elser.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615828 13f79535-47bb-0310-9956-ffa450edef68
2014-08-05 00:23:55 +00:00
Brandon Li c1452c4722 Merging change r1615801 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615802 13f79535-47bb-0310-9956-ffa450edef68
2014-08-04 21:33:10 +00:00
Brandon Li 225febccc1 HDFS-6451. Merging change r1615702 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615708 13f79535-47bb-0310-9956-ffa450edef68
2014-08-04 17:44:45 +00:00
Eric Yang e5c5417f10 HADOOP-10759. Remove hardcoded JAVA_HEAP_MAX. (Sam Liu via Eric Yang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615703 13f79535-47bb-0310-9956-ffa450edef68
2014-08-04 17:40:08 +00:00
Uma Maheswara Rao G 4ac92fdbd5 Merge from trunk. HDFS-6787. Remove duplicate code in FSDirectory#unprotectedConcat. Contributed by Yi Liu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615623 13f79535-47bb-0310-9956-ffa450edef68
2014-08-04 15:45:56 +00:00
Junping Du fc5bb235f2 Merge r1615550 from trunk: YARN-1354. Recover applications upon nodemanager restart. (Contributed by Jason Lowe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615554 13f79535-47bb-0310-9956-ffa450edef68
2014-08-04 13:35:49 +00:00
Vinayakumar B 8e8d4717e9 Merged revision(s) 1615504 from hadoop/common/trunk:
HDFS-5185. DN fails to startup if one of the data dir is full. Contributed by Vinayakumar B.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615505 13f79535-47bb-0310-9956-ffa450edef68
2014-08-04 08:44:39 +00:00
Vinayakumar B fed094d0af Merged revision(s) 1615491 from hadoop/common/trunk:
HDFS-5723. Append failed FINALIZED replica should not be accepted as valid when that block is underconstruction. Contributed by Vinayakumar B.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615492 13f79535-47bb-0310-9956-ffa450edef68
2014-08-04 06:46:01 +00:00
Junping Du 0ad7bfb121 Merge r1615469 from trunk: YARN-2370. Fix comment in o.a.h.y.server.resourcemanager.schedulerAppSchedulingInfo (Contributed by Wenwu Peng)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615471 13f79535-47bb-0310-9956-ffa450edef68
2014-08-04 01:19:29 +00:00
Chris Nauroth c87a14048e HADOOP-10903. Merging change r1615386 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615388 13f79535-47bb-0310-9956-ffa450edef68
2014-08-03 05:17:02 +00:00
Chris Nauroth 2852c4866e HDFS-6810: fix compilation error in TestReplicationPolicy.java.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615387 13f79535-47bb-0310-9956-ffa450edef68
2014-08-03 05:13:44 +00:00
Arpit Agarwal 89cf64edf3 HDFS-6810: Merging r1615381 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615382 13f79535-47bb-0310-9956-ffa450edef68
2014-08-03 02:08:57 +00:00
Jian He 2417753952 Merge r1615270 from trunk. YARN-2343. Improve NMToken expire exception message. Contributed by Li Lu
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615271 13f79535-47bb-0310-9956-ffa450edef68
2014-08-01 23:46:26 +00:00
Andrew Wang 743837b259 HDFS-6793. Missing changes in HftpFileSystem when Reintroduce dfs.http.port / dfs.https.port in branch-2. Contributed by Juan Yu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615243 13f79535-47bb-0310-9956-ffa450edef68
2014-08-01 21:54:18 +00:00
Andrew Wang 5f115917b3 HDFS-6788. Improve synchronization in BPOfferService with read write lock. Contributed by Yongjun Zhang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615242 13f79535-47bb-0310-9956-ffa450edef68
2014-08-01 21:50:45 +00:00
Andrew Wang 2777f777e9 Revert HDFS-6788, bad merge.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615239 13f79535-47bb-0310-9956-ffa450edef68
2014-08-01 21:45:38 +00:00
Andrew Wang 511234c828 HDFS-6788. Improve synchronization in BPOfferService with read write lock. Contributed by Yongjun Zhang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615191 13f79535-47bb-0310-9956-ffa450edef68
2014-08-01 18:56:25 +00:00
Andrew Wang e86559fde3 HDFS-6802. Some tests in TestDFSClientFailover are missing @Test annotation. Contributed by Akira Ajisaka.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615184 13f79535-47bb-0310-9956-ffa450edef68
2014-08-01 17:58:37 +00:00
Andrew Wang f3db1ad3cc HADOOP-10900. CredentialShell args should use single-dash style. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615178 13f79535-47bb-0310-9956-ffa450edef68
2014-08-01 17:43:34 +00:00
Arpit Agarwal 1b4f028385 HDFS-6794: Merging r1615169 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615175 13f79535-47bb-0310-9956-ffa450edef68
2014-08-01 17:35:14 +00:00
Tsz-wo Sze 91794728d5 svn merge -c 1615107 from trunk for HDFS-6796. Improve the argument check during balancer command line parsing.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615108 13f79535-47bb-0310-9956-ffa450edef68
2014-08-01 14:15:57 +00:00
Arpit Agarwal a38e398a22 HDFS-6798: Merging r1615044 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615045 13f79535-47bb-0310-9956-ffa450edef68
2014-08-01 07:12:59 +00:00
Junping Du 75349f2d83 Merge r1615025 from trunk: YARN-2051. Fix bug in PBimpls and add more unit tests with reflection. (Contributed by Binglin Chang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615027 13f79535-47bb-0310-9956-ffa450edef68
2014-08-01 04:25:49 +00:00
Arpit Agarwal 5be502add3 HDFS-6797: Merging r1615017 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615018 13f79535-47bb-0310-9956-ffa450edef68
2014-08-01 01:15:04 +00:00
Tsz-wo Sze 4dfef67ed0 svn merge -c 1615015 from trunk for HDFS-6685. Balancer should preserve storage type of replicas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615016 13f79535-47bb-0310-9956-ffa450edef68
2014-08-01 01:12:24 +00:00
Xuan Gong ecc257e384 YARN-1994. Expose YARN/MR endpoints on multiple interfaces. Contributed by Craig Welch, Milan Potocnik and Arpit Agarwal
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1615010 13f79535-47bb-0310-9956-ffa450edef68
2014-07-31 21:29:01 +00:00
Zhijie Shen f52092be46 YARN-2347. Consolidated RMStateVersion and NMDBSchemaVersion into Version in yarn-server-common. Contributed by Junping Du.
svn merge --ignore-ancestry -c 1614838 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614839 13f79535-47bb-0310-9956-ffa450edef68
2014-07-31 09:31:22 +00:00
Arpit Agarwal 93cfcaa9aa HDFS-6441: Merging r1614812 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614815 13f79535-47bb-0310-9956-ffa450edef68
2014-07-31 06:52:56 +00:00
Arpit Agarwal 80b7f0f424 HDFS-3482. Merging r1358812 from trunk to branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614814 13f79535-47bb-0310-9956-ffa450edef68
2014-07-31 06:44:48 +00:00
Andrew Wang 2feffe5d81 HADOOP-10910. Increase findbugs maxHeap size. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614780 13f79535-47bb-0310-9956-ffa450edef68
2014-07-30 22:17:16 +00:00
Arpit Agarwal f71c0e67fa HDFS-6768: Merging r1614732 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614733 13f79535-47bb-0310-9956-ffa450edef68
2014-07-30 18:38:07 +00:00
Chris Nauroth 9df555d193 HDFS-6570. Merging change r1614723 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614726 13f79535-47bb-0310-9956-ffa450edef68
2014-07-30 17:54:35 +00:00
Steve Loughran 432e5eef56 HDFS-4629. Using com.sun.org.apache.xml.internal.serialize.* in XmlEditsVisitor.java is JVM vendor specific. Breaks IBM JAVA.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614664 13f79535-47bb-0310-9956-ffa450edef68
2014-07-30 14:06:05 +00:00
Andrew Wang 1bd3b2bf9a HDFS-6778. The extended attributes javadoc should simply refer to the user docs. Contributed by Charles Lamb.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614548 13f79535-47bb-0310-9956-ffa450edef68
2014-07-30 05:58:23 +00:00
Andrew Wang 562e6cbe6d HDFS-6665. Add tests for XAttrs in combination with viewfs. Contributed by Stephen Chu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614546 13f79535-47bb-0310-9956-ffa450edef68
2014-07-30 05:53:51 +00:00
Jian He ea94980477 Merge r1614538 from trunk. YARN-2354. DistributedShell may allocate more containers than client specified after AM restarts. Contributed by Li Lu
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614539 13f79535-47bb-0310-9956-ffa450edef68
2014-07-30 04:00:54 +00:00
Karthik Kambatla d23e7d4acb YARN-2328. FairScheduler: Verify update and continuous scheduling threads are stopped when the scheduler is stopped. (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614435 13f79535-47bb-0310-9956-ffa450edef68
2014-07-29 17:46:58 +00:00
Arpit Agarwal 31cc673c50 HADOOP-8069: Merging r1614242 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614243 13f79535-47bb-0310-9956-ffa450edef68
2014-07-29 02:56:02 +00:00
Karthik Kambatla 5817f7ce5b HADOOP-10821. Prepare the release notes for Hadoop 2.5.0. (Andrew Wang and Karthik Kambatla via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614232 13f79535-47bb-0310-9956-ffa450edef68
2014-07-29 00:47:57 +00:00
Andrew Wang e61396405a HADOOP-10876. The constructor of Path should not take an empty URL as a parameter. Contributed by Zhihai Xu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614231 13f79535-47bb-0310-9956-ffa450edef68
2014-07-29 00:44:38 +00:00
Tsz-wo Sze 8155f7c6eb svn merge -c 1614215 from trunk for HDFS-6739. Add getDatanodeStorageReport to ClientProtocol.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614217 13f79535-47bb-0310-9956-ffa450edef68
2014-07-28 23:46:03 +00:00
Brandon Li 81796d4741 HDFS-6717. Merging change r1614125 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1614129 13f79535-47bb-0310-9956-ffa450edef68
2014-07-28 18:57:52 +00:00
Zhijie Shen b41896f0a2 YARN-2247. Made RM web services authenticate users via kerberos and delegation token. Contributed by Varun Vasudev.
svn merge --ignore-ancestry -c 1613821 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613822 13f79535-47bb-0310-9956-ffa450edef68
2014-07-27 17:57:44 +00:00
Zhijie Shen 8cde949397 MAPREDUCE-6002. Made MR task avoid reporting error to AM when the task process is shutting down. Contributed by Wangda Tan.
svn merge --ignore-ancestry -c 1613743 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613744 13f79535-47bb-0310-9956-ffa450edef68
2014-07-27 01:41:44 +00:00
Chris Nauroth f1d0db87cd HDFS-6749. Merging change r1613561 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613562 13f79535-47bb-0310-9956-ffa450edef68
2014-07-26 04:21:16 +00:00
Karthik Kambatla c2b0f62155 YARN-1726. ResourceSchedulerWrapper broken due to AbstractYarnScheduler. (Wei Yan via kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613550 13f79535-47bb-0310-9956-ffa450edef68
2014-07-26 01:55:03 +00:00
Aaron Myers 5d0172fdf5 YARN-1796. container-executor shouldn't require o-r permissions. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613549 13f79535-47bb-0310-9956-ffa450edef68
2014-07-26 01:52:25 +00:00
Karthik Kambatla 775897ee02 HADOOP-10896. Update compatibility doc to capture visibility of un-annotated classes/ methods. (kasha)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613544 13f79535-47bb-0310-9956-ffa450edef68
2014-07-26 00:49:12 +00:00
Colin McCabe c039bccb92 HDFS-6750. The DataNode should use its shared memory segment to mark short-circuit replicas that have been unlinked as stale (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1613539 13f79535-47bb-0310-9956-ffa450edef68
2014-07-26 00:02:01 +00:00