Author: stack Date: Sat May 25 17:18:51 2013 New Revision: 1486347 URL: http://svn.apache.org/r1486347 Log: HBASE-8622 Remove ' You are currently running the HMaster without HDFS append support enabled. This may result in data loss. Please see the HBase wiki for details. ' from UI
Modified: hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterStatusServlet.java Modified: hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon?rev=1486347&r1=1486346&r2=1486347&view=diff ============================================================================== --- hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon (original) +++ hbase/branches/0.95/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon Sat May 25 17:18:51 2013 @@ -23,7 +23,6 @@ Map<String, Integer> frags = null; ServerName metaLocation = null; List<ServerName> servers = null; Set<ServerName> deadServers = null; -boolean showAppendWarning = false; boolean catalogJanitorEnabled = true; String filter = "general"; String format = "html"; @@ -108,14 +107,6 @@ org.apache.hadoop.hbase.protobuf.generat for details. </div> </%if> - <%if showAppendWarning %> - <div class="alert alert-error"> - You are currently running the HMaster without HDFS append support enabled. - This may result in data loss. - Please see the <a href="http://wiki.apache.org/hadoop/Hbase/HdfsSyncSupport">HBase wiki</a> - for details. - </div> - </%if> <%if master.isInitialized() && !catalogJanitorEnabled %> <div class="alert alert-error"> Please note that your cluster is running with the CatalogJanitor disabled. It can be Modified: hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterStatusServlet.java URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterStatusServlet.java?rev=1486347&r1=1486346&r2=1486347&view=diff ============================================================================== --- hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterStatusServlet.java (original) +++ hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterStatusServlet.java Sat May 25 17:18:51 2013 @@ -54,12 +54,12 @@ public class MasterStatusServlet extends { HMaster master = (HMaster) getServletContext().getAttribute(HMaster.MASTER); assert master != null : "No Master in context!"; - + Configuration conf = master.getConfiguration(); - HBaseAdmin admin = new HBaseAdmin(conf); - + HBaseAdmin admin = new HBaseAdmin(conf); + Map<String, Integer> frags = getFragmentationInfo(master, conf); - + ServerName metaLocation = getMetaLocationOrNull(master); //ServerName metaLocation = master.getCatalogTracker().getMetaLocation(); List<ServerName> servers = master.getServerManager().getOnlineServersList(); @@ -70,7 +70,6 @@ public class MasterStatusServlet extends try { tmpl = new MasterStatusTmpl() .setFrags(frags) - .setShowAppendWarning(shouldShowAppendWarning(conf)) .setMetaLocation(metaLocation) .setServers(servers) .setDeadServers(deadServers) @@ -99,20 +98,11 @@ public class MasterStatusServlet extends private Map<String, Integer> getFragmentationInfo( HMaster master, Configuration conf) throws IOException { boolean showFragmentation = conf.getBoolean( - "hbase.master.ui.fragmentation.enabled", false); + "hbase.master.ui.fragmentation.enabled", false); if (showFragmentation) { return FSUtils.getTableFragmentation(master); } else { return null; } } - - static boolean shouldShowAppendWarning(Configuration conf) { - try { - return !FSUtils.isAppendSupported(conf) && FSUtils.isHDFS(conf); - } catch (IOException e) { - LOG.warn("Unable to determine if append is supported", e); - return false; - } - } }