big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,555 Commits 2 Branches 2 Tags 264 MiB
9595cc003c
Commit Graph

2377 Commits

Author SHA1 Message Date
Kihwal Lee
b7923a356e HDFS-6425. Large postponedMisreplicatedBlocks has impact on blockReport latency. Contributed by Ming Ma. 2014-12-16 10:30:22 -06:00
Colin Patrick Mccabe
6e13fc62e1 HDFS-7513. HDFS inotify: add defaultBlockSize to CreateEvent (cmccabe) 2014-12-15 10:30:30 -08:00
Andrew Wang
fa7b9248e4 HDFS-7426. Change nntop JMX format to be a JSON blob. 2014-12-12 17:04:33 -08:00
Jing Zhao
c78e3a7cdd HDFS-7059. Avoid resolving path multiple times. Contributed by Jing Zhao. 2014-12-12 15:13:35 -08:00
arp
7784b10808 HDFS-7514. TestTextCommand fails on Windows. (Arpit Agarwal) 2014-12-12 14:27:50 -08:00
Andrew Wang
b437f5eef4 HDFS-7497. Inconsistent report of decommissioning DataNodes between dfsadmin and NameNode webui. Contributed by Yongjun Zhang. 2014-12-11 18:12:47 -08:00
Haohui Mai
5b9fcedb4d HADOOP-11389. Clean up byte to string encoding issues in hadoop-common. Contributed by Haohui Mai. 2014-12-11 16:42:38 -08:00
Haohui Mai
b9f6d0c956 HDFS-7515. Fix new findbugs warnings in hadoop-hdfs. Contributed by Haohui Mai. 2014-12-11 12:36:13 -08:00
Haohui Mai
d693a252bd HDFS-7463. Simplify FSNamesystem#getBlockLocationsUpdateTimes. Contributed by Haohui Mai. 2014-12-10 23:01:17 -08:00
arp
9a44db48b4 HDFS-7475. Make TestLazyPersistFiles#testLazyPersistBlocksAreSaved deterministic. (Contributed by Xiaoyu Yao) 2014-12-10 18:24:22 -08:00
Jing Zhao
5776a41da0 HDFS-7498. Simplify the logic in INodesInPath. Contributed by Jing Zhao. 2014-12-09 11:37:39 -08:00
Haohui Mai
6c5bbd7a42 HDFS-7486. Consolidate XAttr-related implementation into a single class. Contributed by Haohui Mai. 2014-12-08 11:52:21 -08:00
cnauroth
ffe942b82c HDFS-7384. getfacl command and getAclStatus output should be in sync. Contributed by Vinayakumar B. 2014-12-08 10:23:09 -08:00
cnauroth
9297f980c2 HDFS-7476. Consolidate ACL-related operations to a single class. Contributed by Haohui Mai. 2014-12-06 14:20:00 -08:00
Jing Zhao
475c6b4978 HDFS-7474. Avoid resolving path in FSPermissionChecker. Contributed by Jing Zhao. 2014-12-05 14:17:17 -08:00
Haohui Mai
0653918dad HDFS-7454. Reduce memory footprint for AclEntries in NameNode. Contributed by Vinayakumar B. 2014-12-04 20:49:45 -08:00
Colin Patrick Mccabe
75a326aaff HDFS-7446. HDFS inotify should have the ability to determine what txid it has read up to (cmccabe) 2014-12-02 17:15:21 -08:00
Haohui Mai
185e0c7b4c HDFS-7462. Consolidate implementation of mkdirs() into a single class. Contributed by Haohui Mai. 2014-12-02 14:53:45 -08:00
Haohui Mai
042699401e HDFS-7438. Consolidate the implementation of rename() into a single class. Contributed by Haohui Mai. 2014-12-01 21:48:28 -08:00
Haohui Mai
0af44ea846 HDFS-7450. Consolidate the implementation of GetFileInfo(), GetListings() and GetContentSummary() into a single class. Contributed by Haohui Mai. 2014-12-01 21:36:25 -08:00
Uma Maheswara Rao G
1556f86a31 HDFS-7210. Avoid two separate RPC's namenode.append() and namenode.getFileInfo() for an append call from DFSClient. (Vinayakumar B via umamahesh) 2014-11-28 21:09:16 +05:30
Haohui Mai
978736d486 HDFS-7444. Addendum patch to resolve conflicts between HDFS-7444 and HDFS-7310. 2014-11-26 10:53:53 -08:00
Haohui Mai
f5b1631179 HDFS-7444. convertToBlockUnderConstruction should preserve BlockCollection. Contributed by Haohui Mai. 2014-11-26 10:37:01 -08:00
Uma Maheswara Rao G
058af60c56 HDFS-7310. Mover can give first priority to local DN if it has target storage type available in local DN. (Vinayakumar B via umamahesh) 2014-11-26 23:27:25 +05:30
Andrew Wang
f43a20c529 HDFS-7097. Allow block reports to be processed during checkpointing on standby name node. (kihwal via wang) 2014-11-25 15:37:11 -08:00
Haohui Mai
45fa7f0235 HDFS-7303. NN UI fails to distinguish datanodes on the same host. Contributed by Benoy Antony. 2014-11-24 17:46:35 -08:00
Haohui Mai
8e253cb930 HDFS-7412. Move RetryCache to NameNodeRpcServer. Contributed by Haohui Mai. 2014-11-24 11:11:15 -08:00
Colin Patrick Mccabe
daacbc18d7 HDFS-4882. Prevent the Namenode's LeaseManager from looping forever in checkLeases (Ravi Prakash via Colin P. McCabe) 2014-11-24 10:46:33 -08:00
Aaron T. Myers
2d4f3e567e HDFS-7331. Add Datanode network counts to datanode jmx page. Contributed by Charles Lamb. 2014-11-21 16:36:39 -08:00
Haohui Mai
23dacb3892 HDFS-7420. Delegate permission checks to FSDirectory. Contributed by Haohui Mai. 2014-11-21 11:01:14 -08:00
Haohui Mai
acf1e033b0 HDFS-7413. Some unit tests should use NameNodeProtocols instead of FSNameSystem. Contributed by Haohui Mai. 2014-11-20 10:27:44 -08:00
Andrew Wang
765aecb4e1 HDFS-7409. Allow dead nodes to finish decommissioning if all files are fully replicated. 2014-11-19 17:53:00 -08:00
Andrew Wang
5bd048e837 HDFS-7373. Allow decommissioning of dead DataNodes. Contributed by Zhe Zhang. 2014-11-18 22:16:58 -08:00
Andrew Wang
406c09ad11 HDFS-7225. Remove stale block invalidation work when DN re-registers with different UUID. (Zhe Zhang and Andrew Wang) 2014-11-18 22:14:04 -08:00
cnauroth
9e81be0114 HDFS-7398. Reset cached thread-local FSEditLogOp's on every FSEditLog#logEdit. Contributed by Gera Shegalov. 2014-11-18 16:56:44 -08:00
Andrew Wang
bcd402ae38 HADOOP-11312. Fix unit tests to not use uppercase key names. 2014-11-18 10:47:46 -08:00
Haohui Mai
9dd5d673c9 HDFS-7404. Remove o.a.h.hdfs.server.datanode.web.resources. Contributed by Li Lu. 2014-11-17 17:35:36 -08:00
Andrew Wang
dcb8e24427 HDFS-6982. nntop: top­-like tool for name node users. (Maysam Yabandeh via wang) 2014-11-17 17:33:42 -08:00
Haohui Mai
bf8e4332cb HDFS-7279. Use netty to implement DatanodeWebHdfsMethods. Contributed by Haohui Mai. 2014-11-17 11:42:20 -08:00
cnauroth
b0a41de68c HDFS-7385. ThreadLocal used in FSEditLog class causes FSImage permission mess up. Contributed by jiangyu. 2014-11-13 12:34:52 -08:00
Tsz-Wo Nicholas Sze
394ba94c5d HDFS-7358. Clients may get stuck waiting when using ByteArrayManager. 2014-11-13 12:28:44 -08:00
Allen Wittenauer
ba879a5dad HADOOP-8989. hadoop fs -find feature (Jonathan Allen via aw) 2014-11-13 11:52:38 -08:00
Haohui Mai
46f6f9d60d HDFS-7375. Move FSClusterStats to o.a.h.h.hdfs.server.blockmanagement. Contributed by Haohui Mai. 2014-11-11 18:22:40 -08:00
cnauroth
163bb55067 HDFS-7389. Named user ACL cannot stop the user from accessing the FS entity. Contributed by Vinayakumar B. 2014-11-11 13:29:55 -08:00
Haohui Mai
571e9c6232 HDFS-7381. Decouple the management of block id and gen stamps from FSNamesystem. Contributed by Haohui Mai. 2014-11-11 12:42:12 -08:00
Haohui Mai
57760c0663 HDFS-7379. TestBalancer#testBalancerWithRamDisk creates test files incorrectly. Contributed by Xiaoyu Yao. 2014-11-07 13:39:09 -08:00
Jing Zhao
ae71a671a3 HDFS-7364. Balancer always shows zero Bytes Already Moved. Contributed by Tsz Wo Nicholas Sze. 2014-11-06 17:48:36 -08:00
Byron Wong
228afed14c HDFS-7329. Improve logging when MiniDFSCluster fails to start. Contributed by Byron Wong. 2014-11-05 20:56:21 -08:00
Konstantin V Shvachko
240cb59b9f HDFS-7361. TestCheckpoint fails after change of log message related to locking violation. Contributed by Konstantin Shvachko. 2014-11-05 20:15:16 -08:00
Haohui Mai
86eb27ba1d HDFS-7366. BlockInfo should take replication as an short in the constructor. Contributed by Li Lu. 2014-11-05 18:14:18 -08:00
cnauroth
ba1d4ad25b HDFS-7359. NameNode in secured HA cluster fails to start if dfs.namenode.secondary.http-address cannot be interpreted as a network address. Contributed by Chris Nauroth. 2014-11-05 15:09:22 -08:00
yliu
73e601259f HDFS-7218. FSNamesystem ACL operations should write to audit log on failure. (clamb via yliu) 2014-11-05 15:49:37 +08:00
Haohui Mai
99d710348a HDFS-7355. TestDataNodeVolumeFailure#testUnderReplicationAfterVolFailure fails on Windows, because we cannot deny access to the file owner. Contributed by Chris Nauroth. 2014-11-04 15:18:51 -08:00
Haohui Mai
d0449bd2fd HDFS-7334. Fix periodic failures of TestCheckpoint#testTooManyEditReplayFailures. Contributed by Charles Lamb. 2014-11-04 14:34:52 -08:00
Jing Zhao
3dfd6e68fe HDFS-7340. Make rollingUpgrade start/finalize idempotent. Contributed by Jing Zhao. 2014-11-04 10:16:37 -08:00
cnauroth
2bb327eb93 HDFS-7328. TestTraceAdmin assumes Unix line endings. Contributed by Chris Nauroth. 2014-11-03 19:59:52 -08:00
Kihwal Lee
67f13b58e4 HADOOP-10987. Provide an iterator-based listing API for FileSystem. Contributed by Kihwal Lee. 2014-11-03 08:20:22 -06:00
Tsz-Wo Nicholas Sze
36ccf097a9 HDFS-7276. Limit the number of byte arrays used by DFSOutputStream and provide a mechanism for recycling arrays. 2014-11-01 11:22:13 -07:00
Colin Patrick Mccabe
7b026c50f1 HDFS-6917. Add an hdfs debug command to validate blocks, call recoverlease, etc. (cmccabe) 2014-10-31 13:15:17 -07:00
Haohui Mai
3f030c04e8 HDFS-7315. DFSTestUtil.readFileBuffer opens extra FSDataInputStream. Contributed by Plamen Jeliazkov. 2014-10-31 11:47:41 -07:00
Ravi Prakash
c7f81dad30 HDFS-7309. XMLUtils.mangleXmlString doesn't seem to handle less than sign. (Colin Patrick McCabe via raviprak) 2014-10-31 11:22:25 -07:00
cnauroth
5573b3476a HDFS-7313. Support optional configuration of AES cipher suite on DataTransferProtocol. Contributed by Chris Nauroth. 2014-10-30 22:48:25 -07:00
cnauroth
c637d6d9d5 HDFS-6385. Show when block deletion will start after NameNode startup in WebUI. Contributed by Chris Nauroth. 2014-10-30 22:26:35 -07:00
Colin Patrick Mccabe
a9331fe9b0 HDFS-7035. Make adding a new data directory to the DataNode an atomic operation and improve error handling (Lei Xu via Colin P. McCabe) 2014-10-30 17:31:23 -07:00
Tao Luo
0126cf16b7 HDFS-7263. Snapshot read can reveal future bytes for appended files. Contributed by Tao Luo. 2014-10-29 20:21:12 -07:00
Kihwal Lee
3ae84e1ba8 HDFS-7300. HDFS-7300. The getMaxNodesPerRack() method in 
BlockPlacementPolicyDefault is flawed. contributed by Kihwal Lee
 2014-10-29 17:23:34 -05:00
