Merge branch 'trunk' into HDFS-6581
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/dde2ed13 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/dde2ed13 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/dde2ed13 Branch: refs/heads/trunk Commit: dde2ed13c24e8906ee135719342acf9faea59ade Parents: 5e8b697 a469833 Author: arp <a...@apache.org> Authored: Tue Sep 30 18:05:54 2014 -0700 Committer: arp <a...@apache.org> Committed: Tue Sep 30 18:05:54 2014 -0700 ---------------------------------------------------------------------- BUILDING.txt | 2 +- hadoop-common-project/hadoop-common/CHANGES.txt | 26 ++++ .../crypto/key/kms/KMSClientProvider.java | 10 +- .../apache/hadoop/fs/DelegateToFileSystem.java | 5 + .../java/org/apache/hadoop/security/User.java | 3 +- .../hadoop/security/UserGroupInformation.java | 18 ++- .../apache/hadoop/ipc/TestFairCallQueue.java | 23 ++- .../security/TestUserGroupInformation.java | 3 +- .../hadoop/crypto/key/kms/server/MiniKMS.java | 19 ++- .../hadoop/crypto/key/kms/server/TestKMS.java | 118 +++++++++++++-- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 22 ++- .../apache/hadoop/hdfs/server/mover/Mover.java | 22 +-- .../hdfs/server/mover/TestStorageMover.java | 40 ++++- hadoop-mapreduce-project/CHANGES.txt | 12 ++ hadoop-yarn-project/CHANGES.txt | 26 ++++ .../records/impl/pb/ContainerStatusPBImpl.java | 22 +-- .../hadoop/yarn/webapp/hamlet/Hamlet.java | 10 +- .../hadoop/yarn/webapp/hamlet/TestHamlet.java | 4 +- .../hadoop/yarn/webapp/view/TestInfoBlock.java | 15 +- ...pplicationHistoryManagerOnTimelineStore.java | 4 +- ...pplicationHistoryManagerOnTimelineStore.java | 110 ++++++++------ .../metrics/SystemMetricsPublisher.java | 2 +- .../server/resourcemanager/rmapp/RMAppImpl.java | 61 ++++---- .../metrics/TestSystemMetricsPublisher.java | 146 ++++++++++--------- 24 files changed, 496 insertions(+), 227 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/dde2ed13/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/mover/Mover.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/dde2ed13/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/mover/TestStorageMover.java ---------------------------------------------------------------------- diff --cc hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/mover/TestStorageMover.java index d982824,a6edd80..0f8a9f6 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/mover/TestStorageMover.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/mover/TestStorageMover.java @@@ -32,10 -30,8 +30,9 @@@ import org.apache.commons.logging.Log import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.impl.Log4JLogger; import org.apache.hadoop.conf.Configuration; - import org.apache.hadoop.conf.ReconfigurationException; import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.FSDataOutputStream; +import org.apache.hadoop.fs.FileUtil; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hdfs.protocol.BlockStoragePolicy; import org.apache.hadoop.hdfs.DFSConfigKeys;