From c575e18ab82627b5f352caa10d964828fc5c0b6a Mon Sep 17 00:00:00 2001 From: Misty Stanley-Jones Date: Mon, 2 Nov 2015 15:48:36 +1000 Subject: [PATCH] HBASE-14481 Deprecate HBase Wiki We have an awesome community resource in our online book. It's maintained and looked after with diligence. We also have an HBase section on the hadoop wiki that hasn't been updated since 2012. Let's sift through the pages of the wiki, bring over any content that's still relevant and not already present in the book, and kill the wiki. --- conf/hbase-env.cmd | 2 +- conf/hbase-env.sh | 2 +- hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp | 2 +- .../apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon | 2 +- hbase-server/src/main/javadoc/overview.html | 1 - .../src/main/resources/hbase-webapps/thrift/thrift.jsp | 2 +- .../java/org/apache/hadoop/hbase/HBaseTestingUtility.java | 2 +- .../src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java | 2 +- .../src/main/resources/hbase-webapps/thrift/thrift.jsp | 2 +- src/main/asciidoc/_chapters/preface.adoc | 5 ++++- src/main/asciidoc/_chapters/thrift_filter_language.adoc | 1 - 11 files changed, 12 insertions(+), 11 deletions(-) diff --git a/conf/hbase-env.cmd b/conf/hbase-env.cmd index 9fb87d77b98..a40be8e44b3 100644 --- a/conf/hbase-env.cmd +++ b/conf/hbase-env.cmd @@ -37,7 +37,7 @@ @rem Extra Java runtime options. @rem Below are what we set by default. May only work with SUN JVM. @rem For more on why as well as other possible settings, -@rem see http://wiki.apache.org/hadoop/PerformanceTuning +@rem see http://hbase.apache.org/book.html#performance @rem JDK6 on Windows has a known bug for IPv6, use preferIPv4Stack unless JDK7. @rem @rem See TestIPv6NIOServerSocketChannel. set HBASE_OPTS="-XX:+UseConcMarkSweepGC" "-Djava.net.preferIPv4Stack=true" diff --git a/conf/hbase-env.sh b/conf/hbase-env.sh index b7d00d169fe..5ce959bd1cd 100644 --- a/conf/hbase-env.sh +++ b/conf/hbase-env.sh @@ -39,7 +39,7 @@ # Extra Java runtime options. # Below are what we set by default. May only work with SUN JVM. # For more on why as well as other possible settings, -# see http://wiki.apache.org/hadoop/PerformanceTuning +# see http://hbase.apache.org/book.html#performance export HBASE_OPTS="-XX:+UseConcMarkSweepGC" # Configure PermSize. Only needed in JDK7. You can safely remove it for JDK8+ diff --git a/hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp b/hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp index afc0b2f2a22..e0027493fa7 100644 --- a/hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp +++ b/hbase-rest/src/main/resources/hbase-webapps/rest/rest.jsp @@ -105,7 +105,7 @@ String listenPort = conf.get("hbase.rest.port", "8080");
-Apache HBase Wiki on REST +Apache HBase documentation about REST
diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon index 6704eae9ed8..d3685d8797b 100644 --- a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon +++ b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon @@ -150,7 +150,7 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
Your current JVM version <% System.getProperty("java.version") %> is known to be unstable with HBase. Please see the - HBase wiki + HBase Reference Guide for details.
diff --git a/hbase-server/src/main/javadoc/overview.html b/hbase-server/src/main/javadoc/overview.html index c5e743c7362..8b7f9186969 100644 --- a/hbase-server/src/main/javadoc/overview.html +++ b/hbase-server/src/main/javadoc/overview.html @@ -48,7 +48,6 @@ section of the HBase Book. diff --git a/hbase-server/src/main/resources/hbase-webapps/thrift/thrift.jsp b/hbase-server/src/main/resources/hbase-webapps/thrift/thrift.jsp index 4651ad04a94..fa98f05c1ac 100644 --- a/hbase-server/src/main/resources/hbase-webapps/thrift/thrift.jsp +++ b/hbase-server/src/main/resources/hbase-webapps/thrift/thrift.jsp @@ -126,7 +126,7 @@ String framed = conf.get("hbase.regionserver.thrift.framed", "false");
- Apache HBase Wiki on Thrift + Apache HBase Reference Guide chapter on Thrift
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java index 473419e1074..021f626f579 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java @@ -2590,7 +2590,7 @@ public class HBaseTestingUtility extends HBaseCommonTestingUtility { /** * Expire a ZooKeeper session as recommended in ZooKeeper documentation - * http://wiki.apache.org/hadoop/ZooKeeper/FAQ#A4 + * http://hbase.apache.org/book.html#trouble.zookeeper * There are issues when doing this: * [1] http://www.mail-archive.com/dev@zookeeper.apache.org/msg01942.html * [2] https://issues.apache.org/jira/browse/ZOOKEEPER-1105 diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java index 6d4cab30223..4e1599a9882 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java @@ -135,7 +135,7 @@ public class TestZooKeeper { /** - * See HBASE-1232 and http://wiki.apache.org/hadoop/ZooKeeper/FAQ#4. + * See HBASE-1232 and http://hbase.apache.org/book.html#trouble.zookeeper. * @throws IOException * @throws InterruptedException */ diff --git a/hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp b/hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp index d5425ab488e..97b948f778a 100644 --- a/hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp +++ b/hbase-thrift/src/main/resources/hbase-webapps/thrift/thrift.jsp @@ -126,7 +126,7 @@ String framed = conf.get("hbase.regionserver.thrift.framed", "false");
- Apache HBase Wiki on Thrift + Apache HBase Reference Guide chapter on Thrift
diff --git a/src/main/asciidoc/_chapters/preface.adoc b/src/main/asciidoc/_chapters/preface.adoc index 960fcc4a5c8..b2a7ef00f84 100644 --- a/src/main/asciidoc/_chapters/preface.adoc +++ b/src/main/asciidoc/_chapters/preface.adoc @@ -29,7 +29,10 @@ This is the official reference guide for the link:http://hbase.apache.org/[HBase] version it ships with. -Herein you will find either the definitive documentation on an HBase topic as of its standing when the referenced HBase version shipped, or it will point to the location in link:http://hbase.apache.org/apidocs/index.html[Javadoc], link:https://issues.apache.org/jira/browse/HBASE[JIRA] or link:http://wiki.apache.org/hadoop/Hbase[wiki] where the pertinent information can be found. +Herein you will find either the definitive documentation on an HBase topic as of its +standing when the referenced HBase version shipped, or it will point to the location +in link:http://hbase.apache.org/apidocs/index.html[Javadoc] or +link:https://issues.apache.org/jira/browse/HBASE[JIRA] where the pertinent information can be found. .About This Guide This reference guide is a work in progress. The source for this guide can be found in the _src/main/asciidoc directory of the HBase source. This reference guide is marked up using link:http://asciidoc.org/[AsciiDoc] from which the finished guide is generated as part of the 'site' build target. Run diff --git a/src/main/asciidoc/_chapters/thrift_filter_language.adoc b/src/main/asciidoc/_chapters/thrift_filter_language.adoc index ed099cd0310..da36ceaad6a 100644 --- a/src/main/asciidoc/_chapters/thrift_filter_language.adoc +++ b/src/main/asciidoc/_chapters/thrift_filter_language.adoc @@ -31,7 +31,6 @@ Apache link:http://thrift.apache.org/[Thrift] is a cross-platform, cross-language development framework. HBase includes a Thrift API and filter language. The Thrift API relies on client and server processes. -Documentation about the HBase Thrift API is located at http://wiki.apache.org/hadoop/Hbase/ThriftApi. You can configure Thrift for secure authentication at the server and client side, by following the procedures in <> and <>.