Colin Patrick Mccabe
d33e07dc49 HDFS-7287. The OfflineImageViewer (OIV) can output invalid XML depending on the filename (Ravi Prakash via Colin P. McCabe) 2014-10-29 12:31:59 -07:00
Haohui Mai
675bca2968 HDFS-7280. Use netty 4 in WebImageViewer. Contributed by Haohui Mai. 2014-10-28 16:53:53 -07:00
Colin Patrick Mccabe
ac9ab037e9 HDFS-7235. DataNode#transferBlock should report blocks that don't exist using reportBadBlock (yzhang via cmccabe) 2014-10-28 16:41:22 -07:00
Kihwal Lee
371a3b87ed HDFS-6663. Admin command to track file and locations from block id. 
Contributed by Chen He.
 2014-10-28 14:26:04 -05:00
yliu
58c0bb9ed9 HDFS-6606. Optimize HDFS Encrypted Transport performance. (yliu) 2014-10-28 21:11:31 +08:00
Harsh J
0398db19b2 HDFS-6741. Improve permission denied message when FSPermissionChecker#checkOwner fails. Contributed by Stephen Chu and Harsh J. (harsh) 2014-10-28 12:22:37 +05:30
Colin Patrick Mccabe
518a7f4af3 HDFS-7282. Fix intermittent TestShortCircuitCache and TestBlockReaderFactory failures resulting from TemporarySocketDirectory GC (Jinghui Wang via Colin P. McCabe) 2014-10-27 17:44:07 -07:00
Colin Patrick Mccabe
baf794dc40 HDFS-7278. Add a command that allows sysadmins to manually trigger full block reports from a DN (cmccabe) 2014-10-27 09:53:16 -07:00
cnauroth
463aec1171 HDFS-6934. Move checksum computation off the hot path when writing to RAM disk. Contributed by Chris Nauroth. 2014-10-27 09:38:30 -07:00
Byron Wong
28051e4155 HADOOP-6857. FsShell should report raw disk usage including replication factor. Contributed by Byron Wong. 2014-10-25 12:31:41 -07:00
Colin Patrick Mccabe
a52eb4bc5f HDFS-6988. Improve HDFS-6581 eviction configuration (Xiaoyu Yao via Colin P. McCabe) 2014-10-24 13:08:59 -07:00
Jitendra Pandey
e2be333744 HDFS-6904. YARN unable to renew delegation token fetched via webhdfs due to incorrect service port. 2014-10-24 11:35:19 -07:00
yliu
57dec28807 HDFS-7243. HDFS concat operation should not be allowed in Encryption Zone. (clamb via yliu) 2014-10-24 11:12:18 +08:00
Colin Patrick Mccabe
5b56ac4c72 HDFS-7223. Tracing span description of IPC client is too long (iwasakims via cmccabe) 2014-10-23 19:14:00 -07:00
Haohui Mai
670879ef41 HDFS-7257. Add the time of last HA state transition to NN's /jmx page. Contributed by Charles Lamb. 2014-10-23 16:52:58 -07:00
Andrew Wang
86cad007d7 HDFS-7222. Expose DataNode network errors as a metric. (Charles Lamb via wang) 2014-10-23 12:53:01 -07:00
Andrew Wang
8c5b23b547 HDFS-7165. Separate block metrics for files with replication count 1. (Zhe Zhang via wang) 2014-10-23 12:28:02 -07:00
Colin Patrick Mccabe
7b0f9bb258 HDFS-6877. Avoid calling checkDisk when an HDFS volume is removed during a write. (Lei Xu via Colin P. McCabe) 2014-10-22 13:38:26 -07:00
Jing Zhao
1c8d191117 HDFS-7228. Fix TestDNFencing.testQueueingWithAppend. Contributed by Yongjun Zhang. 2014-10-22 10:48:15 -07:00
Andrew Wang
ac56b0637e HDFS-7221. TestDNFencingWithReplication fails consistently. Contributed by Charles Lamb. 2014-10-21 12:55:18 -07:00
Colin Patrick Mccabe
7aab5fa1bd HDFS-7154. Fix returning value of starting reconfiguration task (Lei Xu via Colin P. McCabe) 2014-10-20 18:33:11 -07:00
Vinayakumar B
cba1f9e389 HDFS-6995. Block should be placed in the client's 'rack-local' node if 'client-local' node is not available (vinayakumarb) 
Adding missed test file
 2014-10-17 17:31:01 +05:30
