You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2019/03/04 20:45:38 UTC
[hbase] branch branch-2.0 updated (f03f81d -> e1d5962)
This is an automated email from the ASF dual-hosted git repository.
stack pushed a change to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/hbase.git.
from f03f81d HBASE-21094 Remove the explicit timeout config for TestTruncateTableProcedure
new 6e862c2 HBASE-21988 Remove hadoop2.6.1-hadoop-2.6.4 as supported on branch-2.0
new e1d5962 HBASE-21989 Revert HBASE-21915 from branch-2.0
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
dev-support/hbase-personality.sh | 2 +-
.../src/main/java/org/apache/hadoop/hbase/io/FileLink.java | 11 +----------
src/main/asciidoc/_chapters/configuration.adoc | 3 ++-
3 files changed, 4 insertions(+), 12 deletions(-)
[hbase] 02/02: HBASE-21989 Revert HBASE-21915 from branch-2.0
Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
stack pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit e1d5962b4ea245a6e5a896b8ea8552872a8b6416
Author: stack <st...@apache.org>
AuthorDate: Mon Mar 4 12:45:11 2019 -0800
HBASE-21989 Revert HBASE-21915 from branch-2.0
Revert "HBASE-21915 Make FileLinkInputStream implement CanUnbuffer"
This reverts commit 724188246362a737404cc55da0996c543f295e46.
---
.../src/main/java/org/apache/hadoop/hbase/io/FileLink.java | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/FileLink.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/FileLink.java
index 36e086a..42f3483 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/FileLink.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/FileLink.java
@@ -31,7 +31,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.hadoop.fs.CanSetDropBehind;
import org.apache.hadoop.fs.CanSetReadahead;
-import org.apache.hadoop.fs.CanUnbuffer;
import org.apache.hadoop.fs.FSDataInputStream;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.FileStatus;
@@ -103,7 +102,7 @@ public class FileLink {
* and the alternative locations, when the file is moved.
*/
private static class FileLinkInputStream extends InputStream
- implements Seekable, PositionedReadable, CanSetDropBehind, CanSetReadahead, CanUnbuffer {
+ implements Seekable, PositionedReadable, CanSetDropBehind, CanSetReadahead {
private FSDataInputStream in = null;
private Path currentPath = null;
private long pos = 0;
@@ -282,14 +281,6 @@ public class FileLink {
return false;
}
- @Override
- public void unbuffer() {
- if (in == null) {
- return;
- }
- in.unbuffer();
- }
-
/**
* Try to open the file from one of the available locations.
*
[hbase] 01/02: HBASE-21988 Remove hadoop2.6.1-hadoop-2.6.4 as
supported on branch-2.0
Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
stack pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 6e862c2c6098371da50215f761ee514e26e4fd53
Author: stack <st...@apache.org>
AuthorDate: Mon Mar 4 11:31:23 2019 -0800
HBASE-21988 Remove hadoop2.6.1-hadoop-2.6.4 as supported on branch-2.0
Remove support for versions of hadoop before 2.6.5 on branch-2.0.
Update the matrix in refguide and remove testing earlier versions from
yetus hbase personality.
---
dev-support/hbase-personality.sh | 2 +-
src/main/asciidoc/_chapters/configuration.adoc | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh
index ba5bc37..aff386c 100755
--- a/dev-support/hbase-personality.sh
+++ b/dev-support/hbase-personality.sh
@@ -488,7 +488,7 @@ function hadoopcheck_rebuild
# All supported Hadoop versions that we want to test the compilation with
# See the Hadoop section on prereqs in the HBase Reference Guide
- hbase_common_hadoop2_versions="2.6.1 2.6.2 2.6.3 2.6.4 2.6.5 2.7.1 2.7.2 2.7.3 2.7.4"
+ hbase_common_hadoop2_versions="2.6.5 2.7.1 2.7.2 2.7.3 2.7.4"
if [[ "${PATCH_BRANCH}" = branch-1* ]]; then
yetus_info "Setting Hadoop versions to test based on branch-1-ish rules."
if [[ "${QUICK_HADOOPCHECK}" == "true" ]]; then
diff --git a/src/main/asciidoc/_chapters/configuration.adoc b/src/main/asciidoc/_chapters/configuration.adoc
index 6980a26..bdbaafb 100644
--- a/src/main/asciidoc/_chapters/configuration.adoc
+++ b/src/main/asciidoc/_chapters/configuration.adoc
@@ -223,7 +223,8 @@ Use the following legend to interpret this table:
|Hadoop-2.4.x | S | S | X | X | X
|Hadoop-2.5.x | S | S | X | X | X
|Hadoop-2.6.0 | X | X | X | X | X
-|Hadoop-2.6.1+ | S | S | X | S | X
+|Hadoop-2.6.1+ | S | S | X | X | X
+|Hadoop-2.6.5+ | S | S | X | S | X
|Hadoop-2.7.0 | X | X | X | X | X
|Hadoop-2.7.1+ | S | S | S | S | S
|Hadoop-2.8.[0-1] | X | X | X | X | X