Skip to content

HBASE-28812 Upgrade from 2.6.0 to 3.0.0 crashed #6209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Apache9 merged 1 commit into from
Sep 16, 2024
Merged

HBASE-28812 Upgrade from 2.6.0 to 3.0.0 crashed #6209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/FixedFileTrailer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,14 +553,23 @@ public void setComparatorClass(Class<? extends CellComparator> klass) {
private static Class<? extends CellComparator> getComparatorClass(String comparatorClassName)
throws IOException {
Class<? extends CellComparator> comparatorKlass;
// for BC
if (comparatorClassName.equals("org.apache.hadoop.hbase.CellComparator")) {
// for backward compatibility
// We will force comparator class name to be "KeyValue$KVComparator" and
// "KeyValue$MetaComparator" on 2.x although we do not use them on newer 2.x versions, for
// maintaining compatibility while upgrading and downgrading between different 2.x versions. So
// here on 3.x, we still need to check these two class names although the actual classes have
// already been purged.
if (
comparatorClassName.equals("org.apache.hadoop.hbase.KeyValue$KVComparator")
|| comparatorClassName.equals("org.apache.hadoop.hbase.CellComparator")
) {
comparatorKlass = InnerStoreCellComparator.class;
} else if (
comparatorClassName.equals("org.apache.hadoop.hbase.CellComparator$MetaCellComparator")
|| (comparatorClassName
.equals("org.apache.hadoop.hbase.CellComparatorImpl$MetaCellComparator"))
|| (comparatorClassName.equals("org.apache.hadoop.hbase.MetaCellComparator"))
comparatorClassName.equals("org.apache.hadoop.hbase.KeyValue$MetaComparator")
|| comparatorClassName.equals("org.apache.hadoop.hbase.CellComparator$MetaCellComparator")
|| comparatorClassName
.equals("org.apache.hadoop.hbase.CellComparatorImpl$MetaCellComparator")
|| comparatorClassName.equals("org.apache.hadoop.hbase.MetaCellComparator")
) {
comparatorKlass = MetaCellComparator.class;
} else if (
Expand Down
7 changes: 7 additions & 0 deletions hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestFixedFileTrailer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,13 @@ public void setUp() throws IOException {

@Test
public void testCreateComparator() throws IOException {
assertEquals(InnerStoreCellComparator.class,
createComparator("org.apache.hadoop.hbase.KeyValue$KVComparator").getClass());
assertEquals(InnerStoreCellComparator.class,
createComparator(CellComparator.class.getName()).getClass());

assertEquals(MetaCellComparator.class,
createComparator("org.apache.hadoop.hbase.KeyValue$MetaComparator").getClass());
assertEquals(MetaCellComparator.class,
createComparator("org.apache.hadoop.hbase.CellComparator$MetaCellComparator").getClass());
assertEquals(MetaCellComparator.class,
Expand All @@ -110,8 +115,10 @@ public void testCreateComparator() throws IOException {
createComparator(MetaCellComparator.META_COMPARATOR.getClass().getName()).getClass());
assertEquals(MetaCellComparator.META_COMPARATOR.getClass(),
createComparator(MetaCellComparator.META_COMPARATOR.getClass().getName()).getClass());

assertEquals(CellComparatorImpl.COMPARATOR.getClass(),
createComparator(MetaCellComparator.COMPARATOR.getClass().getName()).getClass());

assertNull(createComparator(Bytes.BYTES_RAWCOMPARATOR.getClass().getName()));
assertNull(createComparator("org.apache.hadoop.hbase.KeyValue$RawBytesComparator"));

Expand Down