-
Notifications
You must be signed in to change notification settings - Fork 509
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
[DO NOT MERGE] Backport some fixes from master to ozone-1.4 #6553
Conversation
@adoroszlai, @hemantk-12, @swamirishi, @aswinshakil, @SaketaChalamchala, @sodonnel, @ChenSammi please check that your commits are correctly cherry-picked |
333b142
to
e2359a0
Compare
https://issues.apache.org/jira/browse/HDDS-10681 Remove above PRs which have been merged in EC-related fixes: #6551 |
Thanks @xichen01 for updating the PR, my part LGTM. (There is some minor difference in HDDS-10552 due to HDDS-10013 not being backported, but I think that's OK.) Please remember to push from CLI instead of merging in GitHub UI. Also, please do not cherry-pick each commit to
To be able to do that, this PR needs to be rebased on top of
|
Let's merge #6557 first, which is already based on top of |
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.
Thanks @xichen01 for the backporting the changes.
I reviewed snapshot related following changes and left one comment. Otherwise it looks good to me.
- HDDS-9200. [Snapshot] Added logs and metrics for snapshot purge and set property APIs (HDDS-9200. [Snapshot] Added logs and metrics for snapshot purge and set property APIs #6453)
- HDDS-10590. [Snapshot] Synchronized snapshot purge, set snapshot property and SstFilteringService (HDDS-10590. [Snapshot] Synchronized snapshot purge, set snapshot property and SstFilteringService #6456)
- HDDS-9426. Calculate Exclusive size for deep cleaned snapshot's deleted directories (HDDS-9426. Calculate Exclusive size for deep cleaned snapshot's deleted directories #6099)
- HDDS-10477. Make Rocksdb tools native lib compatible with all chipset with the same arch (HDDS-10477. Make Rocksdb tools native lib compatible with all chipset with the same arch #6341)
- HDDS-9802. Tool to fix corrupted snapshot chain (HDDS-9802. Tool to fix corrupted snapshot chain #6386)
hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/SnapshotInfo.java
Show resolved
Hide resolved
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.
Thank you @xichen01 for the backport.
Could you also help to backport the recent fix HDDS-10717?
) (cherry picked from commit b82a2a2)
(cherry picked from commit e907316)
(cherry picked from commit ca8f1f7)
… with the same arch (apache#6341) (cherry picked from commit e3a7224)
…ed directories (apache#6099) (cherry picked from commit 79d3c87)
…erty and SstFilteringService (apache#6456) (cherry picked from commit 7da5ecb)
…et property APIs (apache#6453) (cherry picked from commit 3467db1)
(cherry picked from commit 0f43dbc)
(cherry picked from commit 06c0d81)
(cherry picked from commit 2aa77f7)
(cherry picked from commit 32e6a31)
(cherry picked from commit 14f2452)
(cherry picked from commit 4aee562)
…nd complete MPU (apache#6496) (cherry picked from commit c1b27a8)
) (cherry picked from commit 72240fa)
(cherry picked from commit 7bb7938)
…eoutRetry (apache#6560) (cherry picked from commit 5dbd3cf)
e2359a0
to
c6f9084
Compare
Done. |
Thanks @xichen01 . My part looks good. |
Thanks @xichen01 for completing this backport. |
What changes were proposed in this pull request?
Backport the following fixes from master to ozone-1.4 for 1.4.1 (Do not include Etag-related PRs, these will be backported in separate PRs):
HDDS-10680. Duplicate delete key blocks sent to SCM (#6513)
HDDS-10692. ozone s3 getsecret prints some internal details (#6531)
HDDS-10630. Add missing parent directories deleted between initiate and complete MPU (#6496)
HDDS-10677. Bump plotly.js to 2.25.2 (#5915)
HDDS-10676. Bump browserify-sign to 4.2.3 (#6509)
HDDS-10674. Bump ip to 1.1.9 (#6243)
HDDS-10673. Bump es5-ext to 0.10.64 (#6284)
HDDS-10672. Bump express to 4.19.2 (#6442)
HDDS-10669. Bump axios to 0.28.0 (#6242)
HDDS-9200. [Snapshot] Added logs and metrics for snapshot purge and set property APIs (#6453)
HDDS-10590. [Snapshot] Synchronized snapshot purge, set snapshot property and SstFilteringService (#6456)
HDDS-9426. Calculate Exclusive size for deep cleaned snapshot's deleted directories (#6099)
HDDS-10477. Make Rocksdb tools native lib compatible with all chipset with the same arch (#6341)
HDDS-10552. Downgrade Surefire to 3.0.0-M4 (#6406)
HDDS-9802. Tool to fix corrupted snapshot chain (#6386)
HDDS-10496. Fetch dependencies for cache using actual build (#6359)
What is the link to the Apache JIRA
How was this patch tested?
https://github.com/xichen01/ozone/actions/runs/8732721413