Author: stack
Date: Thu Sep 2 17:31:48 2010
New Revision: 992027
URL: http://svn.apache.org/viewvc?rev=992027&view=rev
Log:
HBASE-2799 'Append not enabled' warning should not show if hbase root dir isn't
on DFS
Added:
hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestFSUtils.java
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java
hbase/trunk/src/main/resources/hbase-webapps/master/master.jsp
Modified: hbase/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=992027&r1=992026&r2=992027&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Thu Sep 2 17:31:48 2010
@@ -498,6 +498,8 @@ Release 0.21.0 - Unreleased
HBASE-2954 Fix broken build caused by hbase-2692 commit
HBASE-2918 SequenceFileLogWriter doesnt make it clear if there is no
append by config or by missing lib/feature
+ HBASE-2799 "Append not enabled" warning should not show if hbase
+ root dir isn't on DFS
IMPROVEMENTS
HBASE-1760 Cleanup TODOs in HTable
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java?rev=992027&r1=992026&r2=992027&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java
(original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java Thu Sep
2 17:31:48 2010
@@ -590,6 +590,16 @@ public class FSUtils {
return append;
}
+ /**
+ * @param conf
+ * @return True if this filesystem whose scheme is 'hdfs'.
+ * @throws IOException
+ */
+ public static boolean isHDFS(final Configuration conf) throws IOException {
+ FileSystem fs = FileSystem.get(conf);
+ String scheme = fs.getUri().getScheme();
+ return scheme.equalsIgnoreCase("hdfs");
+ }
/*
* Recover file lease. Used when a file might be suspect to be had been left
open by another process. <code>p</code>
Modified: hbase/trunk/src/main/resources/hbase-webapps/master/master.jsp
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/resources/hbase-webapps/master/master.jsp?rev=992027&r1=992026&r2=992027&view=diff
==============================================================================
--- hbase/trunk/src/main/resources/hbase-webapps/master/master.jsp (original)
+++ hbase/trunk/src/main/resources/hbase-webapps/master/master.jsp Thu Sep 2
17:31:48 2010
@@ -47,7 +47,7 @@
for details.
</div>
<% } %>
-<% if (!FSUtils.isAppendSupported(conf)) { %>
+<% if (!FSUtils.isAppendSupported(conf) && FSUtils.isHDFS(conf)) { %>
<div class="warning">
You are currently running the HMaster without HDFS append support enabled.
This may result in data loss.
Added: hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestFSUtils.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestFSUtils.java?rev=992027&view=auto
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestFSUtils.java
(added)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestFSUtils.java Thu
Sep 2 17:31:48 2010
@@ -0,0 +1,48 @@
+/**
+ * Copyright 2010 The Apache Software Foundation
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase.util;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hdfs.MiniDFSCluster;
+import org.junit.Test;
+
+/**
+ * Test {...@link FSUtils}.
+ */
+public class TestFSUtils {
+ @Test public void testIsHDFS() throws Exception {
+ HBaseTestingUtility htu = new HBaseTestingUtility();
+ htu.getConfiguration().setBoolean("dfs.support.append", false);
+ assertFalse(FSUtils.isHDFS(htu.getConfiguration()));
+ assertFalse(FSUtils.isAppendSupported(htu.getConfiguration()));
+ htu.getConfiguration().setBoolean("dfs.support.append", true);
+ MiniDFSCluster cluster = null;
+ try {
+ cluster = htu.startMiniDFSCluster(1);
+ assertTrue(FSUtils.isHDFS(htu.getConfiguration()));
+ assertTrue(FSUtils.isAppendSupported(htu.getConfiguration()));
+ } finally {
+ if (cluster != null) cluster.shutdown();
+ }
+ }
+}
