You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2024/09/16 13:13:22 UTC

(hbase) branch master updated: HBASE-28812 Upgrade from 2.6.0 to 3.0.0 crashed (#6209)

This is an automated email from the ASF dual-hosted git repository.

zhangduo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/master by this push:
     new 7f2bb954264 HBASE-28812 Upgrade from 2.6.0 to 3.0.0 crashed (#6209)
7f2bb954264 is described below

commit 7f2bb95426487e215f1396ef577897bd4d82c97f
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Mon Sep 16 21:13:16 2024 +0800

    HBASE-28812 Upgrade from 2.6.0 to 3.0.0 crashed (#6209)
    
    Signed-off-by: Nick Dimiduk <nd...@apache.org>
---
 .../hadoop/hbase/io/hfile/FixedFileTrailer.java     | 21 +++++++++++++++------
 .../hadoop/hbase/io/hfile/TestFixedFileTrailer.java |  7 +++++++
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/FixedFileTrailer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/FixedFileTrailer.java
index 72340eeead4..13a93b84bd4 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/FixedFileTrailer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/FixedFileTrailer.java
@@ -553,14 +553,23 @@ public class FixedFileTrailer {
   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 (
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestFixedFileTrailer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestFixedFileTrailer.java
index 5c4767b2a67..b37c2bf7e75 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestFixedFileTrailer.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestFixedFileTrailer.java
@@ -100,8 +100,13 @@ public class TestFixedFileTrailer {
 
   @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,
@@ -110,8 +115,10 @@ public class TestFixedFileTrailer {
       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"));