hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject [7/7] git commit: Merge branch 'trunk' into HDFS-6581
Date Fri, 26 Sep 2014 03:29:12 GMT
Merge branch 'trunk' into HDFS-6581

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/032e0eba
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/032e0eba
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/032e0eba

Branch: refs/heads/HDFS-6581
Commit: 032e0eba6b5acda3e33f4b99b48845eedb5ed149
Parents: 5a5a7da e96ce6f
Author: arp <arp@apache.org>
Authored: Thu Sep 25 19:50:28 2014 -0700
Committer: arp <arp@apache.org>
Committed: Thu Sep 25 19:50:28 2014 -0700

----------------------------------------------------------------------
 .../apache/hadoop/conf/ReconfigurableBase.java  | 140 +++++++++++++++++
 .../hadoop/conf/ReconfigurationTaskStatus.java  |  70 +++++++++
 .../apache/hadoop/conf/ReconfigurationUtil.java |   5 +
 .../org/apache/hadoop/crypto/CryptoCodec.java   |   7 +-
 .../hadoop/crypto/CryptoProtocolVersion.java    |  90 +++++++++++
 .../apache/hadoop/fs/FileEncryptionInfo.java    |  16 +-
 .../apache/hadoop/conf/TestReconfiguration.java | 157 ++++++++++++++++++-
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt     |  11 ++
 .../java/org/apache/hadoop/hdfs/DFSClient.java  |  89 +++++++----
 .../org/apache/hadoop/hdfs/DFSOutputStream.java |  14 +-
 .../hdfs/UnknownCipherSuiteException.java       |  11 +-
 .../UnknownCryptoProtocolVersionException.java  |  38 +++++
 .../hdfs/protocol/ClientDatanodeProtocol.java   |  12 ++
 .../hadoop/hdfs/protocol/ClientProtocol.java    |   5 +-
 .../hadoop/hdfs/protocol/EncryptionZone.java    |  20 ++-
 ...tDatanodeProtocolServerSideTranslatorPB.java |  61 ++++++-
 .../ClientDatanodeProtocolTranslatorPB.java     |  55 ++++++-
 ...tNamenodeProtocolServerSideTranslatorPB.java |   5 +-
 .../ClientNamenodeProtocolTranslatorPB.java     |   7 +-
 .../apache/hadoop/hdfs/protocolPB/PBHelper.java |  88 +++++++----
 .../hadoop/hdfs/qjournal/server/Journal.java    |  23 ++-
 .../hdfs/qjournal/server/JournalNode.java       |   6 +-
 .../hadoop/hdfs/server/datanode/DataNode.java   |  46 +++++-
 .../server/namenode/EncryptionZoneManager.java  |  31 ++--
 .../hdfs/server/namenode/FSDirectory.java       |  15 +-
 .../hdfs/server/namenode/FSNamesystem.java      | 101 ++++++------
 .../hdfs/server/namenode/NameNodeRpcServer.java |   6 +-
 .../org/apache/hadoop/hdfs/tools/DFSAdmin.java  |  95 ++++++++++-
 .../hdfs/util/AtomicFileOutputStream.java       |  14 +-
 .../src/main/proto/ClientDatanodeProtocol.proto |  30 ++++
 .../src/main/proto/ClientNamenodeProtocol.proto |   2 +-
 .../hadoop-hdfs/src/main/proto/encryption.proto |   5 +-
 .../hadoop-hdfs/src/main/proto/hdfs.proto       |  26 ++-
 .../hadoop/hdfs/TestDFSClientRetries.java       |   3 +-
 .../apache/hadoop/hdfs/TestEncryptionZones.java | 118 +++++++++++---
 .../java/org/apache/hadoop/hdfs/TestLease.java  |   3 +-
 .../namenode/ha/TestDFSUpgradeWithHA.java       |  50 +++++-
 .../namenode/ha/TestRetryCacheWithHA.java       |   4 +-
 .../apache/hadoop/hdfs/tools/TestDFSAdmin.java  | 152 ++++++++++++++++++
 .../hdfs/util/TestAtomicFileOutputStream.java   |  29 ++++
 hadoop-yarn-project/CHANGES.txt                 |   6 +
 .../resourcemanager/NodesListManager.java       |   1 -
 .../resourcemanager/rmnode/RMNodeImpl.java      |  13 --
 .../scheduler/fair/FairScheduler.java           | 122 +++++++-------
 .../server/resourcemanager/TestRMRestart.java   |  26 ++-
 .../TestResourceTrackerService.java             |  25 ++-
 46 files changed, 1550 insertions(+), 303 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/032e0eba/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hadoop/blob/032e0eba/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/PBHelper.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hadoop/blob/032e0eba/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hadoop/blob/032e0eba/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hadoop/blob/032e0eba/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
----------------------------------------------------------------------
diff --cc hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
index fb88d11,4ae47b7..4a26420
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
@@@ -2584,7 -2552,7 +2585,7 @@@ public class FSNamesystem implements Na
        src = resolvePath(src, pathComponents);
        toRemoveBlocks = startFileInternal(pc, src, permissions, holder, 
            clientMachine, create, overwrite, createParent, replication, 
-           blockSize, isLazyPersist, suite, edek, logRetryCache);
 -          blockSize, suite, protocolVersion, edek, logRetryCache);
++          blockSize, isLazyPersist, suite, protocolVersion, edek, logRetryCache);
        stat = dir.getFileInfo(src, false,
            FSDirectory.isReservedRawName(srcArg), false);
      } catch (StandbyException se) {
@@@ -2620,8 -2588,8 +2621,8 @@@
        String src, PermissionStatus permissions, String holder, 
        String clientMachine, boolean create, boolean overwrite, 
        boolean createParent, short replication, long blockSize, 
-        boolean isLazyPersist, CipherSuite suite,
-        EncryptedKeyVersion edek, boolean logRetryEntry)
 -      CipherSuite suite, CryptoProtocolVersion version,
++      boolean isLazyPersist, CipherSuite suite, CryptoProtocolVersion version,
+       EncryptedKeyVersion edek, boolean logRetryEntry)
        throws FileAlreadyExistsException, AccessControlException,
        UnresolvedLinkException, FileNotFoundException,
        ParentNotDirectoryException, RetryStartFileException, IOException {

http://git-wip-us.apache.org/repos/asf/hadoop/blob/032e0eba/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/ClientNamenodeProtocol.proto
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hadoop/blob/032e0eba/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/hdfs.proto
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hadoop/blob/032e0eba/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientRetries.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/hadoop/blob/032e0eba/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestLease.java
----------------------------------------------------------------------


Mime
View raw message