diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutputSaslHelper.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutputSaslHelper.java index af2ccf9..96a6715 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutputSaslHelper.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/asyncfs/FanOutOneBlockAsyncDFSOutputSaslHelper.java @@ -95,9 +95,9 @@ import org.apache.hadoop.hdfs.protocol.datatransfer.TrustedChannelResolver; import org.apache.hadoop.hdfs.protocol.datatransfer.sasl.SaslDataTransferClient; import org.apache.hadoop.hdfs.protocol.proto.DataTransferProtos.DataTransferEncryptorMessageProto; import org.apache.hadoop.hdfs.protocol.proto.DataTransferProtos.DataTransferEncryptorMessageProto.DataTransferEncryptorStatus; -import org.apache.hadoop.hdfs.protocol.proto.HdfsProtos.CipherOptionProto; import org.apache.hadoop.hdfs.security.token.block.BlockTokenIdentifier; import org.apache.hadoop.hdfs.security.token.block.DataEncryptionKey; +import org.apache.hadoop.security.proto.SecurityProtos.CipherOptionProto; import org.apache.hadoop.security.SaslPropertiesResolver; import org.apache.hadoop.security.SaslRpcServer.QualityOfProtection; import org.apache.hadoop.security.UserGroupInformation; @@ -194,9 +194,9 @@ public final class FanOutOneBlockAsyncDFSOutputSaslHelper { private static PBHelper createPBHelper() throws NoSuchMethodException { Class helperClass; try { - helperClass = Class.forName("org.apache.hadoop.hdfs.protocolPB.PBHelperClient"); + helperClass = Class.forName("org.apache.hadoop.protocolPB.CommonPBHelper"); } catch (ClassNotFoundException e) { - LOG.debug("No PBHelperClient class found, should be hadoop 2.7-", e); + LOG.debug("No CommonPBHelper class found, must be pre-HADOOP-10768", e); helperClass = org.apache.hadoop.hdfs.protocolPB.PBHelper.class; } Method convertCipherOptionsMethod = helperClass.getMethod("convertCipherOptions", List.class);