Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HBASE-18382 add transport type info into Thrift UI #880

Merged
merged 8 commits into from
Dec 9, 2019
Merged

HBASE-18382 add transport type info into Thrift UI #880

Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5d71f9d
HBASE-18382 add transport type info into Thrift UI
bea0113 Nov 26, 2019
67f30d8
Merge branch 'master' of https://github.com/apache/hbase into HBASE-1…
Nov 28, 2019
af3f37d
HBASE-18382 fixing commit after PR comments
Nov 28, 2019
4b527ca
Merge branch 'master' of https://github.com/apache/hbase into HBASE-1…
Dec 3, 2019
b9e371d
HBASE-18382 fixing commit according to PR comments
Dec 3, 2019
7f2dde4
HBASE-18382 fix
Dec 3, 2019
9b3948e
Merge branch 'master' of https://github.com/apache/hbase into HBASE-1…
Dec 9, 2019
cb5e09c
fixing nits
Dec 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,11 @@ String serverType = (String)getServletContext().getAttribute("hbase.thrift.serve
long startcode = conf.getLong("startcode", System.currentTimeMillis());
String listenPort = conf.get("hbase.regionserver.thrift.port", "9090");
ImplType implType = ImplType.getServerImpl(conf);
String framed = implType.isAlwaysFramed()
? "true" : conf.get("hbase.regionserver.thrift.framed", "false");
String compact = conf.get("hbase.regionserver.thrift.compact", "false");

String transport = implType.isAlwaysFramed() ||conf.getBoolean("hbase.regionserver.thrift.framed", false) ? "Framed" : "Standard";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Couple of nits:

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 to the suggestions, rest looks good

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I corrected these, I hope it looks good now :)

String protocol = conf.getBoolean("hbase.regionserver.thrift.compact", false) ? "Compact" : "Binary";
String qop = conf.get("hbase.thrift.security.qop", "None");

%>
<!DOCTYPE html>
<?xml version="1.0" encoding="UTF-8" ?>
Expand Down Expand Up @@ -112,20 +114,25 @@ String compact = conf.get("hbase.regionserver.thrift.compact", "false");
<td>Thrift RPC engine implementation type chosen by this Thrift server</td>
</tr>
<tr>
<td>Compact Protocol</td>
<td><%= compact %></td>
<td>Thrift RPC engine uses compact protocol</td>
<td>Protocol</td>
<td><%= protocol %></td>
<td>Thrift RPC engine protocol type</td>
</tr>
<tr>
<td>Framed Transport</td>
<td><%= framed %></td>
<td>Thrift RPC engine uses framed transport</td>
<td>Transport</td>
<td><%= transport %></td>
<td>Thrift RPC engine transport type</td>
</tr>
<tr>
<td>Thrift Server Type</td>
<td><%= serverType %></td>
<td>The type of this Thrift server</td>
</tr>
<tr>
<td>Quality of Protection</td>
<td><%= qop %></td>
<td>QOP Settings for SASL</td>
</tr>
</table>
</section>
</div>
Expand Down