-
Notifications
You must be signed in to change notification settings - Fork 3.3k
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.
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
Backport StoreFileTracker (HBASE-26067, HBASE-26584, and others) to branch-2.5 #4241
Conversation
This isn't meant for code review. The description on this issue lists all commit SHAs and PR#s for the individual changes that were cherry picked from branch-2. If you want to have a look, it is all there, and the PR branch contains all respective commits in order. A sanity check on inclusion on all necessary changes would be helpful. The result should test out well and be ready for merge. If there are test issues this is the venue for addressing them. |
💔 -1 overall
This message was automatically generated. |
💔 -1 overall
This message was automatically generated. |
🎊 +1 overall
This message was automatically generated. |
Latest precommit result is good: There is an error prone result to address:
Not strictly necessary to address javadoc or checkstyle issues in a backport, I think, but let me do it anyway. I will also see if I can reproduce the TestHFileProcedurePrettyPrinter failure on the earlier precommit run. Perhaps it is flaky now. |
First part:
Second part:
Regarding the
|
4e124be
to
2d34334
Compare
Rebase on HEAD of branch-2.5 and fix errorprone, checkstyle, and javadoc findings. |
💔 -1 overall
This message was automatically generated. |
🎊 +1 overall
This message was automatically generated. |
🎊 +1 overall
This message was automatically generated. |
Thanks @apurtell ! Just noticed this TestHFileProcedurePrettyPrinter consistently fails to me locally, when running it individually. It passes on branch-2.5, though. I suspect there might be some regression here, let me check it further and get back here once I have some findings. |
Quick update: Looks like it was introduced by HBASE-26640. |
I'll try to give this a one-over tomorrow, but big +1 on merging this when QA comes back green. (just in case life gets the better of me) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe the TestHFileProcedurePrettyPrinter failures are legit. I think this test is also failing on branch-2. From my analysis, this was introduced on branch-2 after we backported HBASE-26640 on branch-2. It doesn't affect master branch because it contains the changes from HBASE-25368, which for some reason, wasn't backported to any base-2 branches.
I had created HBASE-26881 PR for backporting HBASE-25368 into branch-2. With those changes, the test is now passing. Let's include that one here once it goes to branch-2.
Sounds good. I approved #4267 . I'll merge it tomorrow if it has not been merged yet, then will pick it to this PR. |
Thanks, Andrew. Had just merged that backport PR. |
2d34334
to
fb739b1
Compare
HBASE-26881 has been cherry picked to the PR branch and the branch was rebased on branch-2.5 and force pushed just now as fb739b1. I take this comment from @joshelser :
and the last precommit result here as approval to merge but will wait at least 24 hours for any additional review or comment, and for precommit testing of the force push to complete. |
Thanks so much for digging in on the TestHFileProcedurePrettyPrinter failure here @wchevreuil |
💔 -1 overall
This message was automatically generated. |
I believe the latest test failure is unrelated, got it passing locally. |
…racking logic Signed-off-by: Wellington Chevreuil <[email protected]> Conflicts: hbase-server/src/main/java/org/apache/hadoop/hbase/mob/DefaultMobStoreCompactor.java hbase-server/src/main/java/org/apache/hadoop/hbase/mob/DefaultMobStoreFlusher.java hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDefaultStoreEngine.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScannerClosure.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStripeStoreEngine.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestDateTieredCompactor.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestStripeCompactor.java
Signed-off-by: Wellington Chevreuil <[email protected]>
) Signed-off-by: Duo Zhang <[email protected]> Conflicts: hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHStoreFile.java
… impl (apache#3749) Signed-off-by: Duo Zhang <[email protected]>
…ations to TableDescriptor for existing tables (apache#3700) Signed-off-by: Duo Zhang <[email protected]> Reviewed-by: Wellington Ramos Chevreuil <[email protected]>
…he#3786) Signed-off-by: Duo Zhang <[email protected]> Signed-off-by: Josh Elser <[email protected]> Signed-off-by: Wellington Ramos Chevreuil <[email protected]> Conflicts: hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java hbase-server/src/main/java/org/apache/hadoop/hbase/mob/DefaultMobStoreCompactor.java
apache#3845) Signed-off-by: Duo Zhang <[email protected]>
…ring or cloning snapshot Closes apache#3851 Signed-off-by: Duo Zhang <[email protected]> Signed-off-by: Josh Elser <[email protected]>
…ing META (apache#3998) Signed-off-by: Duo Zhang <[email protected]> Signed-off-by: Josh Elser <[email protected]> (cherry picked from commit baeb51f)
…blematic (apache#4010) Signed-off-by: Wellington Ramos Chevreuil <[email protected]> Conflicts: hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/storefiletracker/TestStoreFileTracker.java
…lementation for a table while upgrading (apache#4006) Signed-off-by: GeorryHuang <[email protected]> Signed-off-by: Josh Elser <[email protected]> Signed-off-by: Wellington Ramos Chevreuil <[email protected]>
… while executing (apache#4034) Signed-off-by: GeorryHuang <[email protected]>
…e#4040) Signed-off-by: Josh Elser <[email protected]>
Signed-off-by: Xin Sun <[email protected]>
…eFileListFile (apache#4055) Signed-off-by: Wellington Ramos Chevreuil <[email protected]>
…iting TableDescriptor (apache#4054) Signed-off-by: Wellington Ramos Chevreuil <[email protected]>
…pache#4030) (apache#4080) Signed-off-by: Wellington Ramos Chevreuil <[email protected]> Reviewed-by: Josh Elser <[email protected]>
…pache#4113) Signed-off-by: Duo Zhang <[email protected]>
…work with SFT (apache#4111) Signed-off-by: Josh Elser <[email protected]> Signed-off-by: Wellington Chevreuil <[email protected]>
…pache#4122) Signed-off-by: Wellington Ramos Chevreuil <[email protected]> Conflicts: hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestBulkloadBase.java
apache#4082) Signed-off-by: Xiaolin Ha <[email protected]>
…SnapshotProcedure (apache#4226) Signed-off-by: Xiaolin Ha <[email protected]> (cherry picked from commit 5b28d76)
Signed-off-by: Andrew Purtell <[email protected]>
4a7219c
to
f9fa857
Compare
…others) to branch-2.5 Previous cherry picks: commit 6aaef89 HBASE-26064 Introduce a StoreFileTracker to abstract the store file tracking logic commit 43b40e9 HBASE-25988 Store the store file list by a file apache#3578) commit 6e05376 HBASE-26079 Use StoreFileTracker when splitting and merging apache#3617) commit 090b2fe HBASE-26224 HBASE-26224 Introduce a MigrationStoreFileTracker to support migratin… apache#3656) commit 0ee1689 HBASE-26246 Persist the StoreFileTracker configurations to TableDescriptor when creating table apache#3666) commit 2052e80 HBASE-26248 Should find a suitable way to let users specify the store… apache#3665) commit 5ff0f98 HBASE-26264 Add more checks to prevent misconfiguration on store file… apache#3681) commit fc4f6d1 HBASE-26280 HBASE-26280 Use store file tracker when snapshoting apache#3685) commit 06db852 HBASE-26326 CreateTableProcedure fails when FileBasedStoreFileTracker… apache#3721) commit e4e7cf8 HBASE-26386 Refactor StoreFileTracker implementations to expose the s… apache#3774) commit 08d1171 HBASE-26328 Clone snapshot doesn't load reference files into FILE SFT impl apache#3749) commit 8bec26e HBASE-26263 [Rolling Upgrading] Persist the StoreFileTracker configur… apache#3700) commit a288365 HBASE-26271: Cleanup the broken store files under data directory apache#3786) commit d00b5fa HBASE-26454 CreateTableProcedure still relies on temp dir and renames… apache#3845) commit 771e552 HBASE-26286: Add support for specifying store file tracker when restoring or cloning snapshot commit f16b7b1 HBASE-26265 Update ref guide to mention the new store file tracker im… apache#3942) commit 755b3b4 HBASE-26585 Add SFT configuration to META table descriptor when creating META apache#3998) commit 39c42c7 HBASE-26639 The implementation of TestMergesSplitsAddToTracker is pro… apache#4010) commit 6e1f5b7 HBASE-26586 Should not rely on the global config when setting SFT implementation for a table while upgrading apache#4006) commit f1dd865 HBASE-26654 ModifyTableDescriptorProcedure shoud load TableDescriptor… apache#4034) commit 8fbc9a2 HBASE-26674 Should modify filesCompacting under storeWriteLock apache#4040) commit 5aa0fd2 HBASE-26675 Data race on Compactor.writer apache#4035) commit 3021c58 HBASE-26700 The way we bypass broken track file is not enough in Stor… apache#4055) commit a8b68c9 HBASE-26690 Modify FSTableDescriptors to not rely on renaming when wr… apache#4054) commit dffeb8e HBASE-26587 Introduce a new Admin API to change SFT implementation (#… apache#4080) commit b265fe5 HBASE-26673 Implement a shell command for change SFT implementation apache#4113) commit 4cdb380 HBASE-26640 Reimplement master local region initialization to better … apache#4111) commit 77bb153 HBASE-26707: Reduce number of renames during bulkload (apache#4066) apache#4122) commit a4b192e HBASE-26611 Changing SFT implementation on disabled table is dangerous apache#4082) commit d3629bb HBASE-26837 Set SFT config when creating TableDescriptor in TestClone… apache#4226) commit 541d748 HBASE-26881 Backport HBASE-25368 to branch-2 (apache#4267) Fixups for precommit error prone, checkstyle, and javadoc warnings after applying cherry picks. Signed-off-by: Josh Elser <[email protected]> Reviewed-by: Wellington Ramos Chevreuil <[email protected]>
f9fa857
to
4e80f0e
Compare
💔 -1 overall
This message was automatically generated. |
💔 -1 overall
This message was automatically generated. |
💔 -1 overall
This message was automatically generated. |
In a discussion on dev@ the idea was floated that StoreFileTracker could be backported into branch-2.5 to be released as part of 2.5.0 as an experimental feature.
There are sixteen subtasks on HBASE-26067 and several other tangential commits. These appear to be the core commits:
And then, from HBASE-26584 and beyond:
hbase-server tests
run locally (Linux aarch64) with-Dsurefire.firstPartForkCount=10 -Dsurefire.secondPartForkCount=5 -Dsurefire.rerunFailingTestsCount=4
First part:
Second part:
TestReplicationSource
is a known flake.TestModifyNamespaceProcedure
may be a new flake, but most likely a test issue, because the failure does not reproduce when the test is run by itself. I have a script that runs tests in a loop and after 100 repetitions there was no error: