From 3ec3df5887e9271f7e75779eafe2439012cfb2c3 Mon Sep 17 00:00:00 2001 From: Duo Zhang Date: Sun, 9 Jan 2022 00:29:25 +0800 Subject: [PATCH] HBASE-26006 Update ref guide about the 2.4.x release line (#3992) Amending-Author: Duo Zhang Signed-off-by: Josh Elser Signed-off-by: Sean Busbey Reviewed-by: Nick Dimiduk --- src/main/asciidoc/_chapters/community.adoc | 3 +++ .../asciidoc/_chapters/configuration.adoc | 14 ++++++------ src/main/asciidoc/_chapters/developer.adoc | 22 +++++++++---------- src/main/asciidoc/_chapters/upgrading.adoc | 5 +++++ 4 files changed, 26 insertions(+), 18 deletions(-) diff --git a/src/main/asciidoc/_chapters/community.adoc b/src/main/asciidoc/_chapters/community.adoc index 6ad0083e0f4..5e393740751 100644 --- a/src/main/asciidoc/_chapters/community.adoc +++ b/src/main/asciidoc/_chapters/community.adoc @@ -93,6 +93,9 @@ NOTE: End-of-life releases are not included in this list. | 2.3 | Nick Dimiduk +| 2.4 +| Andrew Purtell + |=== [[hbase.commit.msg.format]] diff --git a/src/main/asciidoc/_chapters/configuration.adoc b/src/main/asciidoc/_chapters/configuration.adoc index ecfff5d9452..7f859a4e261 100644 --- a/src/main/asciidoc/_chapters/configuration.adoc +++ b/src/main/asciidoc/_chapters/configuration.adoc @@ -289,14 +289,14 @@ Use the following legend to interpret this table: link:https://hadoop.apache.org/cve_list.html[CVEs] so we drop the support in newer minor releases * icon:exclamation-circle[role="yellow"] = Not tested, may/may-not function -[cols="1,2*^.^", options="header"] +[cols="1,3*^.^", options="header"] |=== -| | HBase-1.7.x | HBase-2.3.x -|Hadoop-2.10.x | icon:check-circle[role="green"] | icon:check-circle[role="green"] -|Hadoop-3.1.0 | icon:times-circle[role="red"] | icon:times-circle[role="red"] -|Hadoop-3.1.1+ | icon:times-circle[role="red"] | icon:check-circle[role="green"] -|Hadoop-3.2.x | icon:times-circle[role="red"] | icon:check-circle[role="green"] -|Hadoop-3.3.x | icon:times-circle[role="red"] | icon:check-circle[role="green"] +| | HBase-1.7.x | HBase-2.3.x | HBase-2.4.x +|Hadoop-2.10.x | icon:check-circle[role="green"] | icon:check-circle[role="green"] | icon:check-circle[role="green"] +|Hadoop-3.1.0 | icon:times-circle[role="red"] | icon:times-circle[role="red"] | icon:times-circle[role="red"] +|Hadoop-3.1.1+ | icon:times-circle[role="red"] | icon:check-circle[role="green"] | icon:check-circle[role="green"] +|Hadoop-3.2.x | icon:times-circle[role="red"] | icon:check-circle[role="green"] | icon:check-circle[role="green"] +|Hadoop-3.3.x | icon:times-circle[role="red"] | icon:check-circle[role="green"] | icon:check-circle[role="green"] |=== .Hadoop 2.y.0 Releases diff --git a/src/main/asciidoc/_chapters/developer.adoc b/src/main/asciidoc/_chapters/developer.adoc index 04b1a1bf4e7..82af29dc52e 100644 --- a/src/main/asciidoc/_chapters/developer.adoc +++ b/src/main/asciidoc/_chapters/developer.adoc @@ -436,27 +436,27 @@ git checkout branch-1 mvn -Dhadoop-two.version=2.10.0 ... ---- -.Example 2, Building HBase 2.3 against Hadoop 3.3.0-SNAPSHOT +.Example 2, Building HBase 2.3 or 2.4 against Hadoop 3.4.0-SNAPSHOT -This is how a developer might check the compatibility of HBase 2.3 against an unreleased Hadoop -version (currently 3.3). Both the Hadoop3 profile and version must be specified: +This is how a developer might check the compatibility of HBase 2.3 or 2.4 against an unreleased +Hadoop version (currently 3.4). Both the Hadoop3 profile and version must be specified: [source,bourne] ---- -git checkout branch-2.3 -mvn -Dhadoop.profile=3.0 -Dhadoop-three.version=3.3.0-SNAPSHOT ... +git checkout branch-2.4 +mvn -Dhadoop.profile=3.0 -Dhadoop-three.version=3.4.0-SNAPSHOT ... ---- -.Example 3, Building HBase 3.0 against Hadoop 3.3.0-SNAPSHOT +.Example 3, Building HBase 3.0 against Hadoop 3.4.0-SNAPSHOT The same developer might want also to check the development version of HBase (currently 3.0) -against the development version of Hadoop (currently 3.3). In this case, the Hadoop3 profile is +against the development version of Hadoop (currently 3.4). In this case, the Hadoop3 profile is active by default, so only `hadoop-three.version` must be specified: [source,bourne] ---- git checkout master -mvn -Dhadoop-three.version=3.3.0-SNAPSHOT ... +mvn -Dhadoop-three.version=3.4.0-SNAPSHOT ... ---- [[maven.build.jdk11_hadoop3]] @@ -472,13 +472,13 @@ For details on Hadoop profile activation by HBase branch, see <>. See <> for a complete support matrix of Java version by HBase version. -.Example 1, Building HBase 2.3 with JDK11 +.Example 1, Building HBase 2.3 or 2.4 with JDK11 -To build HBase 2.3 with JDK11, the Hadoop3 profile must be activated explicitly. +To build HBase 2.3 or 2.4 with JDK11, the Hadoop3 profile must be activated explicitly. [source,bourne] ---- -git checkout branch-2.3 +git checkout branch-2.4 JAVA_HOME=/usr/lib/jvm/java-11 mvn -Dhadoop.profile=3.0 ... ---- diff --git a/src/main/asciidoc/_chapters/upgrading.adoc b/src/main/asciidoc/_chapters/upgrading.adoc index 6d25b960e07..db69bf48dda 100644 --- a/src/main/asciidoc/_chapters/upgrading.adoc +++ b/src/main/asciidoc/_chapters/upgrading.adoc @@ -327,6 +327,11 @@ Quitting... The RegionServer Grouping feature has been reimplemented. See section <> in <> for more details. +[[upgrade2.4]] +There is no special consideration upgrading to hbase-2.4.x from 2.3.x. And for earlier versions, +just follow the <> guide. In general, 2.2.x should be rolling upgradeable, for 2.1.x +or 2.0.x, you will need to clear the <> hurdle first. + [[upgrade2.3]] === Upgrade from 2.0.x-2.2.x to 2.3+ There is no special consideration upgrading to hbase-2.3.x from earlier versions. From 2.2.x, it should be