This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new c3528348f52 HBASE-29282 Regions are left in CLOSED state after merging
(#6971)
c3528348f52 is described below
commit c3528348f5240f5a7200c6303923c6c212ebe681
Author: Duo Zhang <[email protected]>
AuthorDate: Fri May 9 23:00:25 2025 +0800
HBASE-29282 Regions are left in CLOSED state after merging (#6971)
Signed-off-by: Reid Chan <[email protected]>
---
.../src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java | 2 +-
pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
b/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
index efd5a83b9eb..2ef70daab0a 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
@@ -1556,7 +1556,7 @@ public class MetaTableAccessor {
public static void mergeRegions(Connection connection, RegionInfo
mergedRegion,
Map<RegionInfo, Long> parentSeqNum, ServerName sn, int regionReplication)
throws IOException {
try (Table meta = getMetaHTable(connection)) {
- long time = HConstants.LATEST_TIMESTAMP;
+ long time = EnvironmentEdgeManager.currentTime();
List<Mutation> mutations = new ArrayList<>();
List<RegionInfo> replicationParents = new ArrayList<>();
for (Map.Entry<RegionInfo, Long> e : parentSeqNum.entrySet()) {
diff --git a/pom.xml b/pom.xml
index 82affd421d6..699b0975627 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
(in particular, if you are doing it for the first time), instead do
'mvn package'. If you are interested in the full story, see
https://issues.apache.org/jira/browse/HBASE-6795.
-
+for triggering tests
-->
<modelVersion>4.0.0</modelVersion>
<parent>