kudu-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject [1/4] kudu git commit: [webui] Fix placement of tombstone tablet blurb
Date Sat, 10 Jun 2017 00:29:20 GMT
Repository: kudu
Updated Branches:
  refs/heads/master 8d2ca982f -> 65c1edaf0


[webui] Fix placement of tombstone tablet blurb

In b492d8ed3c, some text explaining what a tombstoned tablet is
was misplaced and ended up below the rest of the tombstoned
tablets section. This change puts it back in the correct place,
just underneath the "Tombstoned tablets" header for that
section.

Change-Id: I635c5119d1c6e223e2db2f73b2c7f47ce4bdb0a5
Reviewed-on: http://gerrit.cloudera.org:8080/7136
Tested-by: Kudu Jenkins
Reviewed-by: Dan Burkert <danburkert@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/4af55a80
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/4af55a80
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/4af55a80

Branch: refs/heads/master
Commit: 4af55a80501ccf6e23709ea348a7c52a69bc620d
Parents: 8d2ca98
Author: Will Berkeley <wdberkeley@apache.org>
Authored: Fri Jun 9 10:40:21 2017 -0700
Committer: Will Berkeley <wdberkeley@gmail.com>
Committed: Fri Jun 9 21:28:53 2017 +0000

----------------------------------------------------------------------
 src/kudu/tserver/tserver-path-handlers.cc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kudu/blob/4af55a80/src/kudu/tserver/tserver-path-handlers.cc
----------------------------------------------------------------------
diff --git a/src/kudu/tserver/tserver-path-handlers.cc b/src/kudu/tserver/tserver-path-handlers.cc
index c4599ae..c19a2f7 100644
--- a/src/kudu/tserver/tserver-path-handlers.cc
+++ b/src/kudu/tserver/tserver-path-handlers.cc
@@ -194,11 +194,9 @@ void TabletServerPathHandlers::HandleTabletsPage(const Webserver::WebRequest&
re
 
   // For assigning ids to table divs;
   int i = 0;
-  auto generate_table = [this, &i](const string& header,
-                                   const vector<scoped_refptr<TabletReplica>>&
replicas,
+  auto generate_table = [this, &i](const vector<scoped_refptr<TabletReplica>>&
replicas,
                                    ostream* output) {
     i++;
-    *output << "<h3>" << header << "</h3>\n";
 
     *output << "<h4>Summary</h4>\n";
     map<string, int> tablet_statuses;
@@ -280,12 +278,14 @@ void TabletServerPathHandlers::HandleTabletsPage(const Webserver::WebRequest&
re
   }
 
   if (!live_replicas.empty()) {
-    generate_table("Live Tablets", live_replicas, output);
+    *output << "<h3>Live Tablets</h3>\n";
+    generate_table(live_replicas, output);
   }
   if (!tombstoned_replicas.empty()) {
-    generate_table("Tombstoned Tablets", tombstoned_replicas, output);
+    *output << "<h3>Tombstoned Tablets</h3>\n";
     *output << "<p><small>Tombstoned tablets are tablets that previously
"
-           "stored a replica on this server.</small></p>";
+               "stored a replica on this server.</small></p>";
+    generate_table(tombstoned_replicas, output);
   }
 }
 


Mime
View raw message