Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAPREDUCE-3392. Fixed Cluster's getDelegationToken's API to return null when there isn't a supported token. Contributed by John George. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1200484 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Vinod Kumar Vavilapalli 2011-11-10 19:19:25 +00:00
parent 15150cd997
commit 200bb27557
3 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -105,6 +105,9 @@ Release 0.23.1 - Unreleased
which per-container connections to NodeManager were lingering long enough which per-container connections to NodeManager were lingering long enough
to hit the ulimits on number of processes. (vinodkv) to hit the ulimits on number of processes. (vinodkv)
MAPREDUCE-3392. Fixed Cluster's getDelegationToken's API to return null
when there isn't a supported token. (John George via vinodkv)
Release 0.23.0 - 2011-11-01 Release 0.23.0 - 2011-11-01
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

5
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/Cluster.java
View File

@ -390,6 +390,11 @@ public class Cluster {
getDelegationToken(Text renewer) throws IOException, InterruptedException{ getDelegationToken(Text renewer) throws IOException, InterruptedException{
Token<DelegationTokenIdentifier> result = Token<DelegationTokenIdentifier> result =
client.getDelegationToken(renewer); client.getDelegationToken(renewer);
if (result == null) {
return result;
}
InetSocketAddress addr = Master.getMasterAddress(conf); InetSocketAddress addr = Master.getMasterAddress(conf);
StringBuilder service = new StringBuilder(); StringBuilder service = new StringBuilder();
service.append(NetUtils.normalizeHostName(addr.getAddress(). service.append(NetUtils.normalizeHostName(addr.getAddress().

20
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestYarnClientProtocolProvider.java
View File

@ -25,6 +25,7 @@ import junit.framework.TestCase;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.mapred.YARNRunner; import org.apache.hadoop.mapred.YARNRunner;
import org.apache.hadoop.mapreduce.protocol.ClientProtocol; import org.apache.hadoop.mapreduce.protocol.ClientProtocol;
import org.apache.hadoop.io.Text;
import org.junit.Test; import org.junit.Test;
public class TestYarnClientProtocolProvider extends TestCase { public class TestYarnClientProtocolProvider extends TestCase {
@ -56,4 +57,23 @@ public class TestYarnClientProtocolProvider extends TestCase {
} }
} }
} }
@Test
public void testClusterGetDelegationToken() throws Exception {
Configuration conf = new Configuration(false);
Cluster cluster = null;
try {
conf = new Configuration();
conf.set(MRConfig.FRAMEWORK_NAME, MRConfig.YARN_FRAMEWORK_NAME);
cluster = new Cluster(conf);
cluster.getDelegationToken(new Text(" "));
} finally {
if (cluster != null) {
cluster.close();
}
}
}
} }