Tsz-Wo Nicholas Sze
2894433332 HDFS-5089. When a LayoutVersion support SNAPSHOT, it must support FSIMAGE_NAME_OPTIMIZATION. 2014-10-15 20:56:59 -07:00
Tsz-Wo Nicholas Sze
41980c56d3 HDFS-7208. NN doesn't schedule replication when a DN storage fails. Contributed by Ming Ma 2014-10-15 20:44:24 -07:00
Jing Zhao
18620649f9 HDFS-7185. The active NameNode will not accept an fsimage sent from the standby during rolling upgrade. Contributed by Jing Zhao. 2014-10-15 10:27:30 -07:00
Jing Zhao
7dcad84143 HDFS-7228. Add an SSD policy into the default BlockStoragePolicySuite. Contributed by Jing Zhao. 2014-10-14 10:22:34 -07:00
Tsz-Wo Nicholas Sze
f6d0b8892a HDFS-7237. The command "hdfs namenode -rollingUpgrade" throws ArrayIndexOutOfBoundsException. 2014-10-13 18:28:34 -07:00
Jing Zhao
98ac9f26c5 HDFS-7236. Fix TestOpenFilesWithSnapshot#testOpenFilesWithMultipleSnapshots. Contributed by Yongjun Zhang. 2014-10-13 10:27:36 -07:00
Andrew Wang
d3d3d47202 HDFS-7209. Populate EDEK cache when creating encryption zone. (Yi Liu via wang) 2014-10-10 13:40:37 -07:00
Aaron T. Myers
cbd21fd13b HDFS-7026. Introduce a string constant for "Failed to obtain user group info...". Contributed by Yongjun Zhang. 2014-10-09 18:52:48 -07:00
Andrew Wang
8d94114495 HADOOP-11174. Delegation token for KMS should only be got once if it already exists. (Yi Liu via wang) 2014-10-09 13:21:19 -07:00
Kihwal Lee
db71bb54bc HDFS-7217. Better batching of IBRs. Contributed by Kihwal Lee. 2014-10-09 12:07:51 -05:00
Colin Patrick Mccabe
d996235285 HDFS-7202. Should be able to omit package name of SpanReceiver on "hadoop trace -add" (iwasakims via cmccabe) 2014-10-08 17:55:46 -07:00
Kihwal Lee
853cb704ed HDFS-7203. Concurrent appending to the same file can cause data 
corruption. Contributed by Kihwal Lee.
 2014-10-08 15:05:34 -05:00
