big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,835 Commits 2 Branches 2 Tags 264 MiB
dd9ebf6eed
Commit Graph

336 Commits

Author SHA1 Message Date
Vinayakumar B
195961a7c1 HDFS-6247. Avoid timeouts for replaceBlock() call by sending intermediate responses to Balancer (vinayakumarb) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617799 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-13 18:43:05 +00:00
Vinayakumar B
6554994fab Reverted 
Merged revision(s) 1617784 from hadoop/common/trunk:
HDFS-6847. Avoid timeouts for replaceBlock() call by sending intermediate responses to Balancer (Contributed by Vinayakumar B.)
........


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617794 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-13 18:36:51 +00:00
Vinayakumar B
471b1368e2 HDFS-6847. Avoid timeouts for replaceBlock() call by sending intermediate responses to Balancer (Contributed by Vinayakumar B.) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1617784 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-13 18:06:33 +00:00
Jing Zhao
37207b75d4 HDFS-6835. Archival Storage: Add a new API to set storage policy. Contributed by Jing Zhao. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1617568 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-12 19:32:09 +00:00
Andrew Wang
ac73d416f3 Merge from trunk to branch 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1615844 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-05 02:30:54 +00:00
Andrew Wang
70c99278a9 HDFS-6780. Batch the encryption zones listing API. (wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1615189 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-01 18:47:01 +00:00
Tsz-wo Sze
dc7744d2e5 Merge r1609845 through r1615019 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1615020 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-01 01:29:49 +00:00
Tsz-wo Sze
b8597e6a10 HDFS-6685. Balancer should preserve storage type of replicas. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1615015 13f79535-47bb-0310-9956-ffa450edef68
 2014-08-01 01:05:33 +00:00
Chris Nauroth
535fe14ded HDFS-6570. add api that enables checking if a user has certain permissions on a file. Contributed by Jitendra Pandey. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1614723 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-30 17:49:09 +00:00
Andrew Wang
c3fa0b5884 Merge from trunk to branch 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1614553 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-30 06:09:33 +00:00
Charles Lamb
9ca2f34c8f HDFS-6730. Create a .RAW extended attribute namespace. (clamb) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1614535 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-30 01:35:04 +00:00
Tsz-wo Sze
10d6210322 Merge r1609845 through r1614231 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1614234 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-29 00:49:14 +00:00
Tsz-wo Sze
4f9ffc7455 HDFS-6739. Add getDatanodeStorageReport to ClientProtocol. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1614215 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-28 23:43:39 +00:00
Andrew Wang
552b4fb9f9 Merge from trunk to branch 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1612928 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-23 19:26:29 +00:00
Andrew Wang
69b75fca7a HDFS-6720. Remove KeyProvider in EncryptionZoneManager. (wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1612632 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-22 17:57:06 +00:00
Tsz-wo Sze
ee13f8bf3e Merge r1609845 through r1612502 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1612505 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-22 08:23:34 +00:00
Tsz-wo Sze
25b0e8471e HDFS-6702. Change DFSClient to pass the StorageType from the namenode to datanodes and change datanode to write block replicas using the specified storage type. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1612493 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-22 07:41:24 +00:00
Tsz-wo Sze
4f1fae88f8 HDFS-6670. Add block storage policy support with default HOT, WARM and COLD policies. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1610529 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-14 21:11:22 +00:00
Tsz-wo Sze
6f41baa623 HDFS-6677. Change INodeFile and FSImage to support storage policy ID. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1610525 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-14 20:57:15 +00:00
Andrew Wang
d79f27b429 HDFS-6474. Namenode needs to get the actual keys and iv from the KeyProvider. (wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1609833 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-11 20:54:47 +00:00
Andrew Wang
dda85637df Merge trunk to branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1608603 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-07 20:43:56 +00:00
Charles Lamb
2a3bccddd9 HDFS-6625. Remove the Delete Encryption Zone function (clamb) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1607507 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-03 00:58:45 +00:00
Andrew Wang
51b97a1396 HDFS-6605.Client server negotiation of cipher suite. (wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1607499 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-02 23:08:29 +00:00
Andrew Wang
2efea95213 HDFS-6391. Get the Key/IV from the NameNode for encrypted files in DFSClient. Contributed by Charles Lamb and Andrew Wang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1606220 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-27 20:43:41 +00:00
Jing Zhao
8a83bb7ad6 HDFS-4667. Capture renamed files/directories in snapshot diff report. Contributed by Jing Zhao and Binglin Chang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1604488 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-21 22:59:34 +00:00
Andrew Wang
97583dbb0a Merge from trunk to branch 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1603993 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-19 18:32:13 +00:00
Andrew Wang
d417e49ce4 HDFS-6492. Support create-time xattrs and atomically setting multiple xattrs. (wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1603971 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-19 17:37:31 +00:00
Charles Lamb
c5b7236d9c merge from trunk r1602933 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1602947 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-16 18:13:57 +00:00
Charles Lamb
3f892e9d53 HDFS-6473. Protocol and API for Encryption Zones (clamb) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1600803 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-06 01:42:18 +00:00
Charles Lamb
bdee397e95 HADOOP-6392. Wire crypto streams for encrypted files in DFSClient. (clamb and yliu) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1600582 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-05 10:10:48 +00:00
Andrew Wang
880a0c673c HDFS-6375. Listing extended attributes with the search permission. Contributed by Charles Lamb. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1598788 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-31 00:12:02 +00:00
Uma Maheswara Rao G
ac23a55547 Merge HDFS-2006 HDFS XAttrs branch to Trunk 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1596575 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-21 13:57:33 +00:00
Colin McCabe
f131dba8a3 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/trunk@1593634 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-09 22:36:04 +00:00
Andrew Wang
9445859930 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/trunk@1592438 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-05 03:38:29 +00:00
Colin McCabe
9a0dec60ff HDFS-4909. Avoid protocol buffer RPC namespace clashes (cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1588091 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-16 22:58:40 +00:00
Jing Zhao
9dab514b22 HDFS-6038. Allow JournalNode to handle editlog produced by new release with future layoutversion. Contributed by Jing Zhao. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1579813 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-20 23:06:06 +00:00
Arpit Agarwal
809e8bf5b7 HDFS-6094. The same block can be counted twice towards safe mode threshold. (Arpit Agarwal) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1578478 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-17 17:37:55 +00:00
Andrew Wang
d37c31a2db 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/trunk@1577426 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-14 04:52:03 +00:00
Tsz-wo Sze
9ad8dd1e8a Merge r1569890 through r1573813 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1573821 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-03 23:51:58 +00:00
Colin McCabe
dd049a2f60 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/trunk@1573433 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-03 03:58:37 +00:00
Tsz-wo Sze
58bccdbc04 Merge r1569890 through r1572417 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1572418 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-27 03:11:07 +00:00
Andrew Wang
c080fec82b HDFS-3969. Small bug fixes and improvements for disk locations API. Contributed by Todd Lipcon and Andrew Wang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1572284 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-26 21:55:47 +00:00
Kihwal Lee
1c6b5d2b58 HDFS-5583. Make DN send an OOB Ack on shutdown before restarting. Contributed by Kihwal Lee. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1571491 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-24 23:38:04 +00:00
Arpit Agarwal
c066cef587 HDFS-6004. Change DFSAdmin for rolling upgrade commands. (Contributed by szetszwo) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1571463 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-24 22:05:07 +00:00
Tsz-wo Sze
37afb4d683 Merge r1569890 through r1570391 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1570392 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-20 23:47:58 +00:00
Kihwal Lee
b23f6cc1f2 HDFS-5962. Mtime and atime are not persisted for symbolic links. Contributed by Akira Ajisaka. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1570252 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-20 16:09:20 +00:00
Tsz-wo Sze
55aec006f4 Merge r1569890 through r1570083 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1570084 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-20 04:38:30 +00:00
Arpit Agarwal
2f341414dd HDFS-5318. Support read-only and read-write paths to shared replicas. (Contributed by Eric Sirianni) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1569951 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-19 22:59:37 +00:00
Tsz-wo Sze
72c214c89b Merge r1555021 through r1569889 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1569890 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-19 19:57:36 +00:00
Tsz-wo Sze
bc962d6df4 HDFS-5945. Add rolling upgrade information to fsimage; and disallow upgrade and rolling upgrade to be started simultaneously. Contributed by szetszwo & jing9 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1569515 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-18 20:12:17 +00:00
Jing Zhao
470d4253b2 HDFS-5920. Support rollback of rolling upgrade in NameNode and JournalNodes. Contributed by Jing Zhao. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1568563 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-15 00:28:21 +00:00
Kihwal Lee
1a68f13521 HDFS-5585. Provide admin commands for data node upgrade. Contributed by Kihwal Lee. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1568523 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-14 21:20:02 +00:00
Jing Zhao
ba4b10354c Merging r1566359 through r1568420 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1568437 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-14 18:32:37 +00:00
Chris Nauroth
a49dee06fb Merge trunk to HDFS-4685. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1567994 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-13 18:21:46 +00:00
Jing Zhao
2624b20291 HDFS-5847. Consolidate INodeReference into a separate section. Contributed by Jing Zhao. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1567812 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-13 00:00:42 +00:00
Chris Nauroth
ea0b21af15 HDFS-5933. Optimize the FSImage layout for ACLs. Contributed by Haohui Mai. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1567785 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-12 22:56:32 +00:00
Chris Nauroth
d03acc7560 HDFS-5914. Incorporate ACLs with the changes from HDFS-5698. Contributed by Haohui Mai. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1566991 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-11 06:25:13 +00:00
Haohui Mai
2ed075e1bb Merging r1566042 through r1566364 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1566375 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-09 19:45:00 +00:00
Jing Zhao
a2edb11b68 HDFS-5698. Use protobuf to serialize / deserialize FSImage. Contributed by Haohui Mai. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1566359 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-09 19:18:51 +00:00
Tsz-wo Sze
c780454413 HDFS-5869. When starting rolling upgrade or NN restarts, NN should create a checkpoint right before the upgrade marker. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1565516 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-07 02:08:05 +00:00
Tsz-wo Sze
4f92eb2f61 HDFS-5848. Add rolling upgrade status to heartbeat response. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1563384 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-01 08:58:55 +00:00
Chris Nauroth
ad240d6b3a Merge trunk to HDFS-4685. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1561771 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-27 18:09:22 +00:00
Tsz-wo Sze
a9110e1788 Merge r1555021 through r1561510 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1561516 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-26 16:34:30 +00:00
Todd Lipcon
edb6dc5f30 HDFS-5138. Support HDFS upgrade in HA. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1561381 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-25 20:01:26 +00:00
Tsz-wo Sze
5fe73a986e HDFS-5752. Add a new DFSAdmin command to query, start and finalize rolling upgrade. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-5535@1558299 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-15 05:56:17 +00:00
Chris Nauroth
21d4167179 HDFS-5739. ACL RPC must allow null name or unspecified permissions in ACL entries. Contributed by Chris Nauroth. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1556663 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-08 22:47:57 +00:00
Chris Nauroth
2fbb3d694e Merge trunk to HDFS-4685. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1556097 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-07 01:07:33 +00:00
Arpit Agarwal
f8a9329f2b HDFS-5667. Include DatanodeStorage in StorageReport. (Arpit Agarwal) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1555929 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-06 17:28:23 +00:00
Chris Nauroth
eaa5321619 Merge trunk to HDFS-4685. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1553226 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-23 22:19:12 +00:00
Chris Nauroth
c3b56ed1c8 HDFS-5619. NameNode: record ACL modifications to edit log. Contributed by Haohui Mai. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1553224 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-23 22:12:45 +00:00
Chris Nauroth
25e9d2e895 HDFS-5618. NameNode: persist ACLs in fsimage. Contributed by Haohui Mai. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1553221 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-23 21:45:03 +00:00
Colin McCabe
b9ae3087c0 HDFS-5636. Enforce a max TTL per cache pool (awang via cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1552841 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-20 23:27:20 +00:00
Chris Nauroth
72b0b1881f Merge trunk to HDFS-4685. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1552467 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-20 01:01:18 +00:00
Colin McCabe
991c453ca3 HDFS-5431. Support cachepool-based limit management in path-based caching. (awang via cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1551651 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-17 18:47:04 +00:00
Chris Nauroth
f24e0c1563 Merge trunk to HDFS-4685. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1550774 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-13 17:28:14 +00:00
Chris Nauroth
9263f3bb14 HDFS-5596. Implement RPC stubs. Contributed by Haohui Mai. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4685@1550544 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-12 21:47:46 +00:00
Arpit Agarwal
cd083aa807 Merging r1549949 through r1550312 from trunk to branch HDFS-2832 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1550313 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-11 23:18:29 +00:00
Aaron Myers
512a18a8d9 HDFS-5074. Allow starting up from an fsimage checkpoint in the middle of a segment. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1550016 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-11 01:32:22 +00:00
Arpit Agarwal
f3cef1c673 Merging r1549626 through r1549948 from trunk to branch HDFS-2832 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1549949 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-10 19:50:02 +00:00
Jing Zhao
87a6db45b7 HDFS-5629. Support HTTPS in JournalNode and SecondaryNameNode. Contributed by Haohui Mai. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1549692 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-09 21:58:47 +00:00
Arpit Agarwal
00718c2ffa Merging r1547658 through r1548328 from trunk to branch HDFS-2832 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1548329 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-05 23:41:09 +00:00
Andrew Wang
55e5b0653c HDFS-5630. Hook up cache directive and pool usage statistics. (wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1548309 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-05 21:09:30 +00:00
Arpit Agarwal
18159be495 Merging r1544666 through r1547120 from trunk to branch HDFS-2832 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1547122 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-02 17:41:44 +00:00
Andrew Wang
9da451cac5 HDFS-5430. Support TTL on CacheDirectives. Contributed by Andrew Wang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1546301 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-28 07:20:21 +00:00
Colin McCabe
13edb391d0 HDFS-5556. Add some more NameNode cache statistics, cache pool stats (cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1546143 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-27 17:55:52 +00:00
Arpit Agarwal
97acde2d33 HDFS-5542. Fix TODO and clean up the code in HDFS-2832. (Contributed by szetszwo) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1544664 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-22 20:07:10 +00:00
Arpit Agarwal
16f7fb80d9 Merging r1543902 through r1544303 from trunk to branch HDFS-2832 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1544306 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-21 20:06:09 +00:00
Colin McCabe
f91a45a96c HDFS-5473. Consistent naming of user-visible caching classes and methods (cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1544252 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-21 17:12:58 +00:00
Andrew Wang
916ab9286b HDFS-5451. Add byte and file statistics to PathBasedCacheEntry. Contributed by Colin Patrick McCabe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1543958 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-20 21:31:41 +00:00
Tsz-wo Sze
ba98e8f737 merge r1535792 through r1541341 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1541342 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-13 01:14:37 +00:00
Colin McCabe
ce35e0950c HDFS-5471. CacheAdmin -listPools fails when user lacks permissions to view all pools (Andrew Wang via Colin Patrick McCabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1541323 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-12 23:52:23 +00:00
Arpit Agarwal
ec5eebc450 Merging r1540548 through r1540909 from trunk to branch HDFS-2832 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1540910 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-12 01:16:10 +00:00
Andrew Wang
9673baa7e8 HDFS-5320. Add datanode caching metrics. Contributed by Andrew Wang. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1540796 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-11 18:30:07 +00:00
Arpit Agarwal
907fb15ee8 HDFS-5480. Update Balancer for HDFS-2832. (Contributed by szetszwo) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1540547 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-10 20:59:32 +00:00
Arpit Agarwal
6b0611ed24 Merging r1539737 through r1539896 from trunk to branch HDFS-2832 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1539898 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-08 01:44:24 +00:00
Colin McCabe
f79b3e6b17 HDFS-5326. add modifyDirective to cacheAdmin (cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1539839 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-07 22:07:16 +00:00
Arpit Agarwal
c2495a7bff Merging r1536572 from trunk to branch HDFS-2832 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1536889 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-29 21:04:31 +00:00
Colin McCabe
f9c08d02eb HDFS-5378. In CacheReport, don't send genstamp and length on the wire (Contributed by Colin Patrick McCabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1534334 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-21 19:29:46 +00:00
Andrew Wang
34f08944b7 merge trunk to branch HDFS-4949 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1532952 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-17 02:14:33 +00:00
Arpit Agarwal
168b133337 Merging r1527684 through r1532876 from trunk to branch HDFS-2832 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1532910 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-16 21:07:28 +00:00
Andrew Wang
efe545b0c2 HDFS-5358. Add replication field to PathBasedCacheDirective. (Contributed by Colin Patrick McCabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1532124 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-14 22:56:11 +00:00
Colin McCabe
15d08c4778 HDFS-5349. DNA_CACHE and DNA_UNCACHE should be by blockId only (cmccabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1532116 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-14 22:19:10 +00:00
Andrew Wang
3fc8792b5c HDFS-5304. Expose if a block replica is cached in getFileBlockLocations. (Contributed by Andrew Wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1530802 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-09 21:30:08 +00:00
Brandon Li
8e08046661 HDFS-5306. Datanode https port is not available at the namenode. Contributed by Suresh Srinivas. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1529562 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-06 03:22:57 +00:00
Andrew Wang
a0d9a155a4 HDFS-5236. Change PathBasedCacheDirective APIs to be a single value rather than batch. (Contributed by Andrew Wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1525183 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-21 00:20:36 +00:00
Arpit Agarwal
eb9f1b6707 HDFS-5232. Protocol changes to transmit StorageUuid. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1525153 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-20 22:06:09 +00:00
Andrew Wang
aae86e4f3f merge changes from trunk to HDFS-4949 branch 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1524865 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-19 23:42:10 +00:00
Andrew Wang
e202d4d154 HDFS-5213. Separate PathBasedCacheEntry and PathBasedCacheDirectiveWithId. Contributed by Colin Patrick McCabe. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1524561 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-18 20:43:40 +00:00
Tsz-wo Sze
abf09f090f HDFS-4990. Change BlockPlacementPolicy to choose storages instead of datanodes. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1524444 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-18 15:12:52 +00:00
Colin McCabe
02e0e158a2 HDFS-5158. Add command-line support for manipulating cache directives 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1522272 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-12 03:55:10 +00:00
Colin McCabe
f41f8b8842 HDFS-5163. Miscellaneous cache pool RPC fixes (Contributed by Colin Patrick McCabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1520665 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-06 18:52:50 +00:00
Colin McCabe
d56d0b46e1 commit correct version of HDFS-5121 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1520090 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-04 18:23:51 +00:00
Colin McCabe
97b7267977 HDFS-5121. Add RPCs for creating and manipulating cache pools. (Contributed by Colin Patrick McCabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1519841 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-03 20:38:45 +00:00
Tsz-wo Sze
3f070e83b1 HDFS-5009. Include storage information in the LocatedBlock. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1519691 13f79535-47bb-0310-9956-ffa450edef68
 2013-09-03 14:03:35 +00:00
Andrew Wang
fc14a92c6b HDFS-5141. Add cache status information to datanode heartbeat. (Contributed by Andrew Wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1519101 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-30 22:15:51 +00:00
Colin McCabe
b992219fa1 HDFS-5050. Add DataNode support for mlock and munlock (contributed by Andrew Wang) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1517106 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-24 03:41:25 +00:00
Colin McCabe
920b4cc06f HDFS-5052. Add cacheRequest/uncacheRequest support to NameNode. (Contributed by Colin Patrick McCabe.) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1516669 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-22 23:37:51 +00:00
Arpit Agarwal
5e27288c1e HDFS-4985. Add storage type to the protocol and expose it in block report and block locations 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2832@1516323 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-21 23:07:29 +00:00
Jing Zhao
8172215e56 HDFS-5080. BootstrapStandby not working with QJM when the existing NN is active. Contributed by Jing Zhao. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1514386 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-15 17:19:52 +00:00
Konstantin Shvachko
4c8db60092 HDFS-5079. Cleaning up NNHAStatusHeartbeat.State from DatanodeProtocolProtos. Contributed by Tao Luo. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1514118 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-15 01:29:16 +00:00
Colin McCabe
52ccc6c6d5 HDFS-5051. Propagate cache status information from the DataNode to the NameNode (Andrew Wang via Colin Patrick McCabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-4949@1513653 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-13 21:05:09 +00:00
Brandon Li
4f68aa0600 HDFS-5043. For HdfsFileStatus, set default value of childrenNum to -1 instead of 0 to avoid confusing applications. Contributed by Brandon Li 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1508694 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-31 00:49:47 +00:00
Colin McCabe
c1314eb2a3 HDFS-4817. Make HDFS advisory caching configurable on a per-file basis. (Colin Patrick McCabe) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1505753 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-22 18:15:18 +00:00
Jason Darrell Lowe
febc5040b9 HADOOP-9734. Common protobuf definitions for GetUserMappingsProtocol, RefreshAuthorizationPolicyProtocol and RefreshUserMappingsProtocol. Contributed by Jason Lowe 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1503954 13f79535-47bb-0310-9956-ffa450edef68
 2013-07-17 00:06:48 +00:00
Sanjay Radia
6cb5ad16d0 HADOOP-9619 Mark stability of .proto files (sanjay Radia) 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1495564 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-21 19:53:21 +00:00
Konstantin Shvachko
92cbba386f HDFS-4883. complete() should verify fileId. Contributed by Tao Luo. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1495302 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-21 07:28:38 +00:00
Brandon Li
6ecf78a99b HDFS-4772. Add number of children in HdfsFileStatus. Contributed by Brandon Li 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1495253 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-21 00:32:23 +00:00
Chris Nauroth
5694c34040 HDFS-4866. Protocol buffer support cannot compile under C. Contributed by Arpit Agarwal. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1493300 13f79535-47bb-0310-9956-ffa450edef68
 2013-06-15 03:52:40 +00:00
Aaron Myers
8c62c46046 HDFS-4298. StorageRetentionManager spews warnings when used with QJM. Contributed by Aaron T. Myers. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1485371 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-22 19:37:41 +00:00
Tsz-wo Sze
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
Devaraj Das
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
Tsz-wo Sze
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
Tsz-wo Sze
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
Aaron Myers
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
Tsz-wo Sze
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
Uma Maheswara Rao G
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
Aaron Myers
f61581501a Merge trunk into HDFS-347 branch. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1446832 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-16 01:12:07 +00:00
Tsz-wo Sze
d9e2514d21 HDFS-4487. Fix snapshot diff report for HDFS-4446. Contributed by Jing Zhao 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1446385 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-14 23:07:49 +00:00
Tsz-wo Sze
fa8bafbd46 Merge r1441206 through r1444434 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1444439 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-09 21:29:44 +00:00
Suresh Srinivas
4525c4a25b HDFS-4340. Update addBlock() to inculde inode id as additional argument. Contributed Brandon Li. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1443169 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-06 19:52:34 +00:00
Suresh Srinivas
24d96cbcdb HDFS-4414. Add support for getting snapshot diff from DistributedFileSystem. Contributed by Jing Zhao. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1441808 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-02 20:39:01 +00:00
Tsz-wo Sze
74d1e5c302 Merge r1432789 through r1437840 from trunk. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-2802@1437843 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-24 02:45:45 +00:00
Todd Lipcon
797465820b Merge trunk into branch 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1437623 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-23 18:51:24 +00:00
Todd Lipcon
cfae13306a HDFS-4403. DFSClient can infer checksum type when not provided by reading first byte. Contributed by Todd Lipcon. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1436730 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-22 02:59:25 +00:00
Suresh Srinivas
8f70a25b1c HDFS-4393. Make empty request and responses in protocol translators can be static final members. Contributed by Brandon Li. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1434844 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-17 18:21:29 +00:00
Todd Lipcon
2f4e2c607e Merge trunk into branch 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1433249 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-15 00:42:06 +00:00
Suresh Srinivas
8767a37b9b HDFS-4375. Use token request messages defined in hadoop common. Contributed by Suresh Srinivas. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1433235 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-15 00:26:23 +00:00
Suresh Srinivas
6dbc7e03e5 HDFS-4369. GetBlockKeysResponseProto does not handle null response. Contributed by Suresh Srinivas. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1433206 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-14 23:13:27 +00:00
Suresh Srinivas
0671176111 HDFS-4364. GetLinkTargetResponseProto does not handle null path. Contributed by Suresh Srinivas. 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1433194 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-14 23:01:39 +00:00
Todd Lipcon
12bf674e8e Merge trunk into branch. 
Fixed a couple trivial conflicts due to HDFS-4363, which moved some methods
from HdfsProtoUtil to PBHelper


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-347@1433133 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-14 21:12:16 +00:00