Colin McCabe
|
05f49b8e37
|
HDFS-6622. Rename and AddBlock may race and produce invalid edits (kihwal via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609386 13f79535-47bb-0310-9956-ffa450edef68
|
2014-07-10 04:07:14 +00:00 |
|
Colin McCabe
|
2e7261d75a
|
HDFS-6618. FSNamesystem#delete drops the FSN lock between removing INodes from the tree and deleting them from the inode map (kihwal via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609381 13f79535-47bb-0310-9956-ffa450edef68
|
2014-07-10 03:54:20 +00:00 |
Vinayakumar B
|
86443513b3
|
Merged revision(s) 1609020 from hadoop/common/trunk:
HDFS-6646. [ HDFS Rolling Upgrade - Shell ] shutdownDatanode and getDatanodeInfo usage is missed ( Contributed by Brahma Reddy Battula)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1609021 13f79535-47bb-0310-9956-ffa450edef68
|
2014-07-09 06:07:07 +00:00 |
Chris Nauroth
|
18a54c1e16
|
HDFS-6627. Merging change r1608940 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1608948 13f79535-47bb-0310-9956-ffa450edef68
|
2014-07-08 20:31:14 +00:00 |
|
Chris Nauroth
|
7c49fb7582
|
HDFS-6638. Merging change r1608905 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1608911 13f79535-47bb-0310-9956-ffa450edef68
|
2014-07-08 19:29:00 +00:00 |
|
Chris Nauroth
|
822790d5af
|
HDFS-6614. Merging change r1608846 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1608847 13f79535-47bb-0310-9956-ffa450edef68
|
2014-07-08 16:48:01 +00:00 |
Uma Maheswara Rao G
|
5b832979e1
|
Mreged from trunk. HDFS-5411. Update Bookkeeper dependency to 4.2.3. Contributed by Rakesh R.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1608784 13f79535-47bb-0310-9956-ffa450edef68
|
2014-07-08 13:53:42 +00:00 |
|
Uma Maheswara Rao G
|
50c7825d10
|
Merged from trunk. HDFS-4221. Remove the format limitation point from BKJM documentation as HDFS-3810 closed. Contributed by Rakesh R.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1608777 13f79535-47bb-0310-9956-ffa450edef68
|
2014-07-08 13:33:05 +00:00 |
|
Uma Maheswara Rao G
|
5e22de1cf7
|
Merged from trunk. HDFS-4286. Changes from BOOKKEEPER-203 broken capability of including bookkeeper-server jar in hidden package of BKJM. Contributed by Rakesh R.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1608769 13f79535-47bb-0310-9956-ffa450edef68
|
2014-07-08 13:19:31 +00:00 |
|
Chris Nauroth
|
1a0950b745
|
HDFS-6617. Merging change r1608522 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1608523 13f79535-47bb-0310-9956-ffa450edef68
|
2014-07-07 17:38:56 +00:00 |
Andrew Wang
|
e6e5417134
|
HDFS-6511. BlockManager#computeInvalidateWork() could do nothing. Contributed by Juan Yu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607736 13f79535-47bb-0310-9956-ffa450edef68
|
2014-07-03 20:11:18 +00:00 |
|
Andrew Wang
|
3470a34c22
|
HDFS-6493. Change dfs.namenode.startup.delay.block.deletion to second instead of millisecond. Contributed by Juan Yu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607733 13f79535-47bb-0310-9956-ffa450edef68
|
2014-07-03 20:02:46 +00:00 |
|
Andrew Wang
|
7cb89369bb
|
HDFS-6613. Improve logging in caching classes. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607698 13f79535-47bb-0310-9956-ffa450edef68
|
2014-07-03 17:14:18 +00:00 |
|
Uma Maheswara Rao G
|
547b19d1a3
|
Merge from trunk. HDFS-6620. Snapshot docs should specify about preserve options with cp command. Contributed by Stephen Chu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607686 13f79535-47bb-0310-9956-ffa450edef68
|
2014-07-03 16:12:23 +00:00 |
Steve Loughran
|
d6fd16c8dc
|
HADOOP-9361: Strictly define FileSystem APIs - HDFS portion
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607623 13f79535-47bb-0310-9956-ffa450edef68
|
2014-07-03 12:54:15 +00:00 |
Karthik Kambatla
|
9133e3142c
|
Preparing for 2.6.0 development. Updated versions.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607541 13f79535-47bb-0310-9956-ffa450edef68
|
2014-07-03 06:11:57 +00:00 |
|
Karthik Kambatla
|
8380254440
|
Preparing for release 2.6.0
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607539 13f79535-47bb-0310-9956-ffa450edef68
|
2014-07-03 05:56:01 +00:00 |
|
Andrew Wang
|
4eb15fa356
|
HDFS-6610. TestShortCircuitLocalRead tests sometimes timeout on slow machines. Contributed by Charles Lamb.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607497 13f79535-47bb-0310-9956-ffa450edef68
|
2014-07-02 23:02:47 +00:00 |
|
Colin McCabe
|
a9cf4e7a98
|
HDFS-6604. The short-circuit cache doesn't correctly time out replicas that haven't been used in a while (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607459 13f79535-47bb-0310-9956-ffa450edef68
|
2014-07-02 19:46:29 +00:00 |
|
Chris Nauroth
|
c661b13e2e
|
HDFS-6614. Merging change r1607447 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607448 13f79535-47bb-0310-9956-ffa450edef68
|
2014-07-02 19:01:22 +00:00 |
|
Andrew Wang
|
c35fc5815d
|
HDFS-6612. MiniDFSNNTopology#simpleFederatedTopology(int) always hardcode nameservice ID. Contributed by Juan Yu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607443 13f79535-47bb-0310-9956-ffa450edef68
|
2014-07-02 18:37:32 +00:00 |
|
Chris Nauroth
|
b66441827b
|
HDFS-6603. Merging change r1607239 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1607240 13f79535-47bb-0310-9956-ffa450edef68
|
2014-07-02 03:24:00 +00:00 |
|
Chris Nauroth
|
5a918b6b09
|
HDFS-6591. Merging change r1606927 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1606931 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-30 20:57:50 +00:00 |
Kihwal Lee
|
905b8c0895
|
svn merge -c 1606855 merging from trunk to branch-2 to fix:HDFS-6558. Missing newline in the description of dfsadmin -rollingUpgrade. Contributed by Chen He.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1606856 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-30 18:18:53 +00:00 |
|
Steve Loughran
|
56294d8457
|
HDFS-6418. Regression: DFS_NAMENODE_USER_NAME_KEY missing
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1606534 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-29 16:19:16 +00:00 |
|
Kihwal Lee
|
28b82d46af
|
svn merge -c 1606371 merging from trunk to branch-2 to fix:HDFS-6601. Issues in finalizing rolling upgrade when there is a layout version change.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1606372 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-28 15:25:18 +00:00 |
|
Uma Maheswara Rao G
|
e41a821997
|
Merge from trunk. HDFS-6556. Refine XAttr permissions. Contributed by Uma Maheswara Rao G.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1606322 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-28 11:49:57 +00:00 |
Aaron Myers
|
02679111e5
|
HADOOP-10701. NFS should not validate the access premission only based on the user's primary group. Contributed by Harsh J.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1606043 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-27 12:03:33 +00:00 |
|
Chris Nauroth
|
816b152c4a
|
HDFS-6572. Merging change r1605928 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1605930 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-26 23:16:12 +00:00 |
|
Chris Nauroth
|
d2163883f3
|
HADOOP-9705. Merging change r1605672 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1605673 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-26 05:40:26 +00:00 |
Tsz-wo Sze
|
3a07f1fc55
|
svn merge -c 1605565 from trunk for HDFS-6595. Allow the maximum threads for balancing on datanodes to be configurable.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1605566 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-25 19:28:11 +00:00 |
|
Tsz-wo Sze
|
fa46e0702b
|
svn merge -c 1605239 from trunk for HADOOP-10674. Improve PureJavaCrc32 performance and use java.util.zip.CRC32 for Java 7 and above.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1605240 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-25 02:22:57 +00:00 |
|
Aaron Myers
|
25cc3044ec
|
HDFS-6475. WebHdfs clients fail without retry because incorrect handling of StandbyException. Contributed by Yongjun Zhang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1605218 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-24 23:09:27 +00:00 |
Haohui Mai
|
e19d15be8b
|
HDFS-6587. Merge r1605184 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1605186 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-24 20:50:07 +00:00 |
|
Haohui Mai
|
58d7d9c78f
|
HDFS-6593. Merge r1605169 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1605180 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-24 20:31:18 +00:00 |
Alejandro Abdelnur
|
e9278879ac
|
HDFS-6430. HTTPFS - Implement XAttr support. (Yi Liu via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1605122 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-24 16:02:51 +00:00 |
|
Uma Maheswara Rao G
|
778608e1ad
|
Merge from trunk. HDFS-6486. Add user doc for XAttrs via WebHDFS. Contributed by Yi Liu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1605063 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-24 12:15:29 +00:00 |
|
Haohui Mai
|
b86ac2279a
|
HDFS-6562. Merge r1605016 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1605018 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-24 06:58:05 +00:00 |
Arpit Agarwal
|
fccacfb212
|
HDFS-6578: Merging r1604942 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604943 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-23 21:31:24 +00:00 |
|
Arpit Agarwal
|
dd90472574
|
HDFS-6587: Merging r1604899 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604900 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-23 18:21:33 +00:00 |
|
Haohui Mai
|
3395e01504
|
HDFS-6580. Merge r1604704 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604705 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-23 07:22:25 +00:00 |
|
Vinayakumar B
|
4e3551eea6
|
Merged revision(s) 1604692 from hadoop/common/trunk:
HDFS-6507. Improve DFSAdmin to support HA cluster better. (Contributd by Zesheng Wu)
........
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604695 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-23 05:19:28 +00:00 |
|
Haohui Mai
|
dbfde21372
|
HDFS-6583. Merge r1604541 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604542 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-22 07:41:23 +00:00 |
Jing Zhao
|
df1ab51d97
|
HDFS-4667. Merge r1604488 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604489 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-21 23:01:25 +00:00 |
|
Chris Nauroth
|
4c5d6b5f82
|
HDFS-6222. Remove background token renewer from webhdfs. Contributed by Rushabh Shah and Daryn Sharp.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604301 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-20 23:58:40 +00:00 |
|
Haohui Mai
|
9ba06f53fc
|
HDFS-6557. Merge r1604242 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604244 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-20 18:56:00 +00:00 |
|
Jing Zhao
|
eb7ea60a9a
|
HDFS-6535. Merge r1604226 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604228 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-20 18:26:50 +00:00 |
|
Aaron Myers
|
f4506f5f92
|
HDFS-6403. Add metrics for log warnings reported by JVM pauses. Contributed by Yongjun Zhang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604076 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-20 02:39:36 +00:00 |
|
Alejandro Abdelnur
|
de63c98853
|
HDFS-6312. WebHdfs HA failover is broken on secure clusters. (daryn via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604046 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-19 23:07:09 +00:00 |
|
Aaron Myers
|
16d769c864
|
HDFS-6549. Add support for accessing the NFS gateway from the AIX NFS client. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604023 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-19 19:41:24 +00:00 |
|
Kihwal Lee
|
6fdd0698bc
|
svn merge -c 1604011 merging from trunk to branch-2 to fix:HDFS-3848. A Bug in recoverLeaseInternal method of FSNameSystem class. Contributed by Hooman Peiro Sajjad and Chen He.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1604012 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-19 19:06:50 +00:00 |
|
Andrew Wang
|
17a6d23967
|
HDFS-6492. Support create-time xattrs and atomically setting multiple xattrs. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603978 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-19 17:55:01 +00:00 |
|
Aaron Myers
|
b61992e807
|
HDFS-6563. NameNode cannot save fsimage in certain circumstances when snapshots are in use. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603713 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-19 05:20:23 +00:00 |
|
Haohui Mai
|
f8240cdb87
|
HDFS-6480. Merge r1603705 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603706 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-19 04:15:56 +00:00 |
Brandon Li
|
a817378930
|
HDFS-6553. Merging change r1603677 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603679 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-18 23:55:13 +00:00 |
|
Arpit Agarwal
|
12f2f5d1a3
|
HDFS-6559: Merging r1603638 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603639 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-18 21:30:11 +00:00 |
|
Brandon Li
|
5e0bc1ee85
|
HDFS-6439. Merging change r1603622 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603624 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-18 20:50:05 +00:00 |
|
Jing Zhao
|
6c92704276
|
HDFS-6551. Merge r1603612 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603615 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-18 19:58:36 +00:00 |
|
Arpit Agarwal
|
f03ad3d756
|
HDFS-6552: Merging r1603602 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603603 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-18 19:37:45 +00:00 |
|
Tsz-wo Sze
|
019466b57b
|
svn merge -c 1603571 from trunk for HDFS-6530. Fix Balancer documentation.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603572 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-18 18:45:23 +00:00 |
|
Jing Zhao
|
ebe064b9ff
|
HDFS-6527. Merge r1603340 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603341 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-18 01:02:23 +00:00 |
|
Kihwal Lee
|
97d57ff1f4
|
svn merge -c 1603239 merging from trunk to branch-2 to fix:HDFS-6545. Finalizing rolling upgrade can make NN unavailable for a long duration.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603241 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-17 18:00:54 +00:00 |
|
Chris Nauroth
|
51dba744bd
|
HADOOP-10557. Merging change r1603222 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603226 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-17 17:11:24 +00:00 |
|
Andrew Wang
|
73da7dde47
|
HDFS-6528. Add XAttrs to TestOfflineImageViewer. Contributed by Stephen Chu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603021 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-16 23:08:24 +00:00 |
|
Andrew Wang
|
88344f9b06
|
HDFS-6518. TestCacheDirectives#testExceedsCapacity should take FSN read lock when accessing pendingCached list. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1603017 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-16 22:48:22 +00:00 |
|
Colin McCabe
|
a2aebb4b28
|
HDFS-6539. test_native_mini_dfs is skipped in hadoop-hdfs pom.xml (decstery via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602999 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-16 20:36:06 +00:00 |
Arun Murthy
|
3278b6cc39
|
Preparing to release hadoop-2.4.1.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602887 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-16 15:11:14 +00:00 |
|
Aaron Myers
|
8b1abad185
|
HDFS-6499. Use NativeIO#renameTo instead of File#renameTo in FileJournalManager. Contributed by Yongjun Zhang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602543 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-14 02:17:10 +00:00 |
|
Aaron Myers
|
018793faa7
|
HDFS-6529. Trace logging for RemoteBlockReader2 to identify remote datanode and file being read. Contributed by Anubhav Dhoot.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602539 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-14 00:59:47 +00:00 |
|
Andrew Wang
|
7ce31cc100
|
HDFS-6470. TestBPOfferService.testBPInitErrorHandling is flaky. Contributed by Ming Ma.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602491 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-13 19:00:52 +00:00 |
|
Haohui Mai
|
99b18b0019
|
HDFS-6330. Merge r1602484 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602485 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-13 18:06:57 +00:00 |
|
Andrew Wang
|
15faf00a8b
|
HADOOP-10691. Improve the readability of 'hadoop fs -help'. Contributed by Lei Xu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602331 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-13 06:45:06 +00:00 |
|
Andrew Wang
|
c5de5f87ea
|
HDFS-3493. Invalidate excess corrupted blocks as long as minimum replication is satisfied. Contributed by Juan Yu and Vinayakumar B.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602293 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-12 21:17:46 +00:00 |
|
Andrew Wang
|
051049a4f5
|
HDFS-6395. Skip checking xattr limits for non-user-visible namespaces. Contributed by Yi Liu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602289 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-12 20:58:46 +00:00 |
|
Andrew Wang
|
35eeacc122
|
HDFS-6460. Ignore stale and decommissioned nodes in NetworkTopology#sortByDistance. Contributed by Yongjun Zhang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602287 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-12 20:45:52 +00:00 |
|
Chris Nauroth
|
7b1c468b43
|
HADOOP-10561. Merging change r1602225 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602229 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-12 16:58:40 +00:00 |
|
Uma Maheswara Rao G
|
d59ca5c4e1
|
Merged from trunk to branch-2. HDFS-6375. Listing extended attributes with the search permission. Contributed by Charles Lamb
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602133 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-12 12:02:57 +00:00 |
|
Uma Maheswara Rao G
|
5677e994e3
|
Merge from trunk to branch-2. HDFS-6464. Support multiple xattr.name parameters for WebHDFS getXAttrs. Contributed by Yi Liu
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602125 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-12 11:22:43 +00:00 |
Konstantin Boudnik
|
b0d286dddb
|
HDFS-6471. Merge r1602064 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602066 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-12 05:52:05 +00:00 |
|
Arpit Agarwal
|
8314818b6f
|
HADOOP-10376: Merging r1602055 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602057 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-12 01:43:01 +00:00 |
|
Alejandro Abdelnur
|
cbec85322f
|
HDFS-6379. HTTPFS - Implement ACLs support. (yoderme via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1602042 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-11 22:40:15 +00:00 |
|
Uma Maheswara Rao G
|
6eb03a41cb
|
Merge HDFS-2006 HDFS XAttrs feature from Trunk to Branch-2
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601992 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-11 19:25:17 +00:00 |
|
Haohui Mai
|
2582dd2ca3
|
HDFS-6315. Merge r1601960 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601963 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-11 17:28:12 +00:00 |
|
Haohui Mai
|
c6ed9ac1d8
|
HDFS-6503. Merge r1601958 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601959 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-11 17:14:35 +00:00 |
|
Arpit Agarwal
|
705c23e718
|
HDFS-6364: Merging r1601771 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601772 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-10 21:03:16 +00:00 |
|
Andrew Wang
|
f3e1811dbd
|
HDFS-6399. Add note about setfacl in HDFS permissions guide. Contributed by Chris Nauroth.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601477 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-09 18:43:33 +00:00 |
|
Colin McCabe
|
7b795f6a7c
|
HDFS-6257. TestCacheDirectives#testExceedsCapacity fails occasionally (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601474 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-09 18:40:00 +00:00 |
Junping Du
|
d678a9ecf9
|
Merge r1601199 from trunk: HDFS-6500. Snapshot shouldn't be removed silently after renaming to an existing snapshot. (Contributed by Nicholas SZE)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601200 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-08 07:17:46 +00:00 |
|
Konstantin Boudnik
|
3cc1e9fc31
|
HDFS-6297. Add CLI testcases to reflect new features of dfs and dfsadmin (Contributed by Dasha Boudnik)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601060 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-07 05:23:40 +00:00 |
|
Colin McCabe
|
38c0114f2b
|
HDFS-6497. Make TestAvailableSpaceVolumeChoosingPolicy deterministic (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601036 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-06 23:41:08 +00:00 |
|
Andrew Wang
|
96defb2d7b
|
HDFS-6487. TestStandbyCheckpoint#testSBNCheckpoints is racy. Contributed by Mit Desai.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1601017 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-06 21:42:40 +00:00 |
|
Colin McCabe
|
10bfa1ef2b
|
HDFS-6369. Document that BlockReader#available() can return more bytes than are remaining in the block (Ted Yu via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1600802 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-06 00:59:44 +00:00 |
|
Andrew Wang
|
2abf0c7bea
|
HDFS-6268. 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@1599842 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-04 00:37:38 +00:00 |
|
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 |
|
Jing Zhao
|
b712ed2b23
|
HDFS-6424. Merge r1599397 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599398 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-03 00:52:16 +00:00 |
Michael Stack
|
78d46e8508
|
HDFS-6109 let sync_file_range() system call run in background (Liang Xie via stack)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1599351 13f79535-47bb-0310-9956-ffa450edef68
|
2014-06-02 20:34:20 +00:00 |
|
Kihwal Lee
|
2655f418b2
|
Fix merge error.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598874 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-31 14:32:44 +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 |
|
Andrew Wang
|
0214a435a5
|
HDFS-6472. Merged from r1598746. fix typo in webapps/hdfs/explorer.js. Contributed by Juan Yu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598747 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-30 20:44:57 +00:00 |
|
Alejandro Abdelnur
|
2e8259ae25
|
HDFS-6404. HttpFS should use a 000 umask for mkdir and create operations. (yoderme via tucu)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598669 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-30 16:51:04 +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 |
|
Chris Nauroth
|
c19b55ce32
|
HDFS-6463. Merging change r1598437 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598438 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-29 23:08:52 +00:00 |
|
Andrew Wang
|
e3bd43766f
|
HDFS-6447. balancer should timestamp the completion message. Contributed by Juan Yu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598412 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-29 21:39:09 +00:00 |
|
Andrew Wang
|
72aaab255d
|
HDFS-6356. Merged from r1598408. Fix typo in DatanodeLayoutVersion. Contributed by Tulasi G.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598409 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-29 21:33:22 +00:00 |
|
Brandon Li
|
e4346e9877
|
HDFS-6462. Merging change r1598405 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598407 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-29 21:19:17 +00:00 |
|
Andrew Wang
|
b5e9d1e8bd
|
HDFS-6461. Use Time#monotonicNow to compute duration in DataNode#shutDown. Contributed by James Thomas.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598400 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-29 21:02:31 +00:00 |
|
Chris Nauroth
|
7895ecccac
|
HADOOP-10602. Merging change r1598337 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598338 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-29 17:33:10 +00:00 |
|
Andrew Wang
|
e82172c455
|
HDFS-6453. Use Time#monotonicNow to avoid system clock reset. Contributed by Liang Xie.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598145 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-28 21:25:55 +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 |
|
Arpit Agarwal
|
b97fac3359
|
HDFS-6442: Merging r1598078 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598081 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-28 17:45:21 +00:00 |
|
Colin McCabe
|
f8dd75e7e9
|
HDFS-6448. BlockReaderLocalLegacy should set socket timeout based on conf.socketTimeout (liangxie via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1598080 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-28 17:44:38 +00:00 |
|
Brandon Li
|
14ea885990
|
HDFS-6411. Merging change r1597895 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1597896 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-27 23:05:15 +00:00 |
|
Brandon Li
|
3bd21e8814
|
HDFS-6416. Merging change r1597868 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1597870 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-27 20:26:12 +00:00 |
|
Jing Zhao
|
3bfc0088f4
|
HDFS-6227. Merge r1597829 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1597830 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-27 17:23:29 +00:00 |
|
Michael Stack
|
4206ef2611
|
HBASE-6110 adding more slow action log in critical write path (Liang Xie via stack)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1597634 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-26 19:44:02 +00:00 |
|
Arpit Agarwal
|
2fe6e4ccfe
|
HDFS-6443: Merging r1597238 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1597240 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-24 05:09:39 +00:00 |
|
Andrew Wang
|
2a9d3a8824
|
HDFS-6435. Merged from r1596966. Add support for specifying a static uid/gid mapping for the NFS gateway. (atm via wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596967 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-22 20:45:13 +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 |
|
Jing Zhao
|
380bb4de57
|
HDFS-6423. Merge r1596774 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596775 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-22 08:08:56 +00:00 |
|
Jing Zhao
|
2858c7f470
|
HDFS-6438. Merge r1596772 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596773 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-22 07:32:13 +00:00 |
|
Chris Nauroth
|
378153dd71
|
HDFS-6433. Merging change r1596742 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596745 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-22 04:58:39 +00:00 |
|
Chris Nauroth
|
c362382259
|
HDFS-6409. Merging change r1596739 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596740 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-22 04:43:59 +00:00 |
|
Andrew Wang
|
1ad5343c1f
|
HDFS-6396. Remove support for ACL feature from INodeSymlink. Contributed by Charles Lamb.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596717 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-22 00:16:02 +00:00 |
|
Kihwal Lee
|
1f3ec0616a
|
svn merge -c 1596344 merging from trunk to branch-2 to fix:HDFS-6419. TestBookKeeperHACheckpoints.TestSBNCheckpoints fails on trunk. Contributed by Akira AJISAKA.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596352 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-20 18:19:54 +00:00 |
|
Jing Zhao
|
ffc50dfe01
|
HDFS-6432. Merge r1596334 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596335 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-20 17:35:14 +00:00 |
|
Colin McCabe
|
11bb19d1ff
|
HDFS-6421. Fix vecsum.c compile on BSD and some other systems (Mit Desai via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1596325 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-20 17:20:00 +00:00 |
|
Kihwal Lee
|
2649b38262
|
svn merge -c 1595978 merging from trunk to branch-2 to fix:HDFS-6397. NN shows inconsistent value in deadnode count. Contributed by Mohammad Kamrul Islam. Fixing merge error
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595984 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-19 18:02:25 +00:00 |
|
Kihwal Lee
|
c412a2bdf7
|
svn merge -c 1595978 merging from trunk to branch-2 to fix:HDFS-6397. NN shows inconsistent value in deadnode count. Contributed by Mohammad Kamrul Islam.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595980 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-19 17:54:18 +00:00 |
|
Konstantin Boudnik
|
0527d364e5
|
Merge r1595744 from trunk. HDFS-6325. Append should fail if the last block has insufficient number of replicas (Keith Pak via cos)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595745 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-19 05:26:44 +00:00 |
|
Colin McCabe
|
88335a843f
|
HDFS-4913. Deleting file through fuse-dfs when using trash fails, requiring root permissions (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595372 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-16 22:24:54 +00:00 |
|
Aaron Myers
|
3f617e325c
|
HDFS-6406. Add capability for NFS gateway to reject connections from unprivileged ports. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595352 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-16 21:25:05 +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 |
|
Junping Du
|
584caaef1b
|
Merge r1595145 from trunk: HDFS-6250. Fix test failed in TestBalancerWithNodeGroup.testBalancerWithRackLocality (Contributed by Binglin Chang and Chen He
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595146 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-16 09:59:24 +00:00 |
|
Andrew Wang
|
c8ba7039b7
|
HDFS-6345. DFS.listCacheDirectives() should allow filtering based on cache directive ID. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595087 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-16 01:19:17 +00:00 |
|
Chris Nauroth
|
17c08afc83
|
HDFS-6402. Merging change r1595070 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595071 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-15 23:17:23 +00:00 |
|
Arpit Agarwal
|
b8c97091cc
|
HDFS-6362. Merge r1595056 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595066 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-15 22:41:01 +00:00 |
|
Arpit Agarwal
|
8970cf4d86
|
HDFS-4052. Merge r1398631 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595063 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-15 22:21:48 +00:00 |
|
Andrew Wang
|
81cf200155
|
HDFS-5683. Better audit log messages for caching operations. Contributed by Abhiraj Butala.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595057 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-15 21:30:22 +00:00 |
|
Brandon Li
|
3a9110ac05
|
HDFS-6361. Merging change r1595050 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1595053 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-15 21:27:43 +00:00 |
|
Kihwal Lee
|
d4d3cf1210
|
svn merge -c 1594917 merging from trunk to branch-2 to fix:HDFS-6400. Cannot execute hdfs oiv_legacy. Contributed by Akira AJISAKA.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594918 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-15 13:54:38 +00:00 |
|
Colin McCabe
|
44ef591ff0
|
HDFS-6287. Add vecsum test of libhdfs read access times (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594752 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-15 00:30:03 +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 |
|
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 |
|
Jing Zhao
|
08a1301381
|
HDFS-6381. Merge r1594447 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594448 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-14 02:52:41 +00:00 |
|
Kihwal Lee
|
f4b4bf14d3
|
HDFS-6293. Issues with OIV processing PB-based fsimages. Contributed by Kihwal Lee.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594440 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-14 01:15:48 +00:00 |
|
Chris Nauroth
|
b989f9780a
|
HDFS-6370. Merging change r1594362 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594365 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-13 20:11:40 +00:00 |
|
Colin McCabe
|
7b27dcf4dc
|
HDFS-6355. Fix divide-by-zero, improper use of wall-clock time in BlockPoolSliceScanner (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594339 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-13 19:25:23 +00:00 |
|
Jing Zhao
|
8fb3e34e74
|
HDFS-6186. Merge change r1594314 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594324 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-13 18:41:07 +00:00 |
|
Brandon Li
|
090003221e
|
HADOOP-10572. Merging change r1594289 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594291 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-13 17:12:03 +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
|
d389c8940e
|
HDFS-6305. WebHdfs response decoding may throw RuntimeExceptions (Daryn Sharp via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594274 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-13 16:43:30 +00:00 |
|
Kihwal Lee
|
a7e29582c3
|
svn merge -c 1594263 merging from trunk to branch-2 to fix:HDFS-6334. Client failover proxy provider for IP failover based NN HA. Contributed by Kihwal Lee.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594264 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-13 16:21:20 +00:00 |
|
Uma Maheswara Rao G
|
72763dbee9
|
Merge. HDFS-6367. EnumSetParam$Domain#parse fails for parameter containing more than one enum. Contributed by Yi Liu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594151 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-13 07:36:22 +00:00 |
|
Kihwal Lee
|
5ee9c6f28a
|
svn merge -c 1594055 merging from trunk to branch-2 to fix:HDFS-5522. Datanode disk error check may be incorrectly skipped. Contributed by Rushabh Shah.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594056 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-12 19:09:42 +00:00 |
|
Haohui Mai
|
ab40d65107
|
HDFS-6230. Merge r1594040 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594041 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-12 18:04:01 +00:00 |
|
Andrew Wang
|
c579bef2fc
|
HDFS-6351. Command hdfs dfs -rm -r can't remove empty directory. Contributed by Yongjun Zhang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1594037 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-12 17:55:23 +00:00 |
|
Haohui Mai
|
d7b201a16d
|
HDFS-6328. Merge r1593755 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593756 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-11 05:08:03 +00:00 |
|
Colin McCabe
|
fea7cd3c12
|
HDFS-6294. Use INode IDs to avoid conflicts when a file open for write is renamed (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593638 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-09 22:55:17 +00:00 |
|
Haohui Mai
|
03b04fbe28
|
HDFS-6240. Merge r1593591 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593593 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-09 18:45:19 +00:00 |
|
Kihwal Lee
|
d39b25b0e3
|
svn merge -c 1593475 merging from trunk to branch-2 to fix:HDFS-6313. WebHdfs may use the wrong NN when configured for multiple HA NNs. Contributed by Kihwal Lee.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593476 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-09 02:03:27 +00:00 |
|
Kihwal Lee
|
26601f37b0
|
Fix CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593474 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-09 01:52:49 +00:00 |
|
Kihwal Lee
|
93cc9f7e97
|
svn merge -c 1593470 merging from trunk to branch-2 to fix:HDFS-6329. WebHdfs does not work if HA is enabled on NN but logical URI is not configured. Contributed by Kihwal Lee.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593471 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-09 01:48:28 +00:00 |
|
Arpit Agarwal
|
92fdc7113f
|
HDFS-6340: Merging r1593436 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593437 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-08 22:21:10 +00:00 |
|
Kihwal Lee
|
76bfc73cc9
|
svn merge -c 1593362 merging from trunk to branch-2 to fix:HADOOP-10158. SPNEGO should work with multiple interfaces/SPNs. Contributed by Daryn Sharp.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593363 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-08 18:28:22 +00:00 |
|
Colin McCabe
|
0e76ba79d6
|
HDFS-5381. ExtendedBlock#hashCode should use both blockId and block pool ID (Benoy Antony via Colin Patrick McCabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1593348 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-08 17:50:24 +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 |
|
Uma Maheswara Rao G
|
9f54a6f230
|
Merge. HDFS-6337. Setfacl testcase is failing due to dash character in username in TestAclCLI. Contributed by Uma Maheswara Rao G.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592491 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-05 11:56:53 +00:00 |
|
Andrew Wang
|
4abbc157e1
|
HDFS-6295. Add decommissioning state and node state filtering to dfsadmin. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1592439 13f79535-47bb-0310-9956-ffa450edef68
|
2014-05-05 03:40:00 +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
|
fdf685576e
|
HDFS-6289. HA failover can fail if there are pending DN messages for DNs which no longer exist. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591414 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-30 17:48:17 +00:00 |
|
Haohui Mai
|
915b7bc3a6
|
HDFS-6304. Merge r1591411 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591412 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-30 17:45:57 +00:00 |
|
Jonathan Turner Eagles
|
e1313e7f89
|
HDFS-6269. NameNode Audit Log should differentiate between webHDFS open and HDFS open. (Eric Payne via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591118 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-29 21:53:36 +00:00 |
|
Arpit Agarwal
|
fa889d0ef6
|
HADOOP-10547: Merging r1591098 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591099 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-29 20:43:42 +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 |
|
Haohui Mai
|
1bb274a26e
|
Move the changelist of HDFS-5892 fro 2.4.0 to 2.5.0.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1591032 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-29 17:49:22 +00:00 |
|
Vinayakumar B
|
8be14bbf65
|
Merge r1590941 from trunk, HDFS-2882. DN continues to start up, even if block pool fails to initialize (Contributed by Vinayakumar B)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1590944 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-29 10:40:36 +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 |
|
Andrew Wang
|
d0bff50fed
|
HDFS-6288. DFSInputStream Pread doesn't update ReadStatistics. Contributed by Juan Yu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1590778 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-28 20:23:48 +00:00 |
|
Kihwal Lee
|
0f770f0897
|
svn merge -c 1590640 merging from trunk to branch-2 to fix:HDFS-6218. Audit log should use true client IP for proxied webhdfs operations. Contributed by Daryn Sharp.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1590641 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-28 14:01:39 +00:00 |
|
Haohui Mai
|
86f1b41d28
|
HDFS-6270. Merge r1590197 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1590198 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-25 23:50:48 +00:00 |
|
Haohui Mai
|
72f8755cca
|
HDFS-5685. Merge r1590100 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1590104 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-25 19:02:34 +00:00 |
|
Haohui Mai
|
038f32f74e
|
HDFS-6210. Merge r1589933 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589934 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-25 05:56:51 +00:00 |
|
Jing Zhao
|
e91f6f809b
|
HDFS-6266. Merge r1589920 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589921 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-25 02:07:25 +00:00 |
|
Aaron Myers
|
0bf1e43ac3
|
HDFS-6281. Provide option to use the NFS Gateway without having to use the Hadoop portmapper. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589915 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-25 00:19:34 +00:00 |
|
Colin McCabe
|
0e2a0fb434
|
HDFS-6282. Re-add testIncludeByRegistrationName (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589908 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-24 23:09:04 +00:00 |
|
Arpit Agarwal
|
1f7b6d319b
|
HDFS-6273: Merging r1589808 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589809 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-24 18:05:06 +00:00 |
|
Arpit Agarwal
|
6ec6fde017
|
HDFS-6273: Merging r1589803 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589805 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-24 17:41:05 +00:00 |
|
Jing Zhao
|
a9ab3fe0f6
|
HDFS-5693. Merge r1589620 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589621 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-24 07:26:35 +00:00 |
|
Haohui Mai
|
d49ff92928
|
HDFS-6279. Merge r1589618 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589619 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-24 07:20:46 +00:00 |
|
Haohui Mai
|
4ef2598d5d
|
HDFS-6278. Merge r1589613 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589616 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-24 07:17:17 +00:00 |
|
Suresh Srinivas
|
32e76decb5
|
HDFS-6276. Merge r1589586 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589588 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-24 05:08:14 +00:00 |
|
Kihwal Lee
|
8bcb8dba51
|
svn merge -c 1589528 merging from trunk to branch-2 to fix:HDFS-6217. Webhdfs PUT operations may not work via a http proxy. Contributed by Daryn Sharp.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589529 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-23 22:08:19 +00:00 |
|
Suresh Srinivas
|
488a4086ae
|
HDFS-6275. Merge r1589510 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589511 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-23 20:21:59 +00:00 |
|
Suresh Srinivas
|
a27fda9c85
|
HDFS-6274. Merge r1589506 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589507 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-23 20:16:16 +00:00 |
|
Andrew Wang
|
db667639eb
|
HDFS-5213. TestDataNodeConfig failing on Jenkins runs due to DN web port in use. (wang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589477 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-23 18:09:34 +00:00 |
|
Jing Zhao
|
a6e2b23b9d
|
HDFS-6178. Merge r1589002 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589003 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-21 23:37:58 +00:00 |
|
Chris Nauroth
|
f3a6e7023b
|
HDFS-6265. Merging change r1588995 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588998 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-21 22:55:42 +00:00 |
|
Arpit Agarwal
|
ba0c72d010
|
HDFS-6245: Merging r1588842 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588843 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-21 00:16:20 +00:00 |
|
Haohui Mai
|
8d12e9bf81
|
HDFS-6256. Merge r1588524 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588526 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-18 17:37:26 +00:00 |
|
Vinayakumar B
|
641cbc0feb
|
Merge r1588258 from trunk, HDFS-6153. Document "fileId" and "childrenNum" fields in the FileStatus Json schema
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588262 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-17 14:07:42 +00:00 |
|
Chris Nauroth
|
5d90eaa20d
|
HADOOP-10499. Merging change r1588098 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588099 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-16 23:16:36 +00:00 |
|
Colin McCabe
|
d28e711956
|
HDFS-4909. Avoid protocol buffer RPC namespace clashes (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1588093 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-16 23:01:16 +00:00 |
|
Kihwal Lee
|
4a13429dce
|
svn merge -c 1587962 from trunk to branch-2 to fix:HDFS-6219. Proxy superuser configuration should use true client IP for address checks. Contributed by Daryn Sharp.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587964 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-16 16:26:07 +00:00 |
Daryn Sharp
|
46738ee92b
|
svn merge -c 1587954 FIXES: HDFS-6214. Webhdfs has poor throughput for files >2GB (daryn)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587955 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-16 16:06:28 +00:00 |
|
Chris Nauroth
|
c3c195e9e8
|
HDFS-5409. Merging change r1587759 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587760 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-16 00:12:53 +00:00 |
|
Haohui Mai
|
d7583e206d
|
HDFS-6194. Merge r1587660 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587665 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-15 18:15:36 +00:00 |
|
Chris Nauroth
|
7c89cbfcd2
|
HDFS-6243. Merging change r1587410 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587416 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-15 04:59:49 +00:00 |
|
Chris Nauroth
|
f3039d3640
|
HDFS-6238. Merging change r1587148 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587150 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-14 04:50:14 +00:00 |
|
Chris Nauroth
|
750664ebc1
|
HDFS-6237. Merging change r1587146 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1587147 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-14 04:42:23 +00:00 |
|
Chris Nauroth
|
3672935a18
|
HDFS-6236. Merging change r1586902 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586903 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-12 21:46:13 +00:00 |
|
Colin McCabe
|
35a5a32f17
|
HDFS-6232. OfflineEditsViewer throws a NPE on edits containing ACL modifications (ajisakaa via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586791 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-11 22:43:15 +00:00 |
|
Jing Zhao
|
4d83618ec6
|
HDFS-6229. Merge r1586714 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586715 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-11 16:45:06 +00:00 |
|
Chris Nauroth
|
77beb3573c
|
HDFS-6235. Merging change r1586692 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586696 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-11 15:49:37 +00:00 |
|
Chris Nauroth
|
f44451bd58
|
HDFS-6234. Merging change r1586682 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586686 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-11 15:34:34 +00:00 |
|
Chris Nauroth
|
cb9c1d3c7b
|
HDFS-6231. Merging change r1586551 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586553 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-11 03:58:40 +00:00 |
|
Andrew Wang
|
3ed7d84136
|
Undo accidental FSNamesystem change introduced in HDFS-6224 commit.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586516 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-11 00:23:25 +00:00 |
|
Andrew Wang
|
b4989ed791
|
HDFS-6224. Add a unit test to TestAuditLogger for file permissions passed to logAuditEvent. Contributed by Charles Lamb.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586494 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-10 22:36:36 +00:00 |
|
Uma Maheswara Rao G
|
2dea526b23
|
Merge HDFS-5669. Storage#tryLock() should check for null before logging successfull message. Contributed by Vinayakumar B
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586393 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-10 18:13:40 +00:00 |
|
Haohui Mai
|
55758cbd81
|
HDFS-6225. Merge r1586181 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586182 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-10 00:22:19 +00:00 |
|
Chris Nauroth
|
129bf91c5e
|
HDFS-6208. Merging change r1586154 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586160 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-09 21:58:01 +00:00 |
|
Haohui Mai
|
29bdcc24d6
|
HDFS-6170. Merge r1586152 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586153 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-09 21:33:28 +00:00 |
|
Tsz-wo Sze
|
02163d1441
|
svn merge -c 1586079 from trunk for HDFS-6209. TestValidateConfigurationSettings should use random ports.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586080 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-09 18:50:39 +00:00 |
|
Tsz-wo Sze
|
56d87fb514
|
svn merge -c 1586039 from trunk for HDFS-6204. Fix TestRBWBlockInvalidation: change the last sleep to a loop.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586040 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-09 17:02:12 +00:00 |
|
Tsz-wo Sze
|
f23be52c30
|
svn merge -c 1586034 from trunk for HDFS-6206. Fix NullPointerException in DFSUtil.substituteForWildcardAddress.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586037 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-09 16:55:48 +00:00 |
|
Jonathan Turner Eagles
|
2c54fd41ef
|
HDFS-6215. Wrong error message for upgrade. (Kihwal Lee via jeagles)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586013 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-09 16:25:35 +00:00 |
|
Arpit Agarwal
|
0761ef1951
|
HDFS-6160: Merging 1586007 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1586008 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-09 16:14:35 +00:00 |
|
Steve Loughran
|
770aef5053
|
HADOOP-10104. Update jackson to 1.9.13 (Akira Ajisaka via stevel)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585933 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-09 11:11:31 +00:00 |
|
Haohui Mai
|
09c38c24e0
|
HDFS-6169. Merge r1585802 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585804 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-08 18:15:52 +00:00 |
|
Haohui Mai
|
02beaa7b18
|
HDFS-6143. Merge r1585639 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585641 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-08 01:45:21 +00:00 |
|
Chris Nauroth
|
4b31af597b
|
HDFS-6198. Merging change r1585627 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585628 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-08 00:06:59 +00:00 |
|
Haohui Mai
|
1b2a9412f8
|
HDFS-6180. Merge r1585625 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585626 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-07 23:58:24 +00:00 |
|
Chris Nauroth
|
58d9479140
|
HDFS-6197. Merging change r1585586 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585591 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-07 21:26:42 +00:00 |
|
Brandon Li
|
45e26bae05
|
HDFS-6181. Merging change r1585563 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585581 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-07 20:40:01 +00:00 |
|
Kihwal Lee
|
fef85fad1a
|
svn merge -c 1585544 Merging from trunk to branch-2 to fix:HDFS-6191. Disable quota checks when replaying edit log. Contributed by Kihwal Lee.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1585545 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-07 18:27:03 +00:00 |
|
Kihwal Lee
|
a558f63105
|
svn merge -c 1584900 Merging from trunk to branch-2 to fix:HDFS-6159. TestBalancerWithNodeGroup.testBalancerWithNodeGroup fails if there is block missing after balancer success.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1584901 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-04 20:40:19 +00:00 |
|
Tsz-wo Sze
|
0741fef232
|
svn merge -c 1584763 from trunk for HDFS-6189. Multiple HDFS tests fail on Windows attempting to use a test root path containing a colon.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1584764 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-04 15:51:49 +00:00 |
|
Haohui Mai
|
d60928c928
|
HDFS-6190. Merge r1584376 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1584377 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-03 20:20:27 +00:00 |
|
Tsz-wo Sze
|
660a0a0470
|
svn merge -c 1583878 from trunk for HDFS-6167. Relocate the non-public API classes in the hdfs.client package.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1584143 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-02 19:42:07 +00:00 |
|
Andrew Wang
|
76b097c187
|
HDFS-5591. Checkpointing should use monotonic time when calculating period. Contributed by Charles Lamb.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1583927 13f79535-47bb-0310-9956-ffa450edef68
|
2014-04-02 08:36:13 +00:00 |
|
Haohui Mai
|
0cd6f12410
|
HDFS-6173. Merge r1583384 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1583385 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-31 18:07:08 +00:00 |
|
Arun Murthy
|
e9e21c07cf
|
HDFS-5285. svn rm hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFileUnderConstruction.java & hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/INodeFileUnderConstructionWithSnapshot.java.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1583258 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-31 08:22:29 +00:00 |
|
Arun Murthy
|
21a1744039
|
Preparing for hadoop-2.4.0 release.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1583246 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-31 07:39:04 +00:00 |
|
Arun Murthy
|
c64cc2ff5e
|
Merge -c 1583241 from trunk to branch-2 to fix HDFS-4564. Ensure webhdfs returns correct HTTP response codes for denied operations. Contributed by Daryn Sharp.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1583242 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-31 07:26:56 +00:00 |
|
Tsz-wo Sze
|
94550b1ff2
|
svn merge -c 1583018 from trunk for HDFS-6166. Change Balancer socket read timeout to 20 minutes and add 10 seconds delay after error.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1583019 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-29 16:24:24 +00:00 |
|
Tsz-wo Sze
|
a6c405b99f
|
svn merge -c 1582856 from trunk for HDFS-6168. Remove a deprecated constructor and the deprecated methods reportChecksumFailure, getDelegationToken(Text), renewDelegationToken and cancelDelegationToken from DistributedFileSystem.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582857 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-28 18:36:20 +00:00 |
|
Haohui Mai
|
ea1b523902
|
HDFS-6156. Merge r1582847 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582849 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-28 18:11:57 +00:00 |
|
Haohui Mai
|
b7d68ff957
|
HDFS-6164. Merge r1582533 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582534 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-27 23:12:39 +00:00 |
|
Haohui Mai
|
67fd877105
|
HDFS-5978. Merge r1582433 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582434 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-27 18:17:21 +00:00 |
|
Jing Zhao
|
47ecc90e56
|
HDFS-6163. Merge change r1582421 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582422 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-27 17:38:09 +00:00 |
|
Suresh Srinivas
|
88dc6c1ed3
|
HDFS-6162. Merge r1582181 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582182 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-27 04:27:50 +00:00 |
|
Haohui Mai
|
b78ad887ed
|
HDFS-6158. Merge r1582164 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582165 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-27 03:00:01 +00:00 |
|
Haohui Mai
|
a8c81bb8b6
|
HDFS-6157. Merge r1582098 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582100 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-26 22:36:11 +00:00 |
|
Suresh Srinivas
|
bf266aa554
|
Merge r1582073 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582074 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-26 21:34:10 +00:00 |
|
Suresh Srinivas
|
53bebe2329
|
Merge r1582068 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1582069 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-26 21:29:57 +00:00 |
|
Jing Zhao
|
c87fbeb7a8
|
HDFS-5672. Merge r1581994 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581996 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-26 18:38:14 +00:00 |
|
Tsz-wo Sze
|
e034eb46d8
|
svn merge -c 1581936 from trunk for HDFS-6115. Call flush() for every append on block scan verification log.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581937 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-26 17:03:57 +00:00 |
|
Suresh Srinivas
|
847ef81ec6
|
Merge r1581914 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581915 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-26 16:34:46 +00:00 |
|
Haohui Mai
|
ba2506ae69
|
HDFS-6130. Merge r1581713 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581723 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-26 08:00:14 +00:00 |
|
Arpit Agarwal
|
38d0fb9238
|
HDFS-5910: Merging r1581688 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581690 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-26 04:14:27 +00:00 |
|
Haohui Mai
|
d3b471155b
|
HDFS-5196. Merge r1581427 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581429 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-25 17:55:48 +00:00 |
|
Jing Zhao
|
8b39fc9076
|
HDFS-5840. Merge r1581260 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581261 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-25 06:50:14 +00:00 |
|
Suresh Srinivas
|
590df94253
|
HDFS-6125. Merge 1581242 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581243 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-25 05:56:53 +00:00 |
|
Arpit Agarwal
|
5303f4a66d
|
HDFS-6124. Merging r1581124 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581137 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-24 23:45:55 +00:00 |
|
Chris Nauroth
|
02b4b702d3
|
HDFS-5846. Merging change r1581091 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581092 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-24 22:22:33 +00:00 |
|
Jing Zhao
|
069e6b389e
|
HDFS-6135. Merge r1581070 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581071 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-24 21:26:24 +00:00 |
|
Jing Zhao
|
b964c4424f
|
Backport HDFS-5138 from trunk: Support HDFS upgrade in HA. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581067 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-24 21:08:50 +00:00 |
|
Brandon Li
|
da2d86bd04
|
HDFS-6050. Merging change r1581055 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1581059 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-24 20:57:51 +00:00 |
|
Kihwal Lee
|
927f2a8330
|
svn merge -c 1580886 merging from trunk to branch-2 to fix:HDFS-3087. Decomissioning on NN restart can complete without blocks being replicated. Contributed by Rushabh S Shah.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580888 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-24 15:40:47 +00:00 |
|
Chris Nauroth
|
6006427e9f
|
HDFS-6140. Merging change r1580173 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580174 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-22 05:39:49 +00:00 |
|
Arpit Agarwal
|
8891c7d08b
|
HDFS-6120. Merging r1580047 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580048 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-21 20:57:44 +00:00 |
|
Tsz-wo Sze
|
86277cde7d
|
svn merge -c 1580013 from trunk for HDFS-6138. Add a user guide for how to use viewfs with federation.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1580014 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-21 18:48:34 +00:00 |
|
Jing Zhao
|
2bf6f06235
|
HDFS-6038. Merge r1579813 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579814 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-20 23:08:32 +00:00 |
|
Jing Zhao
|
6aa3081681
|
HDFS-6131. Move HDFSHighAvailabilityWithNFS.apt.vm and HDFSHighAvailabilityWithQJM.apt.vm from Yarn to HDFS. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579736 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-20 21:03:42 +00:00 |
|
Andrew Wang
|
43c923e930
|
HDFS-6089. Standby NN while transitioning to active throws a connection refused error when the prior active NN process is suspended. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579694 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-20 17:44:29 +00:00 |
|
Tsz-wo Sze
|
f94a9c0bd0
|
svn merge -c 1579670 from trunk for HDFS-6129. When a replica is not found for deletion, do not throw an exception.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579671 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-20 15:51:28 +00:00 |
|
Haohui Mai
|
d955e84f39
|
HDFS-6127. Merge r1579546 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579548 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-20 07:01:35 +00:00 |
|
Haohui Mai
|
b65d53331e
|
HDFS-6105. Merge r1579468 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579474 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-19 23:58:24 +00:00 |
|
Tsz-wo Sze
|
75a37d14bb
|
svn merge -c 1579396 from trunk for HDFS-6123. Do not log stack trace for ReplicaAlreadyExistsException and SocketTimeoutException.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579397 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-19 21:05:52 +00:00 |
|
Jing Zhao
|
6ba1656628
|
HDFS-6100. Merge r1579301 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579303 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-19 17:33:51 +00:00 |
|
Chris Nauroth
|
76f4a32aec
|
HDFS-6099. Merging change r1579122 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579128 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-19 03:55:53 +00:00 |
|
Suresh Srinivas
|
65fd55768d
|
Merge r1579104 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579106 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-19 01:10:50 +00:00 |
|
Aaron Myers
|
495cc5e128
|
HDFS-6112. NFS Gateway docs are incorrect for allowed hosts configuration. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579099 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-19 00:31:43 +00:00 |
|
Tsz-wo Sze
|
b18aaa79f5
|
Merge 1579004 and 1579005 from trunk for HDFS-6068. Disallow snapshot names that are also invalid directory names.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1579007 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-18 18:36:57 +00:00 |
|
Colin McCabe
|
c05e10b50a
|
HDFS-6007. Update documentation about short-circuit local reads (iwasakims via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578995 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-18 18:14:53 +00:00 |
|
Jing Zhao
|
d611f42c37
|
Merge r1578669 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578676 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-18 00:10:22 +00:00 |
|
Chris Nauroth
|
6db6c6744f
|
HDFS-5516. Merging change r1578549 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578552 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-17 20:30:20 +00:00 |
|
Colin McCabe
|
453c36b191
|
HDFS-6107. When a block cannot be cached due to limited space on the DataNode, it becomes uncacheable (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578515 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-17 19:00:53 +00:00 |
|
Arpit Agarwal
|
4ea49506cf
|
HDFS-6094. Merging r1578478 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1578480 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-17 17:38:31 +00:00 |
|
Colin McCabe
|
a42d5c79ab
|
HDFS-6106. Reduce default for dfs.namenode.path.based.cache.refresh.interval.ms (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577799 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-15 07:52:46 +00:00 |
|
Andrew Wang
|
72cf96300b
|
HDFS-6102. Lower the default maximum items per directory to fix PB fsimage loading. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577429 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-14 04:53:13 +00:00 |
|
Haohui Mai
|
bd2cb0117e
|
HDFS-6084. Merge r1577401 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577402 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-14 01:00:35 +00:00 |
|
Colin McCabe
|
5d65afe2db
|
HDFS-6097. Zero-copy reads are incorrectly disabled on file offsets above 2GB (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577355 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-13 22:38:39 +00:00 |
|
Brandon Li
|
2cf495a464
|
HDFS-6080. Merging change r1577319 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577320 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-13 21:07:14 +00:00 |
|
Suresh Srinivas
|
a19b5531ca
|
HDFS-5244. Merge 1577254 from trunk:
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577255 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-13 17:24:33 +00:00 |
|
Arpit Agarwal
|
502a0da830
|
HDFS-6096. Merging r1576999 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1577000 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-12 23:25:28 +00:00 |
|
Arpit Agarwal
|
9127f3c1dc
|
HDFS-5705. Merging r1555190 and r1576989 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576991 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-12 23:16:04 +00:00 |
|
Andrew Wang
|
49f08eebcc
|
HDFS-6079. Timeout for getFileBlockStorageLocations does not work. Contributed by Andrew Wang.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576980 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-12 22:56:35 +00:00 |
|
Colin McCabe
|
567654e6ee
|
HDFS-6086. Fix a case where zero-copy or no-checksum reads were not allowed even when the block was cached. (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576534 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-11 22:42:30 +00:00 |
|
Haohui Mai
|
237a2054b4
|
Merge r1576513 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576515 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-11 21:48:26 +00:00 |
|
Chris Nauroth
|
a6e3cbc7f3
|
HDFS-5638. Merging change r1576405 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576410 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-11 16:21:45 +00:00 |
|
Colin McCabe
|
1be546ff2b
|
HDFS-6085. Improve CacheReplicationMonitor log messages a bit (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576195 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-11 06:25:27 +00:00 |
|
Andrew Wang
|
0f7d99268c
|
HDFS-3405. Checkpointing should use HTTP POST or PUT instead of GET-GET to send merged fsimages. Contributed by Vinayakumar B.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576157 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-11 00:44:56 +00:00 |
|
Andrew Wang
|
0697a50337
|
Revert bad HDFS-3405 merge from trunk to retry
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576155 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-11 00:40:46 +00:00 |
|
Andrew Wang
|
1356761f0f
|
HDFS-3405. Checkpointing should use HTTP POST or PUT instead of GET-GET to send merged fsimages. Contributed by Vinayakumar B.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576154 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-11 00:34:16 +00:00 |
|
Tsz-wo Sze
|
5d2252b6dc
|
svn merge -c 1575452 from trunk for HDFS-6076. DataNode with SimulatedDataSet should not create DatanodeRegistration with namenode layout version and namenode node type.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576151 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-11 00:22:43 +00:00 |
|
Tsz-wo Sze
|
a42d3356db
|
svn merge -c 1575021 from trunk for HDFS-6060. NameNode should not check DataNode layout version
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576149 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-11 00:12:57 +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
|
946db612ed
|
HDFS-6055. Merging change r1576095 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576098 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-10 21:47:45 +00:00 |
|
Jing Zhao
|
9fcbd9413f
|
HDFS-6077. Merge change r1576076 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576077 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-10 20:50:40 +00:00 |
|
Andrew Wang
|
3826799270
|
HDFS-6070. Cleanup use of ReadStatistics in DFSInputStream.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576048 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-10 19:05:10 +00:00 |
|
Haohui Mai
|
c3c267af8f
|
Merge r1576035 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1576036 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-10 18:18:52 +00:00 |
|
Colin McCabe
|
bc927a10cf
|
HDFS-6071. BlockReaderLocal does not return -1 on EOF when doing a zero-length read on a short file. (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575799 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-10 02:48:11 +00:00 |
|
Arpit Agarwal
|
03f20f77e1
|
HDFS-6078. Merging r1575559 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575561 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-08 16:40:27 +00:00 |
|
Andrew Wang
|
fd3e554ff0
|
HDFS-5064. Standby checkpoints should not block concurrent readers. Contributed by Aaron Twining Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575449 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-07 23:39:14 +00:00 |
|
Chris Nauroth
|
e4ef7774b5
|
HDFS-5986. Merging change r1575384 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575385 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-07 19:45:24 +00:00 |
|
Chris Nauroth
|
d9e52c379c
|
HDFS-6069. Merging change r1575184 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575192 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-07 06:14:24 +00:00 |
|
Chris Nauroth
|
d7ef2df14f
|
HDFS-6063. Merging change r1575171 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575172 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-07 05:53:24 +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
|
a9acce33a7
|
HDFS-6067. TestPread.testMaxOutHedgedReadPool is flaky (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575101 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-06 23:48:44 +00:00 |
|
Haohui Mai
|
aaedcd5c5d
|
Merge r1575086 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575088 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-06 22:56:53 +00:00 |
|
Colin McCabe
|
68eab8c5b9
|
HDFS-6059. TestBlockReaderLocal fails if native library not available (ajisakaa via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1575000 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-06 18:53:12 +00:00 |
|
Haohui Mai
|
59b3646382
|
Merge r1574997 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574999 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-06 18:52:38 +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 |
|
Haohui Mai
|
39b70d4e1f
|
Merge r1574792 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574794 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-06 08:16:12 +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 |
|
Aaron Myers
|
a872bdcb60
|
HDFS-5898. Allow NFS gateway to login/relogin from its kerberos keytab. Contributed by Abin Shahab.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574696 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-05 22:30:45 +00:00 |
|
Haohui Mai
|
b19da33481
|
Merge r1574683 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574685 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-05 21:53:04 +00:00 |
|
Brandon Li
|
5e096ccac7
|
HDFS-6044. Merging change r1574622 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574624 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-05 19:05:44 +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
|
ef56b13d05
|
Merge r1574270 from trunk
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574271 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-05 00:30:12 +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 |
|
Michael Stack
|
9c18ac13c0
|
HDFS-6047 TestPread NPE inside in DFSInputStream hedgedFetchBlockByteRange (stack)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574206 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-04 21:11:52 +00:00 |
|
Jing Zhao
|
45f24de631
|
HDFS-6053. Fix TestDecommissioningStatus and TestDecommission in branch-2. Contributed by Jing Zhao.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1574178 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-04 19:29:04 +00:00 |
|
Colin McCabe
|
91d8ee4be7
|
HDFS-6046. add dfs.client.mmap.enabled (cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573888 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-04 06:51:40 +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 |
|
Chris Nauroth
|
b44dfd6725
|
HDFS-6039. Merging change r1573879 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573881 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-04 06:15:56 +00:00 |
|
Haohui Mai
|
3a4469df97
|
Merge r1573694 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573696 13f79535-47bb-0310-9956-ffa450edef68
|
2014-03-03 19:42:22 +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 |
|
Haohui Mai
|
eff8ac4537
|
HDFS-5956. Merge change r1573078 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573081 13f79535-47bb-0310-9956-ffa450edef68
|
2014-02-28 21:10:23 +00:00 |
|
Arpit Agarwal
|
d333ea34aa
|
HDFS-5821. Merging r1573076 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573077 13f79535-47bb-0310-9956-ffa450edef68
|
2014-02-28 21:06:17 +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 |
|
Aaron Myers
|
08735d92ed
|
HDFS-6033. PBImageXmlWriter incorrectly handles processing cache directives. Contributed by Aaron T. Myers.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573054 13f79535-47bb-0310-9956-ffa450edef68
|
2014-02-28 19:48:57 +00:00 |
|
Jing Zhao
|
b10d601a54
|
Backport HDFS-4200 from trunk: Reduce the size of synchronized sections in PacketResponder.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573044 13f79535-47bb-0310-9956-ffa450edef68
|
2014-02-28 19:38:31 +00:00 |
|
Colin McCabe
|
66c4e5090c
|
HDFS-6030. Remove an unused constructor in INode.java (yzhang via cmccabe)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573034 13f79535-47bb-0310-9956-ffa450edef68
|
2014-02-28 18:52:46 +00:00 |
|
Jing Zhao
|
d744a6d8fe
|
HDFS-5339. Merge change r1573026 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1573027 13f79535-47bb-0310-9956-ffa450edef68
|
2014-02-28 18:40:59 +00:00 |
|
Chris Nauroth
|
5551993c29
|
HDFS-6028. Merging change r1572753 from trunk to branch-2.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1572758 13f79535-47bb-0310-9956-ffa450edef68
|
2014-02-27 22:16:52 +00:00 |