Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id CC3B9200BB2 for ; Fri, 23 Sep 2016 21:10:13 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id CAE40160AD0; Fri, 23 Sep 2016 19:10:13 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 258A8160AD6 for ; Fri, 23 Sep 2016 21:10:12 +0200 (CEST) Received: (qmail 67976 invoked by uid 500); 23 Sep 2016 19:10:12 -0000 Mailing-List: contact commits-help@kudu.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@kudu.apache.org Delivered-To: mailing list commits@kudu.apache.org Received: (qmail 67897 invoked by uid 99); 23 Sep 2016 19:10:12 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Sep 2016 19:10:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0EBE3E01BA; Fri, 23 Sep 2016 19:10:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: todd@apache.org To: commits@kudu.apache.org Date: Fri, 23 Sep 2016 19:10:12 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/4] kudu git commit: [web-ui] KUDU-1619 Separate tables for live and dead tservers on /tablet-servers archived-at: Fri, 23 Sep 2016 19:10:14 -0000 Repository: kudu Updated Branches: refs/heads/master 21aa44398 -> c5b07fa8f [web-ui] KUDU-1619 Separate tables for live and dead tservers on /tablet-servers Creating two lists of tservers live and dead. Created a function to generate html tables taking server list and table header as params. Attached sampe screenshot: https://github.com/ninadshr/sample_repo/blob/master/tablet_servers.png Change-Id: I479fad5c2db61949f7d67bde7901e7a59c60b786 Reviewed-on: http://gerrit.cloudera.org:8080/4450 Reviewed-by: Alexey Serbin Tested-by: Alexey Serbin Project: http://git-wip-us.apache.org/repos/asf/kudu/repo Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/376f95b6 Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/376f95b6 Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/376f95b6 Branch: refs/heads/master Commit: 376f95b6dc19ceb13221f02851cf58366f71825d Parents: 21aa443 Author: ninadshr Authored: Tue Sep 20 10:46:11 2016 -0400 Committer: Alexey Serbin Committed: Fri Sep 23 05:23:46 2016 +0000 ---------------------------------------------------------------------- src/kudu/master/master-path-handlers.cc | 35 +++++++++++++++++++--------- 1 file changed, 24 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kudu/blob/376f95b6/src/kudu/master/master-path-handlers.cc ---------------------------------------------------------------------- diff --git a/src/kudu/master/master-path-handlers.cc b/src/kudu/master/master-path-handlers.cc index 4a2eff1..f85e5c8 100644 --- a/src/kudu/master/master-path-handlers.cc +++ b/src/kudu/master/master-path-handlers.cc @@ -74,22 +74,26 @@ void MasterPathHandlers::HandleTabletServers(const Webserver::WebRequest& req, *output << Substitute("

There are $0 registered tablet servers.

", descs.size()); map> version_counts; - vector tserver_rows; + vector live_tserver_rows; + vector dead_tserver_rows; for (const std::shared_ptr& desc : descs) { const string time_since_hb = StringPrintf("%.1fs", desc->TimeSinceHeartbeat().ToSeconds()); ServerRegistrationPB reg; desc->GetRegistration(®); + string row = Substitute("$0$1

$2

\n", + RegistrationToHtml(reg, desc->permanent_uuid()), + time_since_hb, + EscapeForHtmlToString(reg.ShortDebugString())); + if (desc->PresumedDead()) { version_counts[reg.software_version()][1]++; + dead_tserver_rows.push_back(row); } else { version_counts[reg.software_version()][0]++; + live_tserver_rows.push_back(row); } - string row = Substitute("$0$1

$2

\n", - RegistrationToHtml(reg, desc->permanent_uuid()), - time_since_hb, - EscapeForHtmlToString(reg.ShortDebugString())); - tserver_rows.push_back(row); + } *output << "

Version Summary

"; @@ -101,11 +105,20 @@ void MasterPathHandlers::HandleTabletServers(const Webserver::WebRequest& req, } *output << ""; - *output << "

Registrations

"; - *output << "\n"; - *output << "\n"; - *output << JoinStrings(tserver_rows, "\n"); - *output << "

UUID	Time since heartbeat	Registration

\n"; + *output << "

" << "Registrations" << "

\n"; + auto generate_table = [](const vector& rows, + const string& header, + ostream* output) { + if (!rows.empty()) { + *output << "

" << header << "

\n"; + *output << "\n"; + *output << "\n"; + *output << JoinStrings(rows, "\n"); + *output << "

UUID	Time since heartbeat	Registration

\n"; + } + }; + generate_table(live_tserver_rows, "Live Tablet Servers", output); + generate_table(dead_tserver_rows, "Dead Tablet Servers", output); } void MasterPathHandlers::HandleCatalogManager(const Webserver::WebRequest& req,