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.

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

[DO NOT MERGE] Backport some fixes from master to ozone-1.4 #6096

Merged
merged 15 commits into from
Jan 29, 2024
Merged

[DO NOT MERGE] Backport some fixes from master to ozone-1.4 #6096

merged 15 commits into from
Jan 29, 2024

Conversation

adoroszlai
Copy link
Contributor

What changes were proposed in this pull request?

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

If approved, I'll push to the ozone-1.4 branch directly.

How was this patch tested?

CI:
https://github.com/adoroszlai/ozone/actions/runs/7657035459

ashishkumar50 and others added 14 commits January 25, 2024 16:32
@ashishkumar50 @adoroszlai
HDDS-9846. Datanode should not persist cluster ID to global version f…
ca3aaa2 
…ile until loading all volumes. (apache#5757)

(cherry picked from commit 027febe)
@xichen01 @adoroszlai
HDDS-9913. Reduce number of times configuration is loaded in Ozone cl…
1da1be0 
…ient (apache#5789)

(cherry picked from commit c990899)
@adoroszlai
HDDS-9943. TokenRenewer should close OzoneClient after use (apache#5809)
8b94fe5 
(cherry picked from commit 0112a71)
@hemantk-12 @adoroszlai
HDDS-9986. Log if there is a failure in closing RocksDB
0c6f707 
(cherry picked from commit 4cda788)
@adoroszlai
HDDS-10028. Simplify Maven cache for dependencies in CI (apache#5889)
01db70e 
(cherry picked from commit 25886f3)
@xBis7 @adoroszlai
HDDS-9683. Containers present on decommission nodes are reported as m…
2aa983e 
…is-replicated (apache#5726)

(cherry picked from commit f3872a7)
@adoroszlai
HDDS-10001. Options not closed properly in rocksdb-checkpoint-differ (a…
336ae45 
…pache#5890)

(cherry picked from commit 6d41b87)
@sumitagrawl @adoroszlai
HDDS-9527. Race condition in RocksDatabase (apache#5947)
5eba418 
(cherry picked from commit 0c2e2a6)
@siddhantsangwan @adoroszlai
HDDS-10113. UNHEALTHY replicas of QUASI_CLOSED container with unique …
edf1b18 
…origins should be handled during decommission (apache#5984)

(cherry picked from commit 46b6f3d)
@adoroszlai
HDDS-10157. Download zlib fails with 403 Forbidden in CI (apache#6029)
4437aad 
(cherry picked from commit 48d547c)
@ivandika3 @adoroszlai
HDDS-10138. NPE for SstFilteringService in OMDBCheckpointServlet.Lock (…
eae7061 
…apache#6015)

(cherry picked from commit abc3e1f)
@adoroszlai
HDDS-10174. Enable Surefire process checker (apache#6075)
b1e5c2b 
This reverts commit a41dae4

Reason for revert: new Surefire fails to kill fork after surefire.timeout

(cherry picked from commit 8835ccf)
@duongkame @adoroszlai
HDDS-9528. Managed objects should not override finalize() (apache#5853)
5b6ccee 
(cherry picked from commit b13f01c)
@whbing @adoroszlai
HDDS-10184. Fix ManagedStatistics not closed properly (apache#6055)
674790f 
(cherry picked from commit 9018728)
@adoroszlai adoroszlai self-assigned this Jan 25, 2024
@adoroszlai adoroszlai changed the base branch from master to ozone-1.4 January 25, 2024 17:19
@adoroszlai
Copy link
Contributor Author

/pending DO NOT MERGE

github-actions[bot]
github-actions bot requested changes Jan 25, 2024
View reviewed changes
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

@adoroszlai
Copy link
Contributor Author

@ashishkumar50 @duongkame @hemantk-12 @ivandika3 @siddhantsangwan @sumitagrawl @whbing @xBis7 @xichen01 please take a look at your commit(s)

@xBis7
Copy link
Contributor

xBis7 commented Jan 25, 2024

@adoroszlai Thanks for the work on this. LGTM!

@hemantk-12
Copy link
Contributor

Thanks @adoroszlai.

Can we back port these jiras as well?

  1. https://issues.apache.org/jira/browse/HDDS-10103
  2. https://issues.apache.org/jira/browse/HDDS-9486 (PR is in review)

@adoroszlai
Copy link
Contributor Author

adoroszlai commented Jan 25, 2024 •
edited
Loading

Can we back port these jiras as well?

  1. https://issues.apache.org/jira/browse/HDDS-10103
  2. https://issues.apache.org/jira/browse/HDDS-9486 (PR is in review)

This PR is not a comprehensive list of Jiras to be backported, just an initial batch. I thought one PR per commit would be too much overhead now, as more than a month has passed since the branch was cut.

Once this is completed, we can follow-up with another batch. If we catch up, we may start backporting each fix right after it is merged to master.

We don't have a timeline for release yet. The idea is to try to keep ozone-1.4 in good shape until then.

hemantk-12
hemantk-12 approved these changes Jan 25, 2024
View reviewed changes
Copy link
Contributor

@hemantk-12 hemantk-12 left a comment

Choose a reason for hiding this comment

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

LGTM

@ivandika3
Copy link
Contributor

@adoroszlai Thanks for working on this. LGTM +1 for my patch.

@whbing
Copy link
Contributor

whbing commented Jan 26, 2024

@adoroszlai Thanks ! LGTM +1 for my patch.

@xichen01
Copy link
Contributor

LGTM +1

ashishkumar50
ashishkumar50 approved these changes Jan 26, 2024
View reviewed changes
Copy link
Contributor

@ashishkumar50 ashishkumar50 left a comment

Choose a reason for hiding this comment

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

@adoroszlai Thanks for this, LGTM for my patch.

aswinshakil
aswinshakil approved these changes Jan 26, 2024
View reviewed changes
Copy link
Member

@aswinshakil aswinshakil left a comment

Choose a reason for hiding this comment

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

Thanks for your continued efforts in backporting @adoroszlai. LGTM+1

sumitagrawl
sumitagrawl approved these changes Jan 26, 2024
View reviewed changes
Copy link
Contributor

@sumitagrawl sumitagrawl left a comment

Choose a reason for hiding this comment

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

LGTM

siddhantsangwan
siddhantsangwan approved these changes Jan 29, 2024
View reviewed changes
Copy link
Contributor

@siddhantsangwan siddhantsangwan left a comment

Choose a reason for hiding this comment

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

Looks good. @adoroszlai thanks for your efforts!

@adoroszlai adoroszlai merged commit 5261491 into apache:ozone-1.4 Jan 29, 2024
36 of 37 checks passed
@adoroszlai
Copy link
Contributor Author

Thanks everyone for the review.

FYI, I pushed this via CLI as:

git checkout ozone-1.4
git pull
git merge --ff-only ozone-1.4.1-backports
git push

GitHub seems to recognize that as a "merge" of the PR, which is good.

@ivandika3 ivandika3 mentioned this pull request Feb 22, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@github-actions github-actions[bot] github-actions[bot] requested changes

@ashishkumar50 ashishkumar50 ashishkumar50 approved these changes

@xBis7 xBis7 xBis7 approved these changes

@siddhantsangwan siddhantsangwan siddhantsangwan approved these changes

@aswinshakil aswinshakil aswinshakil approved these changes

@sumitagrawl sumitagrawl sumitagrawl approved these changes

@whbing whbing whbing approved these changes

@hemantk-12 hemantk-12 hemantk-12 approved these changes

Assignees

@adoroszlai adoroszlai

Labels
backport
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.