arp
7f0422be76
Merge branch 'trunk' into HDFS-6581
2014-09-29 16:29:43 -07:00
Andrew Wang
7f0efe96f8
HDFS-7124. Remove EncryptionZoneManager.NULL_EZ. (clamb via wang)
2014-09-29 14:14:22 -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
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
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
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
889122bd55
Merge branch 'trunk' into HDFS-6581
2014-09-22 18:00:58 -07:00
Andrew Wang
1737950d0f
HDFS-6987. Move CipherSuite xattr information up to the encryption zone root. Contributed by Zhe Zhang.
2014-09-21 21:29:46 -07: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
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
33ce887c20
HDFS-6851. Refactor EncryptionZoneWithId and EncryptionZone. (clamb via wang)
2014-09-16 16:41:09 -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
Jing Zhao
db41a1b7b9
Merge changes from trunk
2014-09-09 22:47:50 -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
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
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
Jing Zhao
300cb12bef
Merge trunk into HDFS-6584
2014-09-05 11:37:22 -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
45d5b13256
Merge changes from trunk
2014-09-03 15:36:47 -07:00
arp
a6b32a3e78
Merge trunk into HDFS-6581
2014-09-02 16:25:32 -07:00
Andrew Wang
faa4455be5
HDFS-6634. inotify in HDFS. Contributed by James Thomas.
2014-09-02 14:02:29 -07:00
arp
c2354a7f81
HDFS-6923. Propagate LazyPersist flag to DNs via DataTransferProtocol. (Arpit Agarwal)
2014-08-27 21:47:18 -07:00
arp
042b33f20b
HDFS-6922. Add LazyPersist flag to INodeFile, save it in FsImage and edit logs. (Arpit Agarwal)
2014-08-27 21:47:18 -07:00
arp
7f49537ba1
HDFS-6924. Add new RAM_DISK storage type. (Arpit Agarwal)
2014-08-27 21:47:18 -07:00
arp
a7bcc95358
HDFS-6921. Add LazyPersist flag to FileStatus. (Arpit Agarwal)
2014-08-27 21:47:18 -07:00
Tsz-wo Sze
c92d869d02
Merge r1609845 through r1619277 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1619293 13f79535-47bb-0310-9956-ffa450edef68
2014-08-21 05:22:10 +00:00
Andrew Wang
0cc08f6da4
Merge from trunk to branch.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1618700 13f79535-47bb-0310-9956-ffa450edef68
2014-08-18 18:41:31 +00:00
Tsz-wo Sze
cb75b6b07d
Merge r1609845 through r1618416 from trunk.
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1618417 13f79535-47bb-0310-9956-ffa450edef68
2014-08-16 21:02:21 +00:00
Tsz-wo Sze
9b250d74f0
HDFS-6847. Support storage policy on directories and include storage policy in HdfsFileStatus. Contributed by Jing Zhao
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1618416 13f79535-47bb-0310-9956-ffa450edef68
2014-08-16 20:58:20 +00:00
Charles Lamb
20dcb841ce
HDFS-6546. Add non-superuser capability to get the encryption zone for a specific path. (clamb)
...
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1618022 13f79535-47bb-0310-9956-ffa450edef68
2014-08-14 19:11:06 +00:00
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