You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ra...@apache.org on 2023/03/31 22:48:17 UTC
[hbase-operator-tools] branch master updated: HBASE-27751 TestMissingTableDescriptorGenerator fails with HBase 2.5.3 (#113)
This is an automated email from the ASF dual-hosted git repository.
rajeshbabu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase-operator-tools.git
The following commit(s) were added to refs/heads/master by this push:
new 30e3997 HBASE-27751 TestMissingTableDescriptorGenerator fails with HBase 2.5.3 (#113)
30e3997 is described below
commit 30e39974a0211223a9dad86561037c6688fa500a
Author: Nihal Jain <ni...@gmail.com>
AuthorDate: Sat Apr 1 04:18:12 2023 +0530
HBASE-27751 TestMissingTableDescriptorGenerator fails with HBase 2.5.3 (#113)
---
.../src/main/java/org/apache/hbase/HBCKFsTableDescriptors.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/hbase-hbck2/src/main/java/org/apache/hbase/HBCKFsTableDescriptors.java b/hbase-hbck2/src/main/java/org/apache/hbase/HBCKFsTableDescriptors.java
index 0c07f95..3f1d90a 100644
--- a/hbase-hbck2/src/main/java/org/apache/hbase/HBCKFsTableDescriptors.java
+++ b/hbase-hbck2/src/main/java/org/apache/hbase/HBCKFsTableDescriptors.java
@@ -212,12 +212,12 @@ public class HBCKFsTableDescriptors {
}
/**
- * Regex to eat up sequenceid suffix on a .tableinfo file.
+ * Regex to eat up sequenceid suffix and file size suffix on a .tableinfo file.
* Use regex because may encounter oldstyle .tableinfos where there is no
- * sequenceid on the end.
+ * sequenceid nor filesize at the end.
*/
- private static final Pattern TABLEINFO_FILE_REGEX =
- Pattern.compile(TABLEINFO_FILE_PREFIX + "(\\.([0-9]{" + WIDTH_OF_SEQUENCE_ID + "}))?$");
+ private static final Pattern TABLEINFO_FILE_REGEX = Pattern.compile(
+ TABLEINFO_FILE_PREFIX + "(\\.([0-9]{" + WIDTH_OF_SEQUENCE_ID + "}))?" + "(\\.([0-9]+))?$");
/**
* @param p Path to a <code>.tableinfo</code> file.
@@ -445,7 +445,6 @@ public class HBCKFsTableDescriptors {
Path p = writeTableDescriptor(fs, htd, tableDir, status);
return p != null;
}
-
}