From 38f3b11c294589ae034b7c20c82dd39b97a58ed3 Mon Sep 17 00:00:00 2001 From: Andrew Wang Date: Mon, 29 Sep 2014 14:14:22 -0700 Subject: [PATCH] HDFS-7124. Remove EncryptionZoneManager.NULL_EZ. (clamb via wang) (cherry picked from commit 7f0efe96f85704e39349f20ab6a11bfaa81c6a75) --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 ++ .../src/main/java/org/apache/hadoop/hdfs/DFSClient.java | 3 +-- .../ClientNamenodeProtocolServerSideTranslatorPB.java | 4 +++- .../hdfs/protocolPB/ClientNamenodeProtocolTranslatorPB.java | 6 +++++- .../hadoop/hdfs/server/namenode/EncryptionZoneManager.java | 6 +----- .../org/apache/hadoop/hdfs/server/namenode/FSDirectory.java | 3 +-- .../hadoop-hdfs/src/main/proto/encryption.proto | 2 +- 7 files changed, 14 insertions(+), 12 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index d4939b0c921..0e0459a0515 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -265,6 +265,8 @@ Release 2.6.0 - UNRELEASED HDFS-7104. Fix and clarify INodeInPath getter functions. (Zhe Zhang via wang) + HDFS-7124. Remove EncryptionZoneManager.NULL_EZ. (clamb via wang) + OPTIMIZATIONS HDFS-6690. Deduplicate xattr names in memory. (wang) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java index bdfea127477..d83d8cb727b 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java @@ -2940,8 +2940,7 @@ public EncryptionZone getEZForPath(String src) throws IOException { checkOpen(); try { - final EncryptionZone ez = namenode.getEZForPath(src); - return (ez.getId() < 0) ? null : ez; + return namenode.getEZForPath(src); } catch (RemoteException re) { throw re.unwrapRemoteException(AccessControlException.class, UnresolvedPathException.class); diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/ClientNamenodeProtocolServerSideTranslatorPB.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/ClientNamenodeProtocolServerSideTranslatorPB.java index 27904e1087a..a92d4555e6e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/ClientNamenodeProtocolServerSideTranslatorPB.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/ClientNamenodeProtocolServerSideTranslatorPB.java @@ -1340,7 +1340,9 @@ public GetEZForPathResponseProto getEZForPath( GetEZForPathResponseProto.Builder builder = GetEZForPathResponseProto.newBuilder(); final EncryptionZone ret = server.getEZForPath(req.getSrc()); - builder.setZone(PBHelper.convert(ret)); + if (ret != null) { + builder.setZone(PBHelper.convert(ret)); + } return builder.build(); } catch (IOException e) { throw new ServiceException(e); diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/ClientNamenodeProtocolTranslatorPB.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/ClientNamenodeProtocolTranslatorPB.java index df8965cf4d4..077a3e9489c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/ClientNamenodeProtocolTranslatorPB.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolPB/ClientNamenodeProtocolTranslatorPB.java @@ -1347,7 +1347,11 @@ public EncryptionZone getEZForPath(String src) try { final EncryptionZonesProtos.GetEZForPathResponseProto response = rpcProxy.getEZForPath(null, req); - return PBHelper.convert(response.getZone()); + if (response.hasZone()) { + return PBHelper.convert(response.getZone()); + } else { + return null; + } } catch (ServiceException e) { throw ProtobufHelper.getRemoteException(e); } diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/EncryptionZoneManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/EncryptionZoneManager.java index 0e83583fb35..0d7ced9274d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/EncryptionZoneManager.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/EncryptionZoneManager.java @@ -57,10 +57,6 @@ public class EncryptionZoneManager { public static Logger LOG = LoggerFactory.getLogger(EncryptionZoneManager .class); - public static final EncryptionZone NULL_EZ = - new EncryptionZone(-1, "", CipherSuite.UNKNOWN, - CryptoProtocolVersion.UNKNOWN, ""); - /** * EncryptionZoneInt is the internal representation of an encryption zone. The * external representation of an EZ is embodied in an EncryptionZone and @@ -226,7 +222,7 @@ private EncryptionZoneInt getEncryptionZoneForPath(INodesInPath iip) { EncryptionZone getEZINodeForPath(INodesInPath iip) { final EncryptionZoneInt ezi = getEncryptionZoneForPath(iip); if (ezi == null) { - return NULL_EZ; + return null; } else { return new EncryptionZone(ezi.getINodeId(), getFullPathName(ezi), ezi.getSuite(), ezi.getVersion(), ezi.getKeyName()); diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java index 8980f0173f1..90271cbd297 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java @@ -2846,8 +2846,7 @@ FileEncryptionInfo getFileEncryptionInfo(INode inode, int snapshotId, iip = getINodesInPath(inode.getFullPathName(), true); } EncryptionZone encryptionZone = getEZForPath(iip); - if (encryptionZone == null || - encryptionZone.equals(EncryptionZoneManager.NULL_EZ)) { + if (encryptionZone == null) { // not an encrypted file return null; } else if(encryptionZone.getPath() == null diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/encryption.proto b/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/encryption.proto index bb291eaff23..68b2f3af29c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/encryption.proto +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/proto/encryption.proto @@ -63,5 +63,5 @@ message GetEZForPathRequestProto { } message GetEZForPathResponseProto { - required EncryptionZoneProto zone = 1; + optional EncryptionZoneProto zone = 1; }