From 6a4dbea79465d02390545d5c3f9df0b50085e24a Mon Sep 17 00:00:00 2001 From: Beata Sudi Date: Mon, 9 Dec 2019 10:24:19 +0100 Subject: [PATCH] HBASE-18382 add transport type info into Thrift UI (#880) Signed-off-by: Wellington Chevreuil Signed-off-by: Bharath Vissapragada Signed-off-by: Viraj Jasani (cherry picked from commit 82e155eb26cddd642e151d9276e2f4f281b4df88) --- .../resources/hbase-webapps/thrift/thrift.jsp | 38 +++++++++++++------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp b/hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp index dea591230995..6b308fc2a2dc 100644 --- a/hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp +++ b/hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp @@ -32,9 +32,14 @@ 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"; +String protocol = + conf.getBoolean("hbase.regionserver.thrift.compact", false) ? "Compact" : "Binary"; +String qop = conf.get("hbase.thrift.security.qop", "None"); + %> @@ -54,12 +59,15 @@ String compact = conf.get("hbase.regionserver.thrift.compact", "false");
- - HBase Logo + + HBase Logo +
    @@ -128,26 +136,32 @@ String compact = conf.get("hbase.regionserver.thrift.compact", "false"); Thrift RPC engine implementation type chosen by this Thrift server - Compact Protocol - <%= compact %> - Thrift RPC engine uses compact protocol + Protocol + <%= protocol %> + Thrift RPC engine protocol type - Framed Transport - <%= framed %> - Thrift RPC engine uses framed transport + Transport + <%= transport %> + Thrift RPC engine transport type Thrift Server Type <%= serverType %> The type of this Thrift server + + Quality of Protection + <%= qop %> + QOP Settings for SASL +
- Apache HBase Reference Guide chapter on Thrift + + Apache HBase Reference Guide chapter on Thrift