From 6c0c1403502f3d52add000eb1fc5e7b1cec33892 Mon Sep 17 00:00:00 2001 From: Uma Maheswara Rao G Date: Thu, 8 Mar 2012 18:51:46 +0000 Subject: [PATCH] HDFS-2976 corrected the previous wrong commit for this issue. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1298507 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/hadoop/hdfs/DFSClient.java | 54 ------------------- 1 file changed, 54 deletions(-) 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 074be7eaedf..c450c6ef3f3 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 @@ -644,60 +644,6 @@ private static boolean isLocalAddress(InetSocketAddress targetAddr) { return local; } - /** - * Should the block access token be refetched on an exception - * - * @param ex Exception received - * @param targetAddr Target datanode address from where exception was received - * @return true if block access token has expired or invalid and it should be - * refetched - */ - private static boolean tokenRefetchNeeded(IOException ex, - InetSocketAddress targetAddr) { - /* - * Get a new access token and retry. Retry is needed in 2 cases. 1) When - * both NN and DN re-started while DFSClient holding a cached access token. - * 2) In the case that NN fails to update its access key at pre-set interval - * (by a wide margin) and subsequently restarts. In this case, DN - * re-registers itself with NN and receives a new access key, but DN will - * delete the old access key from its memory since it's considered expired - * based on the estimated expiration date. - */ - if (ex instanceof InvalidBlockTokenException || ex instanceof InvalidToken) { - LOG.info("Access token was invalid when connecting to " + targetAddr - + " : " + ex); - return true; - } - return false; - } - - /** - * Should the block access token be refetched on an exception - * - * @param ex Exception received - * @param targetAddr Target datanode address from where exception was received - * @return true if block access token has expired or invalid and it should be - * refetched - */ - private static boolean tokenRefetchNeeded(IOException ex, - InetSocketAddress targetAddr) { - /* - * Get a new access token and retry. Retry is needed in 2 cases. 1) When - * both NN and DN re-started while DFSClient holding a cached access token. - * 2) In the case that NN fails to update its access key at pre-set interval - * (by a wide margin) and subsequently restarts. In this case, DN - * re-registers itself with NN and receives a new access key, but DN will - * delete the old access key from its memory since it's considered expired - * based on the estimated expiration date. - */ - if (ex instanceof InvalidBlockTokenException || ex instanceof InvalidToken) { - LOG.info("Access token was invalid when connecting to " + targetAddr - + " : " + ex); - return true; - } - return false; - } - /** * Cancel a delegation token * @param token the token to cancel