deadServers = null;
boolean showAppendWarning = false;
+boolean catalogJanitorEnabled = true;
String filter = "general";
String format = "html";
%args>
@@ -119,6 +120,12 @@
for details.
%if>
+ <%if !catalogJanitorEnabled %>
+
+ Please note that your cluster is running with the CatalogJanitor disabled. It can be
+ re-enabled from the hbase shell by running the command 'catalogjanitor_switch true'
+
+ %if>
Region Servers
Index: hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterStatusServlet.java
===================================================================
--- hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterStatusServlet.java (revision 1362276)
+++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterStatusServlet.java (working copy)
@@ -36,7 +36,9 @@
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.hadoop.hbase.util.FSUtils;
+import org.apache.hadoop.hbase.protobuf.RequestConverter;
import org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl;
+import com.google.protobuf.ServiceException;
/**
* The servlet responsible for rendering the index page of the
@@ -65,13 +67,20 @@
Set deadServers = master.getServerManager().getDeadServers();
response.setContentType("text/html");
- MasterStatusTmpl tmpl = new MasterStatusTmpl()
+ MasterStatusTmpl tmpl;
+ try {
+ tmpl = new MasterStatusTmpl()
.setFrags(frags)
.setShowAppendWarning(shouldShowAppendWarning(conf))
.setRootLocation(rootLocation)
.setMetaLocation(metaLocation)
.setServers(servers)
- .setDeadServers(deadServers);
+ .setDeadServers(deadServers)
+ .setCatalogJanitorEnabled(master.isCatalogJanitorEnabled(null,
+ RequestConverter.buildIsCatalogJanitorEnabledRequest()).getValue());
+ } catch (ServiceException s) {
+ throw new IOException(s);
+ }
if (request.getParameter("filter") != null)
tmpl.setFilter(request.getParameter("filter"));
if (request.getParameter("format") != null)