big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HADOOP-16292. Refactor checkTrustAndSend in SaslDataTransferClient to make it cleaner. Contributed by Sherwood Zheng.

Browse Source
This commit is contained in:
Chen Liang 2019-05-03 10:14:17 -07:00
parent f1875b205e
commit 1d59cc490c
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/protocol/datatransfer/sasl/SaslDataTransferClient.java
View File

@ -169,7 +169,7 @@ public Peer peerSend(Peer peer, DataEncryptionKeyFactory encryptionKeyFactory,
throws IOException { throws IOException {
IOStreamPair ios = checkTrustAndSend(getPeerAddress(peer), IOStreamPair ios = checkTrustAndSend(getPeerAddress(peer),
peer.getOutputStream(), peer.getInputStream(), encryptionKeyFactory, peer.getOutputStream(), peer.getInputStream(), encryptionKeyFactory,
accessToken, datanodeId); accessToken, datanodeId, null);
// TODO: Consider renaming EncryptedPeer to SaslPeer. // TODO: Consider renaming EncryptedPeer to SaslPeer.
return ios != null ? new EncryptedPeer(peer, ios) : peer; return ios != null ? new EncryptedPeer(peer, ios) : peer;
} }
@ -219,15 +219,6 @@ public IOStreamPair socketSend(
* @return new pair of streams, wrapped after SASL negotiation * @return new pair of streams, wrapped after SASL negotiation
* @throws IOException for any error * @throws IOException for any error
*/ */
private IOStreamPair checkTrustAndSend(InetAddress addr,
OutputStream underlyingOut, InputStream underlyingIn,
DataEncryptionKeyFactory encryptionKeyFactory,
Token<BlockTokenIdentifier> accessToken, DatanodeID datanodeId)
throws IOException {
return checkTrustAndSend(addr, underlyingOut, underlyingIn,
encryptionKeyFactory, accessToken, datanodeId, null);
}
private IOStreamPair checkTrustAndSend( private IOStreamPair checkTrustAndSend(
InetAddress addr, OutputStream underlyingOut, InputStream underlyingIn, InetAddress addr, OutputStream underlyingOut, InputStream underlyingIn,
DataEncryptionKeyFactory encryptionKeyFactory, DataEncryptionKeyFactory encryptionKeyFactory,