cnauroth
1efd9c9825 HDFS-7112. LazyWriter should use either async IO or one thread per physical disk. Contributed by Xiaoyu Yao. 2014-10-07 20:25:19 -07:00
cnauroth
9b8a35aff6 HDFS-7128. Decommission slows way down when it gets towards the end. Contributed by Ming Ma. 2014-10-07 15:01:09 -07:00
Vinayakumar B
ed841dd9a9 HDFS-6995. Block should be placed in the client's 'rack-local' node if 'client-local' node is not available (vinayakumarb) 2014-10-06 14:31:15 +05:30
Andrew Wang
d2d5a0ea03 HDFS-7179. DFSClient should instantiate a KeyProvider, not a KeyProviderCryptoExtension. (wang) 2014-10-02 13:50:05 -07:00
arp
c2fa5d1c42 HDFS-7178. Additional unit test for replica write with full disk. (Arpit Agarwal) 2014-10-02 09:28:26 -07:00
arp
e431d054cb Merge branch 'trunk' into HDFS-6581 2014-10-01 08:52:21 -07:00
Kihwal Lee
3f25d916d5 HDFS-6754. TestNamenodeCapacityReport.testXceiverCount may sometimes fail due to lack of retry. Contributed by Mit Desai. 2014-10-01 09:53:01 -05:00
arp
a45ad330fa HDFS-7171. Fix Jenkins failures in HDFS-6581 branch. (Arpit Agarwal) 2014-09-30 18:25:20 -07:00
arp
65ef35bbab Merge branch 'trunk' into HDFS-6581 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml
 2014-09-30 18:20:13 -07:00
arp
9e9e9cf711 HDFS-7153. Add storagePolicy to NN edit log during file creation. (Arpit Agarwal) 2014-09-30 18:10:13 -07:00
arp
dde2ed13c2 Merge branch 'trunk' into HDFS-6581 2014-09-30 18:05:54 -07:00
Jing Zhao
cdf1af0e5a HDFS-7167. NPE while running Mover if the given path is for a file. Contributed by Jing Zhao. 2014-09-30 11:13:35 -07:00
arp
5e8b697352 HDFS-7129. Metrics to track usage of memory for writes. (Contributed by Xiaoyu Yao) 2014-09-30 00:53:18 -07:00
arp
bb84f1fccb HDFS-7159. Use block storage policy to set lazy persist preference. (Arpit Agarwal) 2014-09-29 22:27:59 -07:00
arp
1e6b4b9b2e Merge branch 'trunk' into HDFS-6581 2014-09-29 14:01:47 -07:00
Andrew Wang
f0293f11a8 HDFS-7104. Fix and clarify INodeInPath getter functions. Contributed by Zhe Zhang. 2014-09-29 12:58:37 -07:00
arp
9a53c3699b Merge branch 'trunk' into HDFS-6581 2014-09-28 20:42:56 -07:00
arp
b38e52b5e8 HDFS-7093. Add config key to restrict setStoragePolicy. (Arpit Agarwal) 2014-09-28 19:28:51 -07:00
arp
7060502edb Merge branch 'trunk' into HDFS-6581 2014-09-26 11:09:03 -07:00
Colin Patrick Mccabe
55302ccfba HDFS-6956. Allow dynamically changing the tracing level in Hadoop servers (cmccabe) 2014-09-26 10:30:30 -07:00
arp
263977969b Fix test build break after merging from trunk 2014-09-25 20:29:24 -07:00
arp
032e0eba6b Merge branch 'trunk' into HDFS-6581 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
 2014-09-25 19:50:28 -07:00
Andrew Wang
e96ce6f3e3 HDFS-7077. Separate CipherSuite from crypto protocol version. (wang) 2014-09-25 18:40:40 -07:00
Jing Zhao
e9c37de485 HDFS-7131. During HA upgrade, JournalNode should create a new committedTxnId file in the current directory. Contributed by Jing Zhao. 2014-09-25 17:15:33 -07:00
cnauroth
9f9a2222a2 HDFS-7119. Split error checks in AtomicFileOutputStream#close into separate conditions to improve diagnostics. Contributed by Chris Nauroth. 2014-09-25 13:33:37 -07:00
Colin Patrick Mccabe
1861b32eb5 HDFS-6808. Add command line option to ask DataNode reload configuration. (Lei Xu via Colin McCabe) 2014-09-25 13:11:59 -07:00
arp
5a5a7da3a3 Merge branch 'trunk' into HDFS-6581 2014-09-25 12:55:59 -07:00
cnauroth
b607c3c363 HDFS-7127. TestLeaseRecovery leaks MiniDFSCluster instances. Contributed by Chris Nauroth. 2014-09-25 11:24:31 -07:00
cnauroth
dc2ebf88a8 HDFS-7111. TestSafeMode assumes Unix line endings in safe mode tip. Contributed by Chris Nauroth. 2014-09-25 11:17:46 -07:00
arp
e9edafc731 Merge branch 'trunk' into HDFS-6581 2014-09-25 11:06:25 -07:00
cnauroth
e0b1dc514f HDFS-7118. Improve diagnostics on storage directory rename operations by using NativeIO#renameTo in Storage#rename. Contributed by Chris Nauroth. 2014-09-25 10:03:59 -07:00
arp
e8e7fbe81a HDFS-6932. Balancer and Mover tools should ignore replicas on RAM_DISK. (Contributed by Xiaoyu Yao) 2014-09-24 21:08:59 -07:00
arp
b1000fbba4 Merge branch 'trunk' into HDFS-6581 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java
 2014-09-24 20:08:32 -07:00
Jing Zhao
428a76663a HDFS-7140. Add a tool to list all the existing block storage policies. Contributed by Jing Zhao. 2014-09-24 19:11:16 -07:00
Andrew Wang
63198bfba7 HDFS-7139. Unit test for creating encryption zone on root path. (Zhe Zhang via wang) 2014-09-24 16:40:20 -07:00
Jing Zhao
073bbd805c HDFS-7081. Add new DistributedFileSystem API for getting all the existing storage policies. Contributed by Jing Zhao. 2014-09-24 10:05:40 -07:00
arp
bfc7b7e6a0 Merge branch 'trunk' into HDFS-6581 2014-09-23 16:40:35 -07:00
cnauroth
b93d9603a2 HDFS-7130. TestDataTransferKeepalive fails intermittently on Windows. Contributed by Chris Nauroth. 2014-09-23 14:35:33 -07:00
Andrew Wang
f48686a1ad HDFS-7132. hdfs namenode -metadataVersion command does not honor configured name dirs. Contributed by Charles Lamb. 2014-09-23 14:10:02 -07:00
cnauroth
a1fd804a31 HDFS-7126. TestEncryptionZonesWithHA assumes Unix path separator for KMS key store path. Contributed by Xiaoyu Yao. 2014-09-23 08:21:46 -07:00
arp
8b139b0800 HDFS-6990. Add unit test for evict/delete RAM_DISK block with open handle. (Contributed by Xiaoyu Yao) 2014-09-22 18:10:28 -07:00
arp
889122bd55 Merge branch 'trunk' into HDFS-6581 2014-09-22 18:00:58 -07:00
Colin Patrick Mccabe
7b8df93ce1 HDFS-7001. Tests in TestTracing should not depend on the order of execution. (iwasakims via cmccabe) 2014-09-22 17:21:58 -07:00
Colin Patrick Mccabe
912ad32b03 HDFS-7106. Reconfiguring DataNode volumes does not release the lock files in removed volumes. (cnauroth via cmccabe) 2014-09-22 11:51:31 -07:00
cnauroth
26cba7f35f HDFS-7115. TestEncryptionZones assumes Unix path separator for KMS key store path. Contributed by Xiaoyu Yao. 2014-09-22 09:07:07 -07:00
cnauroth
b6fd5ccbce HDFS-7110. Skip tests related to short-circuit read on platforms that do not currently implement short-circuit read. Contributed by Chris Nauroth. 2014-09-21 12:36:57 -07:00
cnauroth
0795fe3721 HDFS-7109. TestDataStorage does not release file locks between tests. Contributed by Chris Nauroth. 2014-09-20 21:01:13 -07:00
arp
8c9860f7c9 HDFS-7071. Undo accidental commit of binary file editsStored. 2014-09-20 17:11:11 -07:00
arp
486a76a39b HDFS-7071. Updated editsStored and editsStored.xml to bump layout version and add LazyPersist flag. (Contributed by Xiaoyu Yao and Arpit Agarwal) 2014-09-20 16:58:58 -07:00
arp
e257b6dbb1 Merge branch 'trunk' into HDFS-6581 2014-09-20 16:13:17 -07:00
arp
50b321068d HDFS-7108. Fix unit test failures in SimulatedFsDataset. (Arpit Agarwal) 2014-09-20 16:12:17 -07:00
Jing Zhao
84a0a629d3 HDFS-7095. Archival Storage: TestStorageMover often fails in Jenkins. Contributed by Jing Zhao. 2014-09-20 13:44:53 -07:00
arp
b2d5ed36bc HDFS-7100. Make eviction scheme pluggable. (Arpit Agarwal) 2014-09-20 13:25:23 -07:00
arp
09dab88d3e Merge branch 'trunk' into HDFS-6581 2014-09-20 10:34:45 -07:00
cnauroth
f85cc14eb4 HDFS-7073. Allow falling back to a non-SASL connection on DataTransferProtocol in several edge cases. Contributed by Chris Nauroth. 2014-09-19 21:23:26 -07:00
cnauroth
332e2e23ba HDFS-7105. Fix TestJournalNode#testFailToStartWithBadConfig to match log output change. Contributed by Ray Chiang. 2014-09-19 21:04:55 -07:00
arp
222bf0fe67 Merge branch 'trunk' into HDFS-6581 2014-09-19 10:02:27 -07:00
Kihwal Lee
f02d934fed HDFS-6948. DN rejects blocks if it has older UC block. Contributed by 
Eric Payne.
 2014-09-19 08:50:43 -05:00
