Skip to content

HDDS-13076. Refactor OzoneManagerLock class to rename Resource class to LeveledResource #8482

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
swamirishi merged 1 commit into from
May 19, 2025
Merged

HDDS-13076. Refactor OzoneManagerLock class to rename Resource class to LeveledResource #8482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/S3SecretLockedManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

package org.apache.hadoop.ozone.om;

import static org.apache.hadoop.ozone.om.lock.OzoneManagerLock.Resource.S3_SECRET_LOCK;
import static org.apache.hadoop.ozone.om.lock.OzoneManagerLock.LeveledResource.S3_SECRET_LOCK;

import java.io.IOException;
import java.util.List;
Expand Down
22 changes: 11 additions & 11 deletions hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/lock/IOzoneManagerLock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,43 +25,43 @@
*/
public interface IOzoneManagerLock {

OMLockDetails acquireReadLock(OzoneManagerLock.Resource resource,
OMLockDetails acquireReadLock(OzoneManagerLock.LeveledResource resource,
String... resources);

OMLockDetails acquireReadLocks(OzoneManagerLock.Resource resource, Collection<String[]> resources);
OMLockDetails acquireReadLocks(OzoneManagerLock.LeveledResource resource, Collection<String[]> resources);

OMLockDetails acquireWriteLock(OzoneManagerLock.Resource resource,
OMLockDetails acquireWriteLock(OzoneManagerLock.LeveledResource resource,
String... resources);

OMLockDetails acquireWriteLocks(OzoneManagerLock.Resource resource,
OMLockDetails acquireWriteLocks(OzoneManagerLock.LeveledResource resource,
Collection<String[]> resources);

boolean acquireMultiUserLock(String firstUser, String secondUser);

void releaseMultiUserLock(String firstUser, String secondUser);

OMLockDetails releaseWriteLock(OzoneManagerLock.Resource resource,
OMLockDetails releaseWriteLock(OzoneManagerLock.LeveledResource resource,
String... resources);

OMLockDetails releaseWriteLocks(OzoneManagerLock.Resource resource,
OMLockDetails releaseWriteLocks(OzoneManagerLock.LeveledResource resource,
Collection<String[]> resources);

OMLockDetails releaseReadLock(OzoneManagerLock.Resource resource,
OMLockDetails releaseReadLock(OzoneManagerLock.LeveledResource resource,
String... resources);

OMLockDetails releaseReadLocks(OzoneManagerLock.Resource resource,
OMLockDetails releaseReadLocks(OzoneManagerLock.LeveledResource resource,
Collection<String[]> resources);

@VisibleForTesting
int getReadHoldCount(OzoneManagerLock.Resource resource,
int getReadHoldCount(OzoneManagerLock.LeveledResource resource,
String... resources);

@VisibleForTesting
int getWriteHoldCount(OzoneManagerLock.Resource resource,
int getWriteHoldCount(OzoneManagerLock.LeveledResource resource,
String... resources);

@VisibleForTesting
boolean isWriteLockedByCurrentThread(OzoneManagerLock.Resource resource,
boolean isWriteLockedByCurrentThread(OzoneManagerLock.LeveledResource resource,
String... resources);

void cleanup();
Expand Down
24 changes: 12 additions & 12 deletions hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/lock/OmReadOnlyLock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import static org.apache.hadoop.ozone.om.lock.OMLockDetails.EMPTY_DETAILS_LOCK_NOT_ACQUIRED;

import java.util.Collection;
import org.apache.hadoop.ozone.om.lock.OzoneManagerLock.Resource;
import org.apache.hadoop.ozone.om.lock.OzoneManagerLock.LeveledResource;

/**
* Read only "lock" for snapshots
Expand All @@ -31,23 +31,23 @@
public class OmReadOnlyLock implements IOzoneManagerLock {

@Override
public OMLockDetails acquireReadLock(Resource resource, String... resources) {
public OMLockDetails acquireReadLock(LeveledResource resource, String... resources) {
return EMPTY_DETAILS_LOCK_ACQUIRED;
}

@Override
public OMLockDetails acquireReadLocks(Resource resource, Collection<String[]> resources) {
public OMLockDetails acquireReadLocks(LeveledResource resource, Collection<String[]> resources) {
return EMPTY_DETAILS_LOCK_ACQUIRED;
}

@Override
public OMLockDetails acquireWriteLock(Resource resource,
public OMLockDetails acquireWriteLock(LeveledResource resource,
String... resources) {
return EMPTY_DETAILS_LOCK_NOT_ACQUIRED;
}

@Override
public OMLockDetails acquireWriteLocks(Resource resource, Collection<String[]> resources) {
public OMLockDetails acquireWriteLocks(LeveledResource resource, Collection<String[]> resources) {
return EMPTY_DETAILS_LOCK_NOT_ACQUIRED;
}

Expand All @@ -62,38 +62,38 @@ public void releaseMultiUserLock(String firstUser, String secondUser) {
}

@Override
public OMLockDetails releaseWriteLock(Resource resource,
public OMLockDetails releaseWriteLock(LeveledResource resource,
String... resources) {
return EMPTY_DETAILS_LOCK_NOT_ACQUIRED;
}

@Override
public OMLockDetails releaseWriteLocks(Resource resource, Collection<String[]> resources) {
public OMLockDetails releaseWriteLocks(LeveledResource resource, Collection<String[]> resources) {
return EMPTY_DETAILS_LOCK_NOT_ACQUIRED;
}

@Override
public OMLockDetails releaseReadLock(Resource resource, String... resources) {
public OMLockDetails releaseReadLock(LeveledResource resource, String... resources) {
return EMPTY_DETAILS_LOCK_NOT_ACQUIRED;
}

@Override
public OMLockDetails releaseReadLocks(Resource resource, Collection<String[]> resources) {
public OMLockDetails releaseReadLocks(LeveledResource resource, Collection<String[]> resources) {
return EMPTY_DETAILS_LOCK_NOT_ACQUIRED;
}

@Override
public int getReadHoldCount(Resource resource, String... resources) {
public int getReadHoldCount(LeveledResource resource, String... resources) {
return 0;
}

@Override
public int getWriteHoldCount(Resource resource, String... resources) {
public int getWriteHoldCount(LeveledResource resource, String... resources) {
return 0;
}

@Override
public boolean isWriteLockedByCurrentThread(Resource resource,
public boolean isWriteLockedByCurrentThread(LeveledResource resource,
String... resources) {
return false;
}
Expand Down
Loading
Loading