5276f4e04d
HDFS-4767. If a directory is snapshottable, do not replace it when clearing quota. Contributed by Jing Zhao
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1476454 13f79535-47bb-0310-9956-ffa450edef68
2013-04-27 00:05:49 +00:00
60341dae19
Merge r1476010 through r1476452 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1476453 13f79535-47bb-0310-9956-ffa450edef68
2013-04-26 23:50:17 +00:00
75b4231a8c
HDFS-4761. When resetting FSDirectory, the inodeMap should also be reset. Contributed by Jing Zhao
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1476452 13f79535-47bb-0310-9956-ffa450edef68
2013-04-26 23:47:57 +00:00
a5ae562d70
HDFS-4650. When passing two non-existing snapshot names to snapshotDiff, it returns success if the names are the same. Contributed by Jing Zhao
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1476408 13f79535-47bb-0310-9956-ffa450edef68
2013-04-26 21:30:53 +00:00
d2495d553f
HDFS-4721. Speed up lease recovery by avoiding stale datanodes and choosing the datanode with the most recent heartbeat as the primary. Contributed by Varun Sharma
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1476399 13f79535-47bb-0310-9956-ffa450edef68
2013-04-26 20:51:45 +00:00
5d2ffde68e
HDFS-2576. Enhances the DistributedFileSystem's create API so that clients can specify favored datanodes for a file's blocks. Contributed by Devaraj Das and Pritam Damania.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1476395 13f79535-47bb-0310-9956-ffa450edef68
2013-04-26 20:39:51 +00:00
9da3865841
HDFS-4650. Fix a bug in FSDirectory and add more unit tests for rename with existence of snapshottable directories and snapshots. Contributed by Jing Zhao
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1476012 13f79535-47bb-0310-9956-ffa450edef68
2013-04-26 01:31:43 +00:00
fa500825fa
Merge r1471229 through r1476009 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1476011 13f79535-47bb-0310-9956-ffa450edef68
2013-04-26 01:19:00 +00:00
76b80b48ec
HDFS-4755. Fix AccessControlException message and moves "implements LinkedElement" from INode to INodeWithAdditionalFields.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1476009 13f79535-47bb-0310-9956-ffa450edef68
2013-04-26 01:05:47 +00:00
43ac0739ce
svn merge -c -1476006 . for reverting the previous trunk merge.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1476008 13f79535-47bb-0310-9956-ffa450edef68
2013-04-26 01:02:45 +00:00
a259e0ba79
Merge r1471229 through r1476005 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1476006 13f79535-47bb-0310-9956-ffa450edef68
2013-04-26 00:55:45 +00:00
06fb184d4d
HDFS-4757. Update FSDirectory#inodeMap when replacing an INodeDirectory while setting quota. Contributed by Jing Zhao
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1476005 13f79535-47bb-0310-9956-ffa450edef68
2013-04-26 00:50:09 +00:00
36f43dcb4f
HDFS-4742. Fix appending to a renamed file with snapshot. Contributed by Jing Zhao
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1475903 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 18:53:14 +00:00
745bfa0311
HDFS-4749. Use INodeId to identify the corresponding directory node in FSImage saving/loading. Contributed by Jing Zhao
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1475902 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 18:51:00 +00:00
a89f8e4d95
Cleanup CHANGES.txt and move the jira to appropriate 2.x release section to make it consistent with branch-2
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1475779 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 14:03:22 +00:00
16ef8dd3a5
HDFS-4745. TestDataTransferKeepalive#testSlowReader has race condition that causes sporadic failure. Contributed by Chris Nauroth.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1475623 13f79535-47bb-0310-9956-ffa450edef68
2013-04-25 04:25:58 +00:00
e6b5b01561
HDFS-4739. NN can miscalculate the number of extra edit log segments to retain. Contributed by Aaron T. Myers.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1471769 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 23:29:30 +00:00
e8b64d3851
HDFS-4729. Fix OfflineImageViewer and permission checking for snapshot operations. Contributed by Jing Zhao
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1471665 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 20:47:13 +00:00
0fa5cad0b2
HDFS-4686. Update quota computation for rename and INodeReference. Contributed by Jing Zhao
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1471647 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 20:31:06 +00:00
a09c29b8c0
HDFS-4339. Add the missed entry CHANGES.txt from r1465835
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1471595 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 18:41:12 +00:00
5f1e3b561a
Merge r1470760 through r1471228 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1471229 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 02:21:58 +00:00
3a812e9f3a
HDFS-4738. Changes AbstractINodeDiff to implement Comparable<Integer>, and fix javadoc and other warnings.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1471228 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 02:11:18 +00:00
4c662fd3fe
HDFS-4737. JVM path embedded in fuse binaries. Contributed by Sean Mackrory.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1471215 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 00:47:13 +00:00
65752c09ab
HDFS-4735. DisallowSnapshot throws IllegalStateException for nested snapshottable directories. Contributed by Jing Zhao
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1471214 13f79535-47bb-0310-9956-ffa450edef68
2013-04-24 00:28:07 +00:00
631be95398
HDFS-4732. Fix TestDFSUpgradeFromImage which fails on Windows due to failure to unpack old image tarball that contains hard links. Chris Nauroth
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1471090 13f79535-47bb-0310-9956-ffa450edef68
2013-04-23 18:47:47 +00:00
fd24c6e833
HDFS-4725. Fix HDFS file handle leaks in FSEditLog, NameNode, OfflineEditsBinaryLoader and some tests. Contributed by Chris Nauroth
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1470771 13f79535-47bb-0310-9956-ffa450edef68
2013-04-23 01:18:36 +00:00
10a2d82b45
HDFS-4719. Remove AbstractINodeDiff.Factory and move its methods to AbstractINodeDiffList. Contributed by Arpit Agarwal
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1470759 13f79535-47bb-0310-9956-ffa450edef68
2013-04-23 00:11:51 +00:00
92e0416ced
HDFS-4727. Update inodeMap after deleting files/directories/snapshots. Contributed by Jing Zhao
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1470756 13f79535-47bb-0310-9956-ffa450edef68
2013-04-23 00:00:47 +00:00
43bdc22e92
HDFS-4726. Fix test failures after merging the INodeId-INode mapping from trunk. Contributed by Jing Zhao
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1470735 13f79535-47bb-0310-9956-ffa450edef68
2013-04-22 22:13:58 +00:00
cb229db4bd
HDFS-4708. Add snapshot user documentation.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1470665 13f79535-47bb-0310-9956-ffa450edef68
2013-04-22 19:13:18 +00:00
27b3f84fe5
Merge trunk to HDFS-2802 branch. This involves fixing many conflict with HDFS-4434.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1470225 13f79535-47bb-0310-9956-ffa450edef68
2013-04-20 20:22:21 +00:00
0b101bd7e8
HDFS-4434. Reverting change r1470089 that merges trunk to HDFS-2802.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1470194 13f79535-47bb-0310-9956-ffa450edef68
2013-04-20 16:57:44 +00:00
9af0babe7e
Merging trunk after fixing conflict with HDFS-4434.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1470089 13f79535-47bb-0310-9956-ffa450edef68
2013-04-20 00:02:43 +00:00
16cc4a6e86
HDFS-4699. TestPipelinesFailover#testPipelineRecoveryStress fails sporadically. Contributed by Chris Nauroth.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1469839 13f79535-47bb-0310-9956-ffa450edef68
2013-04-19 14:08:29 +00:00
9ab8fa36f2
HDFS-4717. Change the path parameter type of the snapshot methods in HdfsAdmin from String to Path.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1469664 13f79535-47bb-0310-9956-ffa450edef68
2013-04-19 02:07:52 +00:00
980e6c54ba
HDFS-4434. Provide a mapping from INodeId to INode. Contributed by Suresh Srinivas.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1469644 13f79535-47bb-0310-9956-ffa450edef68
2013-04-19 00:10:09 +00:00
419fd3999c
HDFS-4706. Do not replace root inode for disallowSnapshot.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1469122 13f79535-47bb-0310-9956-ffa450edef68
2013-04-18 01:39:12 +00:00
0ad27ad3e3
HDFS-4707. Add snapshot methods to FilterFileSystem and fix findbugs warnings.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1469119 13f79535-47bb-0310-9956-ffa450edef68
2013-04-18 01:28:00 +00:00
2186912ff9
Merge r1467713 through r1469041 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1469042 13f79535-47bb-0310-9956-ffa450edef68
2013-04-17 19:41:50 +00:00
d090a3b600
HDFS-4695. TestEditLog leaks open file handles between tests. Contributed by Ivan Mitic.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1469015 13f79535-47bb-0310-9956-ffa450edef68
2013-04-17 18:11:31 +00:00
9280468b1a
HDFS-4550. Refactor INodeDirectory.INodesInPath to a standalone class.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1468725 13f79535-47bb-0310-9956-ffa450edef68
2013-04-17 02:41:38 +00:00
38bd7061c1
HDFS-4529. Disallow concat when one of the src files is in some snapshot.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1468667 13f79535-47bb-0310-9956-ffa450edef68
2013-04-16 23:16:02 +00:00
6bda1f20ad
HDFS-4700. Fix the undo section of rename with snapshots. Contributed by Jing Zhao
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1468632 13f79535-47bb-0310-9956-ffa450edef68
2013-04-16 22:03:58 +00:00
1822529e88
HDFS-4693. Some test cases in TestCheckpoint do not clean up after themselves. Contributed by Arpit Agarwal and Suresh.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1468457 13f79535-47bb-0310-9956-ffa450edef68
2013-04-16 15:10:47 +00:00
d13f6ebe20
HDFS-4666. Define ".snapshot" as a reserved inode name so that users cannot create a file/directory with ".snapshot" as the name. If ".snapshot" is used in a previous version of HDFS, it must be renamed before upgrade; otherwise, upgrade will fail.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1468238 13f79535-47bb-0310-9956-ffa450edef68
2013-04-15 21:42:06 +00:00
bf807063bc
Merging r1466653 through r1467712 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1467713 13f79535-47bb-0310-9956-ffa450edef68
2013-04-13 23:05:54 +00:00
0f78c50ea7
HDFS-4692. Use timestamp as default snapshot names.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1467706 13f79535-47bb-0310-9956-ffa450edef68
2013-04-13 21:41:33 +00:00
9c6a7bebe2
HDFS-4675. Fix rename across snapshottable directories. Contributed by Jing Zhao
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1467540 13f79535-47bb-0310-9956-ffa450edef68
2013-04-13 02:48:34 +00:00
801b484f97
HDFS-347. DFS read performance suboptimal when client co-located on nodes with data. Contributed by Colin Patrick McCabe.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1467538 13f79535-47bb-0310-9956-ffa450edef68
2013-04-13 02:13:59 +00:00
242028a3fb
HDFS-4639. startFileInternal() should not increment generation stamp. Contributed by Plamen Jeliazkov.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1467534 13f79535-47bb-0310-9956-ffa450edef68
2013-04-13 01:35:58 +00:00
b7aaa1b74c
Merge trunk into the HDFS-347 branch.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1467511 13f79535-47bb-0310-9956-ffa450edef68
2013-04-12 23:05:28 +00:00
f863543206
HDFS-4477. Secondary namenode may retain old tokens. Contributed by Daryn Sharp.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1467307 13f79535-47bb-0310-9956-ffa450edef68
2013-04-12 15:18:07 +00:00
6d9c311840
Preparing for release 0.23.7
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1467069 13f79535-47bb-0310-9956-ffa450edef68
2013-04-11 20:08:00 +00:00
fd1000bcef
HDFS-4679. Namenode operation checks should be done in a consistent manner. Contributed by Suresh Srinivas.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1466721 13f79535-47bb-0310-9956-ffa450edef68
2013-04-10 22:45:23 +00:00
4c00514ede
HDFS-4684. Use INode id for image serialization when writing INodeReference.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1466718 13f79535-47bb-0310-9956-ffa450edef68
2013-04-10 22:24:30 +00:00
3209d4a3c4
Merge r1464808 through r1466652 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1466658 13f79535-47bb-0310-9956-ffa450edef68
2013-04-10 20:17:39 +00:00
f0351527d5
HDFS-4643. Fix flakiness in TestQuorumJournalManager. Contributed by Todd Lipcon.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1466253 13f79535-47bb-0310-9956-ffa450edef68
2013-04-09 21:34:12 +00:00
d9593621b5
HDFS-4669. TestBlockPoolManager fails using IBM java. Contributed by Tian Hong Wang.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1466176 13f79535-47bb-0310-9956-ffa450edef68
2013-04-09 19:04:28 +00:00
e73db45185
HDFS-4674. TestBPOfferService fails on Windows due to failure parsing datanode data directory as URI. Contributed by Chris Nauroth.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1466148 13f79535-47bb-0310-9956-ffa450edef68
2013-04-09 17:33:05 +00:00
425f495591
HDFS-4676. TestHDFSFileSystemContract should set MiniDFSCluster variable to null to free up memory. Contributed by Suresh Srinivas.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1466099 13f79535-47bb-0310-9956-ffa450edef68
2013-04-09 16:17:06 +00:00
f680865d99
HDFS-3940. Add Gset#clear method and clear the block map when namenode is shutdown. Contributed by Suresh Srinivas.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1465851 13f79535-47bb-0310-9956-ffa450edef68
2013-04-09 01:21:48 +00:00
19201622be
HDFS-4339. Persist inode id in fsimage and editlog. Contributed by Brandon Li.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1465835 13f79535-47bb-0310-9956-ffa450edef68
2013-04-08 23:57:31 +00:00
087acf8fd6
HDFS-3981. Fix handling of FSN lock in getBlockLocations. Contributed by Xiaobo Peng and Todd Lipcon.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1465751 13f79535-47bb-0310-9956-ffa450edef68
2013-04-08 19:57:16 +00:00
c5bb615317
HDFS-4525. Provide an API for knowing that whether file is closed or not. Contributed by SreeHari.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1465434 13f79535-47bb-0310-9956-ffa450edef68
2013-04-07 18:01:17 +00:00
a9d515aed8
HDFS-1804. Add a new block-volume device choosing policy that looks at free space. Contributed by Aaron T. Myers.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1465183 13f79535-47bb-0310-9956-ffa450edef68
2013-04-06 04:08:09 +00:00
bcbe100541
HDFS-4646. createNNProxyWithClientProtocol ignores configured timeout value. Contributed by Jagane Sundar
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1465121 13f79535-47bb-0310-9956-ffa450edef68
2013-04-05 20:41:04 +00:00
07d7d92179
Merge r1462698 through r1464807 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1464815 13f79535-47bb-0310-9956-ffa450edef68
2013-04-05 02:43:29 +00:00
ca848beb53
HDFS-4647. Rename should call setLocalName after an inode is removed from snapshots. Contributed by Arpit Agarwal
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1464795 13f79535-47bb-0310-9956-ffa450edef68
2013-04-04 23:52:38 +00:00
999ce497f0
HDFS-4625. Make TestNNWithQJM#testNewNamenodeTakesOverWriter work on Windows. Contributed by Ivan Mitic.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1464780 13f79535-47bb-0310-9956-ffa450edef68
2013-04-04 22:54:09 +00:00
547d2b0bac
HDFS-4548. Webhdfs doesn't renegotiate SPNEGO token. Contributed by Daryn Sharp.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1464548 13f79535-47bb-0310-9956-ffa450edef68
2013-04-04 13:50:31 +00:00
d088d2ddea
HDFS-4665. Move TestNetworkTopologyWithNodeGroup to common. (Junping Du via llu)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1464303 13f79535-47bb-0310-9956-ffa450edef68
2013-04-04 07:12:28 +00:00
8293e22565
HDFS-4649. Webhdfs cannot list large directories. Contributed by Daryn Sharp.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1463698 13f79535-47bb-0310-9956-ffa450edef68
2013-04-02 19:11:56 +00:00
9c26c28c87
HDFS-4658. Standby NN will log that it has received a block report "after becoming active". Contributed by Aaron T. Myers.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1463643 13f79535-47bb-0310-9956-ffa450edef68
2013-04-02 17:49:58 +00:00
ef9e1ba763
HDFS-4656. DN heartbeat loop can be briefly tight. Contributed by Aaron T. Myers.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1463357 13f79535-47bb-0310-9956-ffa450edef68
2013-04-02 02:11:07 +00:00
329fb1f433
HDFS-4655. DNA_FINALIZE is logged as being an unknown command by the DN when received from the standby NN. Contributed by Aaron T. Myers.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1463355 13f79535-47bb-0310-9956-ffa450edef68
2013-04-02 02:05:55 +00:00
1096917649
HDFS-4611. Update FSImage for INodeReference.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1463332 13f79535-47bb-0310-9956-ffa450edef68
2013-04-01 23:24:42 +00:00
c45c8ee720
Complete commit of prior merge.
...
The previous merge accidentally only committed the hdfs project instead of common and MR
as well.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1463203 13f79535-47bb-0310-9956-ffa450edef68
2013-04-01 16:47:16 +00:00
8ee6ecaea4
HDFS-4637. INodeDirectory#replaceSelf4Quota may incorrectly convert a newly created directory to an INodeDirectoryWithSnapshot. Contributed by Jing Zhao
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1463075 13f79535-47bb-0310-9956-ffa450edef68
2013-04-01 01:53:21 +00:00
9602869d19
HDFS-4648. For snapshot deletion, when merging the diff from to-delete snapshot to the prior snapshot, make sure files/directories created after the prior snapshot get deleted. Contributed by Jing Zhao
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1462865 13f79535-47bb-0310-9956-ffa450edef68
2013-03-30 23:57:27 +00:00
f5bbc2d950
Merge r1460409 through r1462697 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1462698 13f79535-47bb-0310-9956-ffa450edef68
2013-03-30 03:50:03 +00:00
bbb24fbf5d
Merge trunk into branch.
...
Conflicts resolved:
C hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestShortCircuitLocalRead.java
! C hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/SocketCache.java
C hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
C hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
C hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
C hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/BlockReaderLocal.java
(thanks to Colin for help resolving)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1462652 13f79535-47bb-0310-9956-ffa450edef68
2013-03-29 21:33:35 +00:00
1611b51a97
HADOOP-9150. Avoid unnecessary DNS resolution attempts for logical URIs. Contributed by Todd Lipcon.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1462303 13f79535-47bb-0310-9956-ffa450edef68
2013-03-28 20:58:45 +00:00
25aab4203c
HDFS-4636. Update quota usage when deleting files/dirs that were created after taking the latest snapshot. Contributed by Jing Zhao
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1462192 13f79535-47bb-0310-9956-ffa450edef68
2013-03-28 16:18:04 +00:00
0e6604aab3
HDFS-4633 TestDFSClientExcludedNodes fails sporadically if excluded nodes cache expires too quickly (Chris Nauroth via Sanjay)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1461846 13f79535-47bb-0310-9956-ffa450edef68
2013-03-27 20:49:48 +00:00
694a672131
HDFS-4538. Allow use of legacy blockreader. Contributed by Colin Patrick McCabe.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1461818 13f79535-47bb-0310-9956-ffa450edef68
2013-03-27 19:28:12 +00:00
4809bfa6ed
HDFS-4618. Default transaction interval for checkpoints is too low. Contributed by Todd Lipcon.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1461783 13f79535-47bb-0310-9956-ffa450edef68
2013-03-27 18:46:32 +00:00
81192e4e41
HDFS-4621. Additional logging to help diagnose slow QJM syncs. Contributed by Todd Lipcon.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1461777 13f79535-47bb-0310-9956-ffa450edef68
2013-03-27 18:42:43 +00:00
c9f5052803
HDFS-4581. DataNode.checkDiskError should not be called on network errors. Contributed by Rohit Kochar.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1461597 13f79535-47bb-0310-9956-ffa450edef68
2013-03-27 14:21:13 +00:00
fdf1e6e07e
HDFS-4635. Move BlockManager#computeCapacity to LightWeightGSet. Contributed by Suresh Srinivas.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1461364 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 23:01:03 +00:00
ca3e09bab5
HDFS-4598. Fix the default value of ConcatSourcesParam and the WebHDFS doc.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1461040 13f79535-47bb-0310-9956-ffa450edef68
2013-03-26 09:54:48 +00:00
cc2f96f655
HDFS-4612. Not to use INode.getParent() when generating snapshot diff report. Contributed by Jing Zhao
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1460590 13f79535-47bb-0310-9956-ffa450edef68
2013-03-25 10:21:30 +00:00
698e3f8ae5
Merging trunk to branch HDFS-2802
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1460410 13f79535-47bb-0310-9956-ffa450edef68
2013-03-24 15:56:18 +00:00
993a76f2dd
HDFS-4627. Fix FSImageFormat#Loader NPE and synchronization issues. Contributed by Jing Zhao.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1460389 13f79535-47bb-0310-9956-ffa450edef68
2013-03-24 14:53:52 +00:00
7ed618e324
HDFS-4584. Skip TestNNWithQJM.testNewNamenodeTakesOverWriter() on Windows. Contributed by Arpit Agarwal
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1459592 13f79535-47bb-0310-9956-ffa450edef68
2013-03-21 23:56:06 +00:00
c2e186bae6
HDFS-4615. Fix TestDFSShell failures on Windows. Contributed by Arpit Agarwal
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1459586 13f79535-47bb-0310-9956-ffa450edef68
2013-03-21 23:48:39 +00:00
e976294d35
HDFS-4609. TestAuditLogs should release log handles between tests. Contributed by Ivan Mitic
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1459576 13f79535-47bb-0310-9956-ffa450edef68
2013-03-21 23:18:26 +00:00
1b98d8dda3
HDFS-4607. In TestGetConf.testGetSpecificKey(), use a platform-specific line separator; otherwise, it fails on Windows. Contributed by Ivan Mitic
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1459573 13f79535-47bb-0310-9956-ffa450edef68
2013-03-21 23:11:20 +00:00
036c168f4f
HDFS-4620. Documentation for dfs.namenode.rpc-address specifies wrong format. Contributed by Sandy Ryza.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1459549 13f79535-47bb-0310-9956-ffa450edef68
2013-03-21 21:59:02 +00:00
ca7c588185
HDFS-4616. Update the FilesDeleted metric while deleting file/dir in the current tree. Contributed by Jing Zhao
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1459485 13f79535-47bb-0310-9956-ffa450edef68
2013-03-21 19:30:35 +00:00
a10fbb93e7
HDFS-4246. The exclude node list should be more forgiving, for each output stream. Contributed by Harsh J. Chouraria.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1459475 13f79535-47bb-0310-9956-ffa450edef68
2013-03-21 18:58:06 +00:00
Tsz-wo Sze
Devaraj Das
Suresh Srinivas
Aaron Myers
Kihwal Lee
Konstantin Shvachko
Thomas Graves
Todd Lipcon
Uma Maheswara Rao G
Konstantin Boudnik
Luke Lu
Sanjay Radia