arp
f8bbf80067 Merge branch 'trunk' into HDFS-6581 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/StorageType.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsFileStatus.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsLocatedFileStatus.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelper.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormat.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSImageFormatPBINode.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/INodeFileAttributes.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeLayoutVersion.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/snapshot/FSImageFormatPBSnapshot.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/JsonUtil.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/proto/fsimage.proto
	hadoop-hdfs-project/hadoop-hdfs/src/main/proto/hdfs.proto
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/DFSTestUtil.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestFsck.java
 2014-09-18 22:26:42 -07:00
arp
e79c98c11f HDFS-7091. Add forwarding constructor for INodeFile for existing callers. (Arpit Agarwal) 2014-09-18 19:20:25 -07:00
Andrew Wang
8e73084491 HDFS-6840. Clients are always sent to the same datanode when read is off rack. (wang) 2014-09-18 17:49:17 -07:00
Andrew Wang
20a076bafc HDFS-6970. Move startFile EDEK retries to the DFSClient. (wang) 2014-09-18 17:35:24 -07:00
Colin Patrick Mccabe
fe38d2e9b5 HDFS-6727. Refresh data volumes on DataNode based on configuration changes (Lei Xu via Colin Patrick McCabe) 2014-09-18 16:52:46 -07:00
arp
849ccfa699 Merge branch 'trunk' into HDFS-6581 2014-09-18 11:06:40 -07:00
Jing Zhao
76ccb80fad HDFS-7088. Archival Storage: fix TestBalancer and TestBalancerWithMultipleNameNodes. Contributed by Tsz Wo Nicholas Sze. 2014-09-18 10:54:01 -07:00
Tsz-Wo Nicholas Sze
2d2b0009e6 Merge branch 'trunk' into HDFS-6584 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
 2014-09-18 13:00:29 +08:00
Andrew Wang
0ecefe6017 HDFS-7078. Fix listEZs to work correctly with snapshots. (wang) 2014-09-17 21:28:05 -07:00
Andrew Wang
10e8602f32 HDFS-7004. Update KeyProvider instantiation to create by URI. (wang) 2014-09-17 20:14:40 -07:00
arp
4eab083b1b HDFS-7080. Fix finalize and upgrade unit test failures. (Arpit Agarwal) 2014-09-17 15:25:04 -07:00
arp
a186d514bd Merge branch 'trunk' into HDFS-6581 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
 2014-09-17 15:03:55 -07:00
Jing Zhao
911979c8ab Merge changes from trunk 2014-09-17 13:12:45 -07:00
Colin Patrick Mccabe
e3803d002c HDFS-6843. Create FileStatus isEncrypted() method (clamb via cmccabe) 2014-09-17 12:55:35 -07:00
arp
24f8156886 Merge branch 'trunk' into HDFS-6581 2014-09-17 12:10:50 -07:00
Andrew Wang
ea4e2e843e HDFS-6705. Create an XAttr that disallows the HDFS admin from accessing a file. (clamb via wang) 2014-09-17 11:23:47 -07:00
Tsz-Wo Nicholas Sze
bd2e409de1 HDFS-7072. Fix TestBlockManager and TestStorageMover. Contributed by Jing Zhao 2014-09-17 13:48:32 +08:00
arp
a24a9331d4 Merge branch 'trunk' into HDFS-6581 2014-09-16 18:18:09 -07:00
Jing Zhao
432b863719 Merge changes from trunk 2014-09-16 17:58:39 -07:00
Andrew Wang
a044407b5c HDFS-6789. TestDFSClientFailover.testFileContextDoesntDnsResolveLogicalURI and TestDFSClientFailover.testDoesntDnsResolveLogicalURI failing on jdk7. Contributed by Akira Ajisaka. 2014-09-16 17:02:06 -07:00
Benoy Antony
02adf7185d HDFS-6799. The invalidate method in SimulatedFSDataset failed to remove (invalidate) blocks from the file system. Contributed by Megasthenis Asteris. 2014-09-16 16:24:23 -07:00
arp
4603e4481f HDFS-7064. Fix unit test failures in HDFS-6581 branch. (Contributed by Xiaoyu Yao) 2014-09-16 15:45:07 -07:00
Alejandro Abdelnur
3e85f5b605 HDFS-7006. Test encryption zones with KMS. (Anthony Young-Garner and tucu) 2014-09-16 14:36:07 -07:00
arp
e0d7fb48fb Merge branch 'trunk' into HDFS-6581 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/Receiver.java
 2014-09-16 14:32:57 -07:00
Colin Patrick Mccabe
56119fec96 HDFS-6880. Adding tracing to DataNode data transfer protocol (iwasakims via cmccabe) 2014-09-16 13:59:32 -07:00
Kihwal Lee
0c26412be4 HDFS-6965. NN continues to issue block locations for DNs with full 
disks. Contributed by Rushabh Shah.
 2014-09-16 09:04:54 -05:00
arp
a7814e1aa4 Merge branch 'trunk' into HDFS-6581 2014-09-15 15:30:19 -07:00
Kihwal Lee
2f847b3357 HDFS-7059. HAadmin transtionToActive with forceActive option can show 
confusing message. Contributed by Rushabh Shah.
 2014-09-15 16:27:22 -05:00
Jing Zhao
ece3ecabdf Merge remote-tracking branch 'origin/trunk' into HDFS-6584 2014-09-15 10:45:45 -07:00
Andrew Wang
43b0303008 HDFS-7032. Add WebHDFS support for reading and writing to encryption zones. Contributed by Charles Lamb. 2014-09-15 10:23:57 -07:00
Jing Zhao
2689b6ca72 HDFS-7062. Archival Storage: skip under construction block for migration. Contributed by Jing Zhao. 2014-09-15 10:16:56 -07:00
Andrew Wang
fc741b5d78 HDFS-7061. Add test to verify encryption zone creation after NameNode restart without saving namespace. Contributed by Stephen Chu. 2014-09-14 23:49:01 -07:00
Tsz-Wo Nicholas Sze
dba52ce0bb Merge branch 'trunk' into HDFS-6584 2014-09-13 14:56:48 +08:00
arp
9f22fb8c9a HDFS-6978. Directory scanner should correctly reconcile blocks on RAM disk. (Arpit Agarwal) 2014-09-12 22:13:18 -07:00
arp
7aeda47bd9 Merge branch 'trunk' into HDFS-6581 2014-09-12 11:45:11 -07:00
cnauroth
d6ce26986e HDFS-7051. TestDataNodeRollingUpgrade#isBlockFileInPrevious assumes Unix file path separator. Contributed by Chris Nauroth. 2014-09-11 20:58:15 -07:00
Jing Zhao
8de20a1987 Merge trunk into HDFS-6584 2014-09-11 13:04:35 -07:00
Jing Zhao
0d85f7e591 HDFS-7034. Archival Storage: Fix TestBlockPlacement and TestStorageMover. Contributed by Jing Zhao. 2014-09-11 13:00:43 -07:00
Andrew Wang
1e684995d7 HDFS-7045. Fix NameNode deadlock when opening file under /.reserved path. Contributed by Yi Liu. 2014-09-11 10:59:09 -07:00
Andrew Wang
bf64fce78c HDFS-6966. Add additional unit tests for encryption zones. Contributed by Stephen Chu. 2014-09-11 10:26:13 -07:00
Tsz-Wo Nicholas Sze
70dfe9cfab Merge branch 'trunk' into HDFS-6584 2014-09-11 15:23:38 +08:00
Jing Zhao
db41a1b7b9 Merge changes from trunk 2014-09-09 22:47:50 -07:00
Alejandro Abdelnur
bbff44cb03 HDFS-6776. Using distcp to copy data between insecure and secure cluster via webdhfs doesn't work. (yzhangal via tucu) 2014-09-09 22:16:42 -07:00
arp
0d2f6b4600 Merge branch 'trunk' into HDFS-6581 2014-09-09 18:07:18 -07:00
Konstantin V Shvachko
05af0ff4be Revert HDFS-6940. 2014-09-09 17:30:10 -07:00
cnauroth
2749fc677c Newly moved block replica been invalidated and deleted in TestBalancer. Contributed by Binglin Chang. 2014-09-09 11:32:54 -07:00
arp
61ccd50362 Merge branch 'trunk' into HDFS-6581 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeLayoutVersion.java
 2014-09-08 22:44:04 -07:00
arp
f949f6b548 HDFS-6981. Fix DN upgrade with layout version change. (Arpit Agarwal) 2014-09-08 21:20:55 -07:00
Andrew Wang
04915a0814 HDFS-6951. Correctly persist raw namespace xattrs to edit log and fsimage. Contributed by Charles Lamb. 2014-09-08 16:59:30 -07:00
Jing Zhao
6997c1c658 Merge remote-tracking branch 'origin/trunk' into HDFS-6584 2014-09-08 15:15:34 -07:00
arp
4ff128af12 Merge branch 'trunk' into HDFS-6581 2014-09-08 15:00:01 -07:00
Jing Zhao
867f0f141c HDFS-7029. Archival Storage: fix TestDFSInotifyEventInputStream and TestDistributedFileSystem. Contributed by Tsz Wo Nicholas Sze. 2014-09-08 14:57:27 -07:00
arp
a18caf7753 HDFS-6991. Notify NN of evicted block before deleting it from RAM disk. (Arpit Agarwal) 2014-09-08 14:29:30 -07:00
Jing Zhao
74a7e227c8 HDFS-7027. Archival Storage: Mover does not terminate when some storage type is out of space. Contributed by Tsz Wo Nicholas Sze. 2014-09-08 14:21:26 -07:00
Jing Zhao
2b5c528a73 HDFS-6875. Archival Storage: support migration for a list of specified paths. Contributed by Jing Zhao. 2014-09-08 14:10:00 -07:00
Colin Patrick Mccabe
cad14aa916 HDFS-6036. Forcibly timeout misbehaving DFSClients that try to do no-checksum reads that extend too long. (cmccabe) 2014-09-08 12:51:56 -07:00
Kihwal Lee
6a84f88c11 HDFS-7005. DFS input streams do not timeout. Contributed by Daryn Sharp. 2014-09-08 14:41:44 -05:00
arp
ccdf0054a3 HDFS-6977. Delete all copies when a block is deleted from the block space. (Arpit Agarwal) 2014-09-08 10:35:54 -07:00
Tsz-Wo Nicholas Sze
f1432e2424 Merge branch 'trunk' into HDFS-6584 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
 2014-09-08 10:54:48 +08:00
arp
eb8284d50e Merge trunk into HDFS-6581 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/FsVolumeSpi.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDirectoryScanner.java
 2014-09-07 14:46:46 -07:00
cnauroth
a23144fd8a HDFS Credential Provider related Unit Test Failure. Contributed by Xiaoyu Yao. 2014-09-07 08:39:20 -07:00
arp
d1fa58292e HDFS-6898. DN must reserve space for a full block when an RBW block is created. (Contributed by Arpit Agarwal) 2014-09-06 21:04:29 -07:00
Tsz-Wo Nicholas Sze
22a41dce4a HDFS-6997: add more tests for data migration and replicaion. 2014-09-07 07:44:28 +08:00
arp
31bbeaf383 Merge remote-tracking branch 'apache-commit/trunk' into HDFS-6581 2014-09-06 12:28:22 -07:00
Konstantin V Shvachko
88209ce181 HDFS-6940. Refactoring to allow ConsensusNode implementation. 
Contributed by Konstantin Shvachko.
 2014-09-06 12:07:52 -07:00
Alejandro Abdelnur
3b35f81603 HDFS-6986. DistributedFileSystem must get delegation tokens from configured KeyProvider. (zhz via tucu) 2014-09-05 22:33:48 -07:00
arp
339d21f273 Merge trunk into HDFS-6581 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNodeLayoutVersion.java
 2014-09-05 21:36:25 -07:00
arp
c5ef9c9e69 HDFS-6862. Add missing timeout annotations to tests. (Contributed by Xiaoyu Yao) 2014-09-05 13:50:42 -07:00
Jing Zhao
54767d3ff4 Fix TestOfflineEditsViewer after merging. 2014-09-05 12:05:22 -07:00
Jing Zhao
300cb12bef Merge trunk into HDFS-6584 2014-09-05 11:37:22 -07:00
arp
9609b7303a HDFS-6862. Add missing timeout annotations to tests. (Contributed by Xiaoyu Yao) 2014-09-05 11:10:58 -07:00
arp
9e941d9f99 HDFS-6831. Inconsistency between 'hdfs dfsadmin' and 'hdfs dfsadmin -help'. (Contributed by Xiaoyu Yao) 2014-09-05 10:45:54 -07:00
Jing Zhao
c6107f566f HDFS-6376. Distcp data between two HA clusters requires another configuration. Contributed by Dave Marion and Haohui Mai. 2014-09-05 10:40:02 -07:00
Vinayakumar B
772d1fb01e HDFS-6714. TestBlocksScheduledCounter#testBlocksScheduledCounter should shutdown cluster (vinayakumarb) 2014-09-05 10:25:09 +05:30
Jing Zhao
185200e709 HDFS-6876. Archival Storage: support set/get storage policy in DFSAdmin. Contributed by Jing Zhao. 2014-09-04 20:14:46 -07:00
Jing Zhao
6104520369 HDFS-6886. Use single editlog record for creating file + overwrite. Contributed by Yi Liu. 2014-09-04 18:54:38 -07:00
Jing Zhao
f7df24bb1b HDFS-6996. SnapshotDiff report can hit IndexOutOfBoundsException when there are nested renamed directory/file. Contributed by Jing Zhao. 2014-09-04 16:12:44 -07:00
Jing Zhao
e08701ec71 HDFS-6961. Archival Storage: BlockPlacementPolicy#chooseTarget should check each valid storage type in each choosing round. 2014-09-04 14:19:32 -07:00
Colin Patrick Mccabe
f4caedfcbf HDFS-6959 Make the HDFS home directory location customizable. Contributed by Yongjun Zhang 2014-09-03 19:30:30 -07:00
Jing Zhao
45d5b13256 Merge changes from trunk 2014-09-03 15:36:47 -07:00
arp
08a8f2be81 Merge trunk into HDFS-6581 2014-09-03 10:53:37 -07:00
arp
762b04e994 HDFS-6950. Add Additional unit tests for HDFS-6581. (Contributed by Xiaoyu Yao) 2014-09-03 10:51:26 -07:00
Uma Maheswara Rao G
3425ae5d7e HDFS-2975. Rename with overwrite flag true can make NameNode to stuck in safemode on NN (crash + restart). (Yi Liu via umamahesh) 2014-09-03 18:53:51 +05:30
arp
a6b32a3e78 Merge trunk into HDFS-6581 2014-09-02 16:25:32 -07:00
Haohui Mai
08a9ac7098 HDFS-6942. Fix typos in log messages. Contributed by Ray Chiang. 2014-09-02 16:22:18 -07:00
Colin Patrick Mccabe
727331becc HDFS-4257. The ReplaceDatanodeOnFailure policies could have a forgiving option. Contributed by szetszwo. 2014-09-02 15:14:33 -07:00
Andrew Wang
faa4455be5 HDFS-6634. inotify in HDFS. Contributed by James Thomas. 2014-09-02 14:02:29 -07:00
Jing Zhao
3e2a0b5446 HDFS-6969. Archival Storage: INode#getStoragePolicyID should always return the latest storage policy. Contributed by Jing Zhao. 2014-09-01 17:56:04 -07:00
arp
217dea7794 Merge remote-tracking branch 'apache-commit/trunk' into HDFS-6581 2014-09-01 11:52:59 -07:00
Andrew Wang
6066b1a455 HDFS-6972. TestRefreshUserMappings.testRefreshSuperUserGroupsConfiguration doesn't decode url correctly. Contributed by Yongjun Zhang. 2014-08-29 15:47:01 -07:00
arp
f65183eba3 Merge remote-tracking branch 'apache-commit/trunk' into HDFS-6581 
Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
 2014-08-29 13:37:17 -07:00
Aaron T. Myers
7eab2a29a5 HDFS-6774. Make FsDataset and DataStore support removing volumes. Contributed by Lei Xu. 2014-08-29 13:00:17 -07:00