Skip to content

HDDS-8418. Lease Manager unsafe method fix #4578

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

Merged
sadanand48 merged 6 commits into from
Sep 22, 2023
Merged

HDDS-8418. Lease Manager unsafe method fix #4578

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d637cc4
HDDS-8418. Lease Manager unsafe method fix
sumitagrawl Apr 17, 2023
2e82e60
HDDS-8418. Lease Manager unsafe method fix
sumitagrawl Apr 18, 2023
52dc98d
Merge branch 'apache:master' into HDDS-8418
sumitagrawl Jun 26, 2023
4bc0cc0
HDDS-8418. Lease Manager unsafe method fix
sumitagrawl Jun 26, 2023
e17ec73
HDDS-8418. Lease Manager unsafe method fix
sumitagrawl Jun 26, 2023
d9fb8b1
HDDS-8418. Lease Manager unsafe method fix
sumitagrawl Jun 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/lease/Lease.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public boolean hasExpired() {
* @throws LeaseExpiredException
* If the lease has already timed out
*/
public void registerCallBack(Callable<Void> callback)
public synchronized void registerCallBack(Callable<Void> callback)
throws LeaseExpiredException {
if (hasExpired()) {
throw new LeaseExpiredException(messageForResource(resource));
Expand Down Expand Up @@ -143,7 +143,7 @@ public long getLeaseLifeTime() throws LeaseExpiredException {
* @throws LeaseExpiredException
* If the lease has already timed out
*/
public void renew(long timeout) throws LeaseExpiredException {
public synchronized void renew(long timeout) throws LeaseExpiredException {
if (hasExpired()) {
throw new LeaseExpiredException(messageForResource(resource));
}
Expand Down Expand Up @@ -185,8 +185,7 @@ List<Callable<Void>> getCallbacks() {
/**
* Expires/Invalidates the lease.
*/
void invalidate() {
callbacks = null;
synchronized void invalidate() {
expired = true;
}

Expand Down
2 changes: 1 addition & 1 deletion hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/lease/LeaseManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,8 +252,8 @@ public void run() {
long remainingTime = lease.getRemainingTime();
if (remainingTime <= 0) {
//Lease has timed out
List<Callable<Void>> leaseCallbacks = lease.getCallbacks();
release(resource);
List<Callable<Void>> leaseCallbacks = lease.getCallbacks();
executorService.execute(
new LeaseCallbackExecutor<>(resource, leaseCallbacks));
} else {
Expand Down