Skip to content
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 #6479

Merged
merged 17 commits into from
Apr 10, 2024

Conversation

myskov
Copy link
Contributor

@myskov myskov commented Apr 4, 2024

What changes were proposed in this pull request?

Backport the following fixes from master to ozone-1.4 for 1.4.1:

HDDS-10231. ContainerStateManager should not finalize the OPEN containers without a Pipeline. (#6123)
HDDS-10367. Fix possible NullPointerException in listKeysLight method (#6221)
HDDS-10472. Audit log should include EC replication config (#6338)
HDDS-10503. Bump jgrapht to 1.4.0 (#6364)
HDDS-10526. Bump follow-redirects to 1.15.6 (#6382)
HDDS-10554. Bump Zookeeper to 3.8.4 (#6407)
HDDS-10566. Bump commons-configuration2 to 2.10.1 (#6417)
HDDS-10562. Fix endless loop in ozone fs -ls (#6416)
HDDS-10583. Thread name prefix in ReplicationSupervisor is null (#6430)
HDDS-10547. Fix the buffer for the datanode checksum calculation (#6402)
HDDS-10588. Bump hadoop-shaded-guava to 1.2.0 (#6440)
HDDS-10594. File encryption info is not properly set when overwrite a file (#6445)
HDDS-10600. Bump nimbus-jose-jwt to 9.37.2 (#6454)
HDDS-10524. [Snapshot] Invalidate the cache entry from snapshotInfoTable cache in OMSnapshotPurgeRequest (#6443)
HDDS-10408. NPE causes OM crash in Snapshot Purge request. (#6250)
HDDS-10475. Refine audit logging for bucket creation operation (#6366)
HDDS-10460. Refine audit logging for bucket property updation operations (#6329)

How was this patch tested?

Ci run https://github.com/myskov/ozone/actions/runs/8554460237

nandakumar131 and others added 17 commits April 3, 2024 23:50
…ble cache in OMSnapshotPurgeRequest (apache#6443)

(cherry picked from commit 7559e1f)
@myskov
Copy link
Contributor Author

myskov commented Apr 4, 2024

@nandakumar131 @ivanzlenko @adoroszlai @symious @Cyrill @vtutrinov @ChenSammi @hemantk-12 @aswinshakil @tanvipenumudy please check that your commits are correctly cherry-picked

@myskov myskov added the backport label Apr 4, 2024
@myskov myskov self-assigned this Apr 4, 2024
@hemantk-12
Copy link
Contributor

Thanks, @myskov for the backport.

I reviewed snapshot changes #6250 and #6443 and the changes look good to me.

@ivandika3
Copy link
Contributor

ivandika3 commented Apr 5, 2024

@myskov Thank you for the backport.

Since ETag feature already landed on ozone-1.4 branch. I propose to include ETag related fixes / improvements in version 1.4.1.

HDDS-9680. Use md5 hash of multipart object part's content as ETag (#5668)
HDDS-10395. Fix eTag compatibility issues during MPU (#6235)
HDDS-10403. CopyObject should set ETag based on the key content (#6251)
HDDS-10521. ETag field should not be returned during GetObject if the key does not contain ETag field (#6377)
HDDS-10587. Reset the thread-local MessageDigest instance during exception (#6435)

All these fixes have been backported to our internal cluster and currently they are working well.

What do you think?

cc: @vtutrinov @xichen01

Copy link
Contributor

@adoroszlai adoroszlai left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @myskov for working on this. I checked dependabot's and my own commits, they look good.

@adoroszlai
Copy link
Contributor

/pending DO NOT MERGE (must be pushed manually)

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Marking this issue as un-mergeable as requested.

Please use /ready comment when it's resolved.

Please note that the PR will be closed after 21 days of inactivity from now. (But can be re-opened anytime later...)

DO NOT MERGE (must be pushed manually)

@adoroszlai adoroszlai changed the title Backport some fixes from master to ozone-1.4 [DO NOT MERGE] Backport some fixes from master to ozone-1.4 Apr 8, 2024
@myskov
Copy link
Contributor Author

myskov commented Apr 8, 2024

@ivandika3 I agree that ETag-related fixes should be ported. However, I suggest doing it in a separate PR.

@xichen01
Copy link
Contributor

xichen01 commented Apr 8, 2024

@myskov
These commits can significantly improve the performance of small EC files, we can consider cherry-picking them.
Detail:
https://issues.apache.org/jira/browse/HDDS-9911

  • HDDS-9913. Reduce number of times configuration is loaded in Ozone client #5789 [had be cherry-picked to the branch ozone-1.4]
  • HDDS-10384. EC client Reusing thread resources #6270 and #6326
  • HDDS-10383. Introduce a Provider for client-side thread resources passing #6222

cc: @adoroszlai


A Bug fix:
HDDS-9976. Ozone StateContext Memory leak for DeleteBlocksCommand when queue is full #5845

@kerneltime
Copy link
Contributor

cc @duongkame

@tanvipenumudy
Copy link
Contributor

HDDS-10475. Refine audit logging for bucket creation operation (#6366)
HDDS-10460. Refine audit logging for bucket property updation operations (#6329)

Thank you @myskov, I have taken a look at both my patches and they look good.

@myskov myskov merged commit 8fdba8e into apache:ozone-1.4 Apr 10, 2024
33 of 35 checks passed
@myskov
Copy link
Contributor Author

myskov commented Apr 10, 2024

@xichen01 thanks for the suggestion. Let's do it in a separate PR.

@myskov myskov deleted the myskov/ozone-1.4-backports branch April 10, 2024 08:08
@xichen01
Copy link
Contributor

@myskov Thank you for the backport.

Since ETag feature already landed on ozone-1.4 branch. I propose to include ETag related fixes / improvements in version 1.4.1.

HDDS-9680. Use md5 hash of multipart object part's content as ETag (#5668)
HDDS-10395. Fix eTag compatibility issues during MPU (#6235)
HDDS-10403. CopyObject should set ETag based on the key content (#6251)
HDDS-10521. ETag field should not be returned during GetObject if the key does not contain ETag field (#6377)
HDDS-10587. Reset the thread-local MessageDigest instance during exception (#6435)

@ivandika3 will you create a new PR to merge above these PRs to the branch ozone-1.4?

@xichen01
Copy link
Contributor

@xichen01 thanks for the suggestion. Let's do it in a separate PR.

@myskov OK, I will create a new PR to merge these.

@xichen01
Copy link
Contributor

@xichen01 thanks for the suggestion. Let's do it in a separate PR.

@myskov Create a PR #6512

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.