HDFS-3434. InvalidProtocolBufferException when visiting DN browseDirectory.jsp. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1339712 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
6d71407582
commit
5ef725eb53
@ -214,6 +214,9 @@ Release 2.0.1-alpha - UNRELEASED
|
||||
HDFS-1153. dfsnodelist.jsp should handle invalid input parameters.
|
||||
(Ravi Phulari via eli)
|
||||
|
||||
HDFS-3434. InvalidProtocolBufferException when visiting DN
|
||||
browseDirectory.jsp (eli)
|
||||
|
||||
Release 2.0.0-alpha - UNRELEASED
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
@ -165,9 +165,9 @@ private Map<String, String> getAuthFilterParams(Configuration conf)
|
||||
httpServer.setAttribute("datanode.https.port", datanodeSslPort
|
||||
.getPort());
|
||||
}
|
||||
httpServer.setAttribute("name.node", nn);
|
||||
httpServer.setAttribute("name.node.address", bindAddress);
|
||||
httpServer.setAttribute("name.system.image", nn.getFSImage());
|
||||
httpServer.setAttribute(NAMENODE_ATTRIBUTE_KEY, nn);
|
||||
httpServer.setAttribute(NAMENODE_ADDRESS_ATTRIBUTE_KEY, nn.getNameNodeAddress());
|
||||
httpServer.setAttribute(FSIMAGE_ATTRIBUTE_KEY, nn.getFSImage());
|
||||
httpServer.setAttribute(JspHelper.CURRENT_CONF, conf);
|
||||
setupServlets(httpServer, conf);
|
||||
httpServer.start();
|
||||
|
@ -114,7 +114,7 @@ private void verifyServiceInToken(ServletContext context,
|
||||
UserGroupInformation ugi = JspHelper.getUGI(context, request, conf);
|
||||
Token<? extends TokenIdentifier> tokenInUgi = ugi.getTokens().iterator()
|
||||
.next();
|
||||
Assert.assertEquals(tokenInUgi.getService().toString(), expected);
|
||||
Assert.assertEquals(expected, tokenInUgi.getService().toString());
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user