Author: szetszwo
Date: Fri Mar 28 18:36:20 2014
New Revision: 1582857
URL: http://svn.apache.org/r1582857
Log:
svn merge -c 1582856 from trunk for HDFS-6168. Remove a deprecated constructor
and the deprecated methods reportChecksumFailure, getDelegationToken(Text),
renewDelegationToken and cancelDelegationToken from DistributedFileSystem.
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/ (props changed)
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/ (props
changed)
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/
(props changed)
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/security/TestDelegationToken.java
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestDelegationTokensWithHA.java
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tools/TestDelegationTokenFetcher.java
Propchange: hadoop/common/branches/branch-2/hadoop-hdfs-project/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-hdfs-project:r1582856
Propchange: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs:r1582856
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1582857&r1=1582856&r2=1582857&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Fri Mar 28 18:36:20 2014
@@ -4,6 +4,10 @@ Release 2.5.0 - UNRELEASED
INCOMPATIBLE CHANGES
+ HDFS-6168. Remove a deprecated constructor and the deprecated methods
reportChecksumFailure,
+ getDelegationToken(Text), renewDelegationToken and cancelDelegationToken
from
+ DistributedFileSystem. (szetszwo)
+
NEW FEATURES
IMPROVEMENTS
Propchange:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java:r1582856
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java?rev=1582857&r1=1582856&r2=1582857&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
Fri Mar 28 18:36:20 2014
@@ -124,12 +124,6 @@ public class DistributedFileSystem exten
return HdfsConstants.HDFS_URI_SCHEME;
}
- @Deprecated
- public DistributedFileSystem(InetSocketAddress namenode,
- Configuration conf) throws IOException {
- initialize(NameNode.getUri(namenode), conf);
- }
-
@Override
public URI getUri() { return uri; }
@@ -1061,55 +1055,6 @@ public class DistributedFileSystem exten
}
/**
- * We need to find the blocks that didn't match. Likely only one
- * is corrupt but we will report both to the namenode. In the future,
- * we can consider figuring out exactly which block is corrupt.
- */
- // We do not see a need for user to report block checksum errors and do not
- // want to rely on user to report block corruptions.
- @Deprecated
- public boolean reportChecksumFailure(Path f,
- FSDataInputStream in, long inPos,
- FSDataInputStream sums, long sumsPos) {
-
- if(!(in instanceof HdfsDataInputStream && sums instanceof
HdfsDataInputStream))
- throw new IllegalArgumentException(
- "Input streams must be types of HdfsDataInputStream");
-
- LocatedBlock lblocks[] = new LocatedBlock[2];
-
- // Find block in data stream.
- HdfsDataInputStream dfsIn = (HdfsDataInputStream) in;
- ExtendedBlock dataBlock = dfsIn.getCurrentBlock();
- if (dataBlock == null) {
- LOG.error("Error: Current block in data stream is null! ");
- return false;
- }
- DatanodeInfo[] dataNode = {dfsIn.getCurrentDatanode()};
- lblocks[0] = new LocatedBlock(dataBlock, dataNode);
- LOG.info("Found checksum error in data stream at "
- + dataBlock + " on datanode="
- + dataNode[0]);
-
- // Find block in checksum stream
- HdfsDataInputStream dfsSums = (HdfsDataInputStream) sums;
- ExtendedBlock sumsBlock = dfsSums.getCurrentBlock();
- if (sumsBlock == null) {
- LOG.error("Error: Current block in checksum stream is null! ");
- return false;
- }
- DatanodeInfo[] sumsNode = {dfsSums.getCurrentDatanode()};
- lblocks[1] = new LocatedBlock(sumsBlock, sumsNode);
- LOG.info("Found checksum error in checksum stream at "
- + sumsBlock + " on datanode=" + sumsNode[0]);
-
- // Ask client to delete blocks.
- dfs.reportChecksumFailure(f.toString(), lblocks);
-
- return true;
- }
-
- /**
* Returns the stat information about the file.
* @throws FileNotFoundException if the file does not exist.
*/
@@ -1330,66 +1275,13 @@ public class DistributedFileSystem exten
}
@Override
- public
- Token<DelegationTokenIdentifier> getDelegationToken(String renewer
- ) throws IOException {
+ public Token<DelegationTokenIdentifier> getDelegationToken(String renewer)
+ throws IOException {
Token<DelegationTokenIdentifier> result =
dfs.getDelegationToken(renewer == null ? null : new Text(renewer));
return result;
}
- /*
- * Delegation Token Operations
- * These are DFS only operations.
- */
-
- /**
- * Get a valid Delegation Token.
- *
- * @param renewer Name of the designated renewer for the token
- * @return Token<DelegationTokenIdentifier>
- * @throws IOException
- * @deprecated use {@link #getDelegationToken(String)}
- */
- @Deprecated
- public Token<DelegationTokenIdentifier> getDelegationToken(Text renewer)
- throws IOException {
- return getDelegationToken(renewer.toString());
- }
-
- /**
- * Renew an existing delegation token.
- *
- * @param token delegation token obtained earlier
- * @return the new expiration time
- * @throws IOException
- * @deprecated Use Token.renew instead.
- */
- public long renewDelegationToken(Token<DelegationTokenIdentifier> token)
- throws InvalidToken, IOException {
- try {
- return token.renew(getConf());
- } catch (InterruptedException ie) {
- throw new RuntimeException("Caught interrupted", ie);
- }
- }
-
- /**
- * Cancel an existing delegation token.
- *
- * @param token delegation token
- * @throws IOException
- * @deprecated Use Token.cancel instead.
- */
- public void cancelDelegationToken(Token<DelegationTokenIdentifier> token)
- throws IOException {
- try {
- token.cancel(getConf());
- } catch (InterruptedException ie) {
- throw new RuntimeException("Caught interrupted", ie);
- }
- }
-
/**
* Requests the namenode to tell all datanodes to use a new, non-persistent
* bandwidth value for dfs.balance.bandwidthPerSec.
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/security/TestDelegationToken.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/security/TestDelegationToken.java?rev=1582857&r1=1582856&r2=1582857&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/security/TestDelegationToken.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/security/TestDelegationToken.java
Fri Mar 28 18:36:20 2014
@@ -212,11 +212,9 @@ public class TestDelegationToken {
longUgi.doAs(new PrivilegedExceptionAction<Object>() {
@Override
public Object run() throws IOException {
- final DistributedFileSystem dfs = cluster.getFileSystem();
try {
- //try renew with long name
- dfs.renewDelegationToken(token);
- } catch (IOException e) {
+ token.renew(config);
+ } catch (Exception e) {
Assert.fail("Could not renew delegation token for user "+longUgi);
}
return null;
@@ -224,20 +222,17 @@ public class TestDelegationToken {
});
shortUgi.doAs(new PrivilegedExceptionAction<Object>() {
@Override
- public Object run() throws IOException {
- final DistributedFileSystem dfs = cluster.getFileSystem();
- dfs.renewDelegationToken(token);
+ public Object run() throws Exception {
+ token.renew(config);
return null;
}
});
longUgi.doAs(new PrivilegedExceptionAction<Object>() {
@Override
public Object run() throws IOException {
- final DistributedFileSystem dfs = cluster.getFileSystem();
try {
- //try cancel with long name
- dfs.cancelDelegationToken(token);
- } catch (IOException e) {
+ token.cancel(config);
+ } catch (Exception e) {
Assert.fail("Could not cancel delegation token for user "+longUgi);
}
return null;
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestDelegationTokensWithHA.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestDelegationTokensWithHA.java?rev=1582857&r1=1582856&r2=1582857&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestDelegationTokensWithHA.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestDelegationTokensWithHA.java
Fri Mar 28 18:36:20 2014
@@ -99,6 +99,9 @@ public class TestDelegationTokensWithHA
.build();
cluster.waitActive();
+ String logicalName = HATestUtil.getLogicalHostname(cluster);
+ HATestUtil.setFailoverConfigurations(cluster, conf, logicalName, 0);
+
nn0 = cluster.getNameNode(0);
nn1 = cluster.getNameNode(1);
fs = HATestUtil.configureFailoverFs(cluster, conf);
@@ -246,8 +249,7 @@ public class TestDelegationTokensWithHA
doRenewOrCancel(token, clientConf, TokenTestAction.RENEW);
doRenewOrCancel(token, clientConf, TokenTestAction.CANCEL);
}
-
- @SuppressWarnings("deprecation")
+
@Test
public void testDelegationTokenWithDoAs() throws Exception {
final Token<DelegationTokenIdentifier> token =
@@ -259,29 +261,22 @@ public class TestDelegationTokensWithHA
longUgi.doAs(new PrivilegedExceptionAction<Void>() {
@Override
public Void run() throws Exception {
- DistributedFileSystem dfs = (DistributedFileSystem)
- HATestUtil.configureFailoverFs(cluster, conf);
// try renew with long name
- dfs.renewDelegationToken(token);
+ token.renew(conf);
return null;
}
});
shortUgi.doAs(new PrivilegedExceptionAction<Void>() {
@Override
public Void run() throws Exception {
- DistributedFileSystem dfs = (DistributedFileSystem)
- HATestUtil.configureFailoverFs(cluster, conf);
- dfs.renewDelegationToken(token);
+ token.renew(conf);
return null;
}
});
longUgi.doAs(new PrivilegedExceptionAction<Void>() {
@Override
public Void run() throws Exception {
- DistributedFileSystem dfs = (DistributedFileSystem)
- HATestUtil.configureFailoverFs(cluster, conf);
- // try cancel with long name
- dfs.cancelDelegationToken(token);
+ token.cancel(conf);;
return null;
}
});
Modified:
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tools/TestDelegationTokenFetcher.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tools/TestDelegationTokenFetcher.java?rev=1582857&r1=1582856&r2=1582857&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tools/TestDelegationTokenFetcher.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/tools/TestDelegationTokenFetcher.java
Fri Mar 28 18:36:20 2014
@@ -62,7 +62,6 @@ public class TestDelegationTokenFetcher
* Verify that when the DelegationTokenFetcher runs, it talks to the
Namenode,
* pulls out the correct user's token and successfully serializes it to disk.
*/
- @SuppressWarnings("deprecation")
@Test
public void expectedTokenIsRetrievedFromDFS() throws Exception {
final byte[] ident = new DelegationTokenIdentifier(new Text("owner"),
@@ -83,7 +82,6 @@ public class TestDelegationTokenFetcher
return new Token<?>[]{t};
}
});
- when(dfs.renewDelegationToken(eq(t))).thenReturn(1000L);
when(dfs.getUri()).thenReturn(uri);
FakeRenewer.reset();
