Skip to content

Rebase HBASE-29164 to be up to date with the HBASE-28957_rebased branch #7706

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

Jump to bottom
Open
kgeisz wants to merge 93 commits into
base: HBASE-29164
Choose a base branch
from
Open

Rebase HBASE-29164 to be up to date with the HBASE-28957_rebased branch #7706

kgeisz wants to merge 93 commits into from

Conversation

@kgeisz
Copy link
Contributor

@kgeisz kgeisz commented Feb 4, 2026

No description provided.

charlesconnell and others added 30 commits September 12, 2025 10:52
@charlesconnell
HBASE-29573: Fully load QuotaCache instead of reading individual rows…
f72afc8 
… on demand (apache#7282)

Signed-off by: Ray Mattingly <rmattingly@apache.org>
@frostruan
HBASE-26974 Introduce a LogRollProcedure (apache#5408)
ffed09d 
Co-authored-by: huiruan <huiruan@tencent.com>
Signed-off-by: Duo Zhang <zhangduo@apache.org>
@frostruan
HBASE-27355 Separate meta read requests from master and client (apach…
89416ce 
…e#7261)

Co-authored-by: huiruan <huiruan@tencent.com>

Signed-off-by: Duo Zhang <zhangduo@apache.org>
Reviewed-by: Aman Poonia <aman.poonia.29@gmail.com>
@Apache9
HBASE-27157 Potential race condition in WorkerAssigner (apache#4577)
0d1ff8a 
Close apache#7299

Co-authored-by: Duo Zhang <zhangduo@apache.org>
Signed-off-by: Duo Zhang <zhangduo@apache.org>
Signed-off-by: Lijin Bin <binlijin@apache.org>
@wchevreuil
HBASE-29451 Add Docs section describing BucketCache Time based priori…
d592404 
…ty (apache#7289)

Signed-off-by: Dávid Paksy <paksyd@apache.org>
Reviewed-by: Kevin Geiszler <kevin.j.geiszler@gmail.com>
Reviewed-by: Tak Lon (Stephen) Wu <taklwu@apache.org>
@junegunn
HBASE-29577 Fix NPE from RegionServerRpcQuotaManager when reloading c…
1e06bcc 
…onfiguration (apache#7285)

Signed-off-by: Wellington Chevreuil <wchevreuil@apache.org>
Signed-off-by: Charles Connell <cconnell@apache.org>
@stoty
HBASE-29590 Use hadoop 3.4.2 as default hadooop3 dependency (apache#7301
3ce997c 
)

Signed-off-by: Nihal Jain <nihaljain@apache.org>
Signed-off-by: Duo Zhang <zhangduo@apache.org>
@hgromer
Modern backup failures can cause backup system to lock up (apache#7288)
c6a0c3b 
Co-authored-by: Hernan Gelaf-Romer <hgelafromer@hubspot.com>
Signed-off-by: Charles Connell <cconnell@apache.org>
Signed-off-by: Ray Mattingly <rmattingly@apache.org>
@rmdmattingly
Revert "Modern backup failures can cause backup system to lock up (ap…
7f7b9e6 
…ache#7288)" (apache#7307)

This reverts commit c6a0c3b.
@rmdmattingly @hgromer
HBASE-29448 Modern backup failures can cause backup system to lock up (…
0f11bec 
…apache#7308)

Co-authored-by: Hernan Romer <nanug33@gmail.com>
Co-authored-by: Hernan Gelaf-Romer <hgelafromer@hubspot.com>
Signed-off-by: Charles Connell <cconnell@apache.org>
Signed-off-by: Ray Mattingly <rmattingly@apache.org>
@stoty
HBASE-29548 Update ApacheDS to 2.0.0.AM27 and ldap-api to 2.1.7 (apac…
280e8e8 
…he#7305)

Signed-off-by: Nihal Jain <nihaljain@apache.org>
Signed-off-by: Duo Zhang <zhangduo@apache.org>
@stoty
HBASE-29602 Add -Djava.security.manager=allow to JDK18+ surefire JVM …
e1c17e5 
…flags (apache#7315)

Signed-off-by: Duo Zhang <zhangduo@apache.org>
Signed-off-by: Balazs Meszaros <meszibalu@apache.org>
@stoty
HBASE-29601 Handle Junit 5 tests in TestCheckTestClasses (apache#7311)
620f7a3 
Signed-off-by: Duo Zhang <zhangduo@apache.org>
@stoty
HBASE-29592 Add hadoop 3.4.2 in client integration tests (apache#7306)
40b1ffc 
Signed-off-by: Nihal Jain <nihaljain@apache.org>
Signed-off-by: Duo Zhang <zhangduo@apache.org>
@srinireddy2020
HBASE-29587 Set Test category for TestSnapshotProcedureEarlyExpiration (
8799c13 
apache#7292)

Signed-off-by: Dávid Paksy <paksyd@apache.org>
@stoty
HBASE-29610 Add and use String constants for Junit 5 @tag annotations (…
8adb7bd 
…apache#7322)

Signed-off-by: Duo Zhang <zhangduo@apache.org>
@Apache9
HBASE-29591 Add hadoop 3.4.2 in hadoop check (apache#7320)
da7325b 
Signed-off-by: Istvan Toth <stoty@apache.org>
@PDavid
HBASE-29609 Upgrade checkstyle and Maven checkstyle plugin (apache#7321)
04d48ee 
Signed-off-by: Istvan Toth <stoty@apache.org>
@Apache9
HBASE-29608 Add test to make sure we do not have copy paste errors in…
42fc87d 
… the TAG value (apache#7324)

Signed-off-by: Istvan Toth <stoty@apache.org>
@Apache9
HBASE-29608 Addendum remove jdk9+ only API calls
d6e68b1
@PDavid
Revert "HBASE-29609 Upgrade checkstyle and Maven checkstyle plugin (a…
fd7a84f 
…pache#7321)" (apache#7332)

This reverts commit 04d48ee.
@stoty
HBASE-29612 Remove HBaseTestingUtil.forceChangeTaskLogDir (apache#7326)
99b7e6c 
Co-authored-by: Daniel Roudnitsky <droudnitsky1@bloomberg.net>
Signed-off-by: Duo Zhang <zhangduo@apache.org>
@Apache9
HBASE-29576 Replicate HBaseClassTestRule functionality for Junit 5 (a…
1cd9f29 
…pache#7331)

Signed-off-by: Istvan Toth <stoty@apache.org>
@Apache9
HBASE-29576 Addendum fix typo Jupitor -> Jupiter
57e3d5e
@stoty
HBASE-29619 Don't use Java 14+ style case statements in RestoreBackup…
0a06e2b 
…SystemTableProcedure (apache#7336)

Signed-off-by: Dávid Paksy <paksyd@apache.org>
Signed-off-by: Duo Zhang <zhangduo@apache.org>
@stoty
HBASE-29550 Reflection error in TestRSGroupsKillRS with Java 21 (apac…
d108b8e 
…he#7327)

Signed-off-by: Duo Zhang <zhangduo@apache.org>
@stoty
HBASE-29615 Update Small tests description wrt reuseForks in docs (ap…
b5cdaab 
…ache#7335)

Signed-off-by: Duo Zhang <zhangduo@apache.org>
@hgromer
HBASE-28440 Add support for using mapreduce sort in HFileOutputFormat2 (
608c1b9 
apache#7294)

Co-authored-by: Hernan Gelaf-Romer <hgelafromer@hubspot.com>
Signed-off-by: Ray Mattingly <rmattingly@apache.org>
@wchevreuil
HBASE-29623 Blocks for CFs with BlockCache disabled may still get cac…
0960087 
…hed on write or compaction (apache#7339)

Signed-off-by: Peter Somogyi <psomogyi@apache.org>
@wchevreuil
HBASE-29627 Handle any block cache fetching errors when reading a blo…
67420e3 
…ck in HFileReaderImpl (apache#7341)

Signed-off-by: Peter Somogyi <psomogyi@apache.org>
vinayakphegde and others added 27 commits November 6, 2025 10:32
@vinayakphegde @anmolnar
HBASE-29210: Introduce Validation for PITR-Critical Backup Deletion (a…
912ef67 
…pache#6848)

Signed-off-by: Andor Molnár <andor@apache.org>
Signed-off-by: Wellington Chevreuil <wchevreuil@apache.org>
@vinayakphegde @anmolnar
HBASE-29261: Investigate flaw in backup deletion validation of PITR-c…
0e3b5e4 
…ritical backups and propose correct approach (apache#6922)

* improve the logic of backup deletion validation of PITR-critical backups

* add new tests
@vinayakphegde @anmolnar
HBASE-29133: Implement "pitr" Command for Point-in-Time Restore (apac…
c4bef9e 
…he#6717)

Signed-off-by: Andor Molnar <andor@apache.org>
Signed-off-by: Tak Lon (Stephen) Wu <taklwu@apache.org>
@vinayakphegde @anmolnar
HBASE-29255: Integrate backup WAL cleanup logic with the delete comma…
716dab8 
…nd (apache#7007)

* Store bulkload files in daywise bucket as well

* Integrate backup WAL cleanup logic with the delete command

* address the review comments

* address the review comments

* address the review comments

* add more unit tests to cover all cases

* address the review comments
@ankitsol @anmolnar
HBASE-28990 Modify Incremental Backup for Continuous Backup (apache#6788
b54da1b 
)

Signed-off-by: Tak Lon (Stephen) Wu <taklwu@apache.org>
Signed-off-by: Andor Molnár andor@apache.org
Reviewed by: Kota-SH <shanmukhaharipriya@gmail.com>
Reviewed by: Vinayak Hegde <vinayakph123@gmail.com>
Reviewed by: Kevin Geiszler <kevin.j.geiszler@gmail.com>
@vinayakphegde @anmolnar
HBASE-29350: Ensure Cleanup of Continuous Backup WALs After Last Back…
393602d 
…up is Force Deleted (apache#7090)

Signed-off-by: Tak Lon (Stephen) Wu <taklwu@apache.org>   
Reviewed by: Kevin Geiszler <kevin.j.geiszler@gmail.com>
@vinayakphegde @anmolnar
HBASE-29219 Ignore Empty WAL Files While Consuming Backed-Up WAL Files (
1a4c610 
apache#7106)

Signed-off-by: Tak Lon (Stephen) Wu <taklwu@apache.org>
Reviewed by: Kota-SH <shanmukhaharipriya@gmail.com>
Reviewed by: Kevin Geiszler <kevin.j.geiszler@gmail.com>
@vinayakphegde @anmolnar
HBASE-29406: Skip Copying Bulkloaded Files to Backup Location in Cont…
1a2ff7b 
…inuous Backup (apache#7119)

Signed-off-by: Tak Lon (Stephen) Wu <taklwu@apache.org>
Reviewed by: Kevin Geiszler <kevin.j.geiszler@gmail.com>
@ankitsol @anmolnar
HBASE-29449 Update backup describe command for continuous backup (apa…
27ea7b3 
…che#7045)

Signed-off-by: Tak Lon (Stephen) Wu <taklwu@apache.org>
Reviewed by: Kevin Geiszler <kevin.j.geiszler@gmail.com>
@vinayakphegde @anmolnar
HBASE-29445 Add Option to Specify Custom Backup Location in PITR (apa…
37e195a 
…che#7153)

Signed-off-by: Tak Lon (Stephen) Wu <taklwu@apache.org>
@vinayakphegde @anmolnar
HBASE-29441 ReplicationSourceShipper should delegate the empty wal en…
aa69616 
…tries handling to ReplicationEndpoint (apache#7145)

Signed-off-by: Tak Lon (Stephen) Wu <taklwu@apache.org>
@ankitsol @anmolnar
HBASE-29459 Capture bulkload files only till IncrCommittedWalTs durin…
a4cd71a 
…g Incremental Backup (apache#7166)

Signed-off-by: Tak Lon (Stephen) Wu <taklwu@apache.org>
Reviewed by: Kevin Geiszler <kevin.j.geiszler@gmail.com>
@ankitsol @anmolnar
HBASE-29310 Handle Bulk Load Operations in Continuous Backup (apache#…
3c5c999 
…7150)

Signed-off-by: Tak Lon (Stephen) Wu <taklwu@apache.org>
Reviewed by: Kevin Geiszler <kevin.j.geiszler@gmail.com>
@vinayakphegde @anmolnar
HBASE-28957 spotless apply after rebase
fa6b83f
@vinayakphegde @anmolnar
HBASE-29375 Add Unit Tests for BackupAdminImpl and Improve Test Granu…
3044b11 
…larity (apache#7171)

Signed-off-by: Tak Lon (Stephen) Wu <taklwu@apache.org>
Reviewed by: Kevin Geiszler <kevin.j.geiszler@gmail.com>
@vinayakphegde @anmolnar
HBASE-29519 Copy Bulkloaded Files in Continuous Backup (apache#7222)
176e8c6 
Signed-off-by: Tak Lon (Stephen) Wu <taklwu@apache.org>
Signed-off-by: Andor Molnár <andor@apache.org>
@vinayakphegde @anmolnar
HBASE-29524 Handle bulk-loaded HFiles in delete and cleanup process (a…
5d815b8 
…pache#7239)

Signed-off-by: Tak Lon (Stephen) Wu <taklwu@apache.org>
Reviewed by: Kota-SH <shanmukhaharipriya@gmail.com>
@ankitsol @anmolnar
[HBASE-29520] Utilize Backed-up Bulkloaded Files in Incremental Backup (
29c228a 
apache#7246)

Signed-off-by: Tak Lon (Stephen) Wu <taklwu@apache.org>
@anmolnar
Revert "HBASE-29310 Handle Bulk Load Operations in Continuous Backup (a…
9bd36d0 
…pache#7150)" (apache#7290)

This reverts commit 5ac2a73.
@vinayakphegde @anmolnar
HBASE-29521: Update Restore Command to Handle Bulkloaded Files (apach…
26f51a0 
…e#7300)

Signed-off-by: Tak Lon (Stephen) Wu <taklwu@apache.org>
Signed-off-by: Andor Molnár andor@apache.org
Reviewed by: Kevin Geiszler <kevin.j.geiszler@gmail.com>
Reviewed by: Kota-SH <shanmukhaharipriya@gmail.com>
@ankitsol @asolomonC @anmolnar
HBASE-29656 Scan WALs to identify bulkload operations for incremental…
12e1292 
… backup (apache#7400)

* Scan WALs to identify bulkload operations for incremental backup

* Update unit test

* Info log

* Minor test fix

* Address review comments

* Spotless apply

* Addressed review comment

* spotless

* Remove log

* Retrigger CI

---------

Co-authored-by: Ankit Solomon <asolomon@cloudera.com>
@anmolnar
HBASE-28957. Build + spotless fix
6aa212f
@kgeisz
HBASE-29826: Backup merge is failing because .backup.manifest cannot …
480fe04 
…be found (apache#7664)

Signed-off-by: Tak Lon (Stephen) Wu <taklwu@apache.org>
@kgeisz
HBASE-29825: Incremental backup is failing due to incorrect timezone (a…
fc752f7 
…pache#7683)

Change-Id: I8702eca4adc81bad2c18ea4990d09556c9506a34
@kgeisz
HBASE-29687: Extend IntegrationTestBackupRestore to handle continuous…
77962a3 
… backups (apache#7417)

* Extend IntegrationTestBackup restore into a base class with continuous and non-continuous subclasses

Change-Id: I0c70c417b86c7732b58642a51c75897c35b16cb6

* Add more test cases to runTestSingle for testContinuousBackupRestore

Change-Id: Id043400bf85c7b696bb94bef7cb17ed9dad13334

* Add more test cases for full continuous backup; Change while loop to a for loop

Change-Id: I5ba3276919e6bbdf343c134fa287c69f3854a8a2

* Add delete test case

Change-Id: I25fe484e9c227b7a31cb3768def3c12f66d617ac

* Start adding changes after looking at WIP PR in GitHub

Change-Id: Ie9aece8a3ec55739d618ebf2d2f173a41a116eb6

* Continue adding changes after looking at WIP PR in GitHub

Change-Id: Ie345e623089979f028b13aed13e5ec93e025eff8

* Run mvn spotless:apply

Change-Id: I98eb019dd93dfc8e21b6c730e0e2e60314102724

* Add documentation for runTestMulti and runTestSingle

Change-Id: I4de6fc485aa1ff6e0d8d837e081f8dde20bb3f67

* Update documentation

Change-Id: I911180a8f263f801a5c299d43d0215fe444f22d3

* Enhance delete test case

Change-Id: I78fe59f800cde7c89b11760a49d774c5173a862c

* Update method name to verifyBackupExistenceAfterMerge

Change-Id: Ia150d21f48bb160d9e8bcf922799dc18c0b7c77c

* Address review comments

Change-Id: I9d5b55e36b44367ac8ace08a5859c42b796fefd4

* Add wait for region servers in replication checkpoint to catch up with latest Put timestamp

Change-Id: Ic438ca292bc01827d46725e006bfa0c21bc95f01

* Handle command line arg parsing and conf setup in base class

Change-Id: I9d52e774e84dc389d42aa63315529a2590c40cb8

* Fix spotless error

Change-Id: I27eec25091842376ee7a059a9688c6f5ab385ac7

* Fix checkstyle errors for IntegrationTestBackupRestore.java

Change-Id: I18ab629df4af4e93b42ec1b0d576fd411279c775

* Remove initializeConfFromCommandLine()

Change-Id: Ibc96fd712e384cc3ca5a2c4575e47e65e62c60fa

* Change info log message to debug

Change-Id: Ie8e94ce978836b1314525138726a13641360aae6

* Run mvn spotless:apply

Change-Id: Ibeea379a65e801b60ec5124938b7aa17087025f0
@kgeisz
HBASE-29815: Fix issue where backup integration tests are not running…
01d74a1 
… in IntelliJ (apache#7625)

Signed-off-by: Tak Lon (Stephen) Wu <taklwu@apache.org>
@kgeisz
Merge branch 'HBASE-29164' into HBASE-29164_rebased
15487a6
@Apache-HBase
Copy link

Apache-HBase commented Feb 4, 2026

💔 -1 overall

Vote Subsystem Runtime Logfile Comment
+0 🆗 reexec 0m 0s Docker mode activated.
-1 ❌ patch 0m 8s #7706 does not apply to HBASE-29164. Rebase required? Wrong Branch? See https://yetus.apache.org/documentation/in-progress/precommit-patchnames for help.
Subsystem Report/Notes
Console output https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7706/1/console
versions git=2.43.0
Powered by Apache Yetus 0.15.0 https://yetus.apache.org

This message was automatically generated.

@Apache-HBase
Copy link

Apache-HBase commented Feb 4, 2026

💔 -1 overall

Vote Subsystem Runtime Logfile Comment
+0 🆗 reexec 0m 0s Docker mode activated.
-1 ❌ patch 0m 11s #7706 does not apply to HBASE-29164. Rebase required? Wrong Branch? See https://yetus.apache.org/documentation/in-progress/precommit-patchnames for help.
Subsystem Report/Notes
Console output https://ci-hbase.apache.org/job/HBase-PreCommit-GitHub-PR/job/PR-7706/1/console
versions git=2.17.1
Powered by Apache Yetus 0.15.0 https://yetus.apache.org

This message was automatically generated.

@kgeisz
Copy link
Contributor Author

kgeisz commented Feb 5, 2026

@anmolnar I know this PR is very large. If I compare my rebased branch to the HBASE-28957_rebased branch that I rebased off of, the only difference is the changes I made in my branch. To me, this means I don't have any unnecessary commits or changes in this rebase PR.

Here is the comparison between my newly rebased branch and HBASE-28957_rebased:
HBASE-28957_rebased...kgeisz:hbase:HBASE-29164_rebased

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.