Return-Path: Delivered-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org Received: (qmail 96729 invoked from network); 3 Feb 2011 21:08:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 3 Feb 2011 21:08:17 -0000 Received: (qmail 6421 invoked by uid 500); 3 Feb 2011 21:08:17 -0000 Delivered-To: apmail-hadoop-hdfs-commits-archive@hadoop.apache.org Received: (qmail 6372 invoked by uid 500); 3 Feb 2011 21:08:16 -0000 Mailing-List: contact hdfs-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hdfs-dev@hadoop.apache.org Delivered-To: mailing list hdfs-commits@hadoop.apache.org Received: (qmail 6364 invoked by uid 99); 3 Feb 2011 21:08:16 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Feb 2011 21:08:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Feb 2011 21:08:14 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D5EF3238890B; Thu, 3 Feb 2011 21:07:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1066970 - in /hadoop/hdfs/trunk: CHANGES.txt src/test/hdfs/org/apache/hadoop/hdfs/security/TestClientProtocolWithDelegationToken.java src/test/hdfs/org/apache/hadoop/hdfs/security/token/block/TestBlockToken.java Date: Thu, 03 Feb 2011 21:07:52 -0000 To: hdfs-commits@hadoop.apache.org From: todd@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110203210752.D5EF3238890B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: todd Date: Thu Feb 3 21:07:52 2011 New Revision: 1066970 URL: http://svn.apache.org/viewvc?rev=1066970&view=rev Log: HDFS-1610. Fix TestClientProtocolWithDelegationToken and TestBlockToken on trunk after HADOOP-6904. Contributed by Todd Lipcon. Modified: hadoop/hdfs/trunk/CHANGES.txt hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/security/TestClientProtocolWithDelegationToken.java hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/security/token/block/TestBlockToken.java Modified: hadoop/hdfs/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/CHANGES.txt?rev=1066970&r1=1066969&r2=1066970&view=diff ============================================================================== --- hadoop/hdfs/trunk/CHANGES.txt (original) +++ hadoop/hdfs/trunk/CHANGES.txt Thu Feb 3 21:07:52 2011 @@ -81,6 +81,9 @@ Trunk (unreleased changes) HDFS-863. Potential deadlock in TestOverReplicatedBlocks. (Ken Goodhope via jghoman) + HDFS-1610. Fix TestClientProtocolWithDelegationToken and TestBlockToken + on trunk after HADOOP-6904 (todd) + Release 0.22.0 - Unreleased NEW FEATURES Modified: hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/security/TestClientProtocolWithDelegationToken.java URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/security/TestClientProtocolWithDelegationToken.java?rev=1066970&r1=1066969&r2=1066970&view=diff ============================================================================== --- hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/security/TestClientProtocolWithDelegationToken.java (original) +++ hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/security/TestClientProtocolWithDelegationToken.java Thu Feb 3 21:07:52 2011 @@ -19,9 +19,11 @@ package org.apache.hadoop.hdfs.security; import static org.apache.hadoop.fs.CommonConfigurationKeys.HADOOP_SECURITY_AUTHENTICATION; +import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyLong; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.when; import java.net.InetSocketAddress; @@ -35,6 +37,7 @@ import org.apache.hadoop.io.Text; import org.apache.hadoop.ipc.Client; import org.apache.hadoop.ipc.RPC; +import org.apache.hadoop.ipc.ProtocolSignature; import org.apache.hadoop.ipc.Server; import org.apache.hadoop.hdfs.DFSConfigKeys; import org.apache.hadoop.hdfs.protocol.ClientProtocol; @@ -79,6 +82,11 @@ public class TestClientProtocolWithDeleg FSNamesystem mockNameSys = mock(FSNamesystem.class); when(mockNN.getProtocolVersion(anyString(), anyLong())).thenReturn( ClientProtocol.versionID); + doReturn(ProtocolSignature.getProtocolSignature( + mockNN, ClientProtocol.class.getName(), + ClientProtocol.versionID, 0)) + .when(mockNN).getProtocolSignature(anyString(), anyLong(), anyInt()); + DelegationTokenSecretManager sm = new DelegationTokenSecretManager( DFSConfigKeys.DFS_NAMENODE_DELEGATION_KEY_UPDATE_INTERVAL_DEFAULT, DFSConfigKeys.DFS_NAMENODE_DELEGATION_KEY_UPDATE_INTERVAL_DEFAULT, Modified: hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/security/token/block/TestBlockToken.java URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/security/token/block/TestBlockToken.java?rev=1066970&r1=1066969&r2=1066970&view=diff ============================================================================== --- hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/security/token/block/TestBlockToken.java (original) +++ hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/security/token/block/TestBlockToken.java Thu Feb 3 21:07:52 2011 @@ -33,6 +33,7 @@ import org.apache.hadoop.hdfs.protocol.C import org.apache.hadoop.hdfs.protocol.Block; import org.apache.hadoop.io.TestWritable; import org.apache.hadoop.ipc.Client; +import org.apache.hadoop.ipc.ProtocolSignature; import org.apache.hadoop.ipc.RPC; import org.apache.hadoop.ipc.Server; import org.apache.hadoop.net.NetUtils; @@ -49,9 +50,11 @@ import org.junit.Test; import static org.apache.hadoop.fs.CommonConfigurationKeys.HADOOP_SECURITY_AUTHENTICATION; import static org.junit.Assert.*; import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyLong; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import org.mockito.invocation.InvocationOnMock; @@ -191,6 +194,11 @@ public class TestBlockToken { ClientDatanodeProtocol mockDN = mock(ClientDatanodeProtocol.class); when(mockDN.getProtocolVersion(anyString(), anyLong())).thenReturn( ClientDatanodeProtocol.versionID); + doReturn(ProtocolSignature.getProtocolSignature( + mockDN, ClientDatanodeProtocol.class.getName(), + ClientDatanodeProtocol.versionID, 0)) + .when(mockDN).getProtocolSignature(anyString(), anyLong(), anyInt()); + BlockTokenIdentifier id = sm.createIdentifier(); id.readFields(new DataInputStream(new ByteArrayInputStream(token .getIdentifier())));