Skip to content

Commit 7a07a16

Browse files
fix checkstyle.
1 parent fbc3c1b commit 7a07a16

File tree

5 files changed

+10
-8
lines changed

5 files changed

+10
-8
lines changed

hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/lock/OzoneManagerLock.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import java.util.List;
2424
import java.util.function.Consumer;
2525

26-
import org.apache.hadoop.ozone.lock.ActiveLock;
2726
import org.slf4j.Logger;
2827
import org.slf4j.LoggerFactory;
2928

hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1735,7 +1735,8 @@ public OzoneFileStatus getFileStatus(OmKeyArgs args) throws IOException {
17351735
String bucketName = args.getBucketName();
17361736
String keyName = args.getKeyName();
17371737

1738-
metadataManager.getLock().acquireReadLock(BUCKET_LOCK, volumeName, bucketName);
1738+
metadataManager.getLock().acquireReadLock(BUCKET_LOCK, volumeName,
1739+
bucketName);
17391740
try {
17401741
// Check if this is the root of the filesystem.
17411742
if (keyName.length() == 0) {
@@ -1918,7 +1919,8 @@ public OmKeyInfo lookupFile(OmKeyArgs args, String clientAddress)
19181919
String bucketName = args.getBucketName();
19191920
String keyName = args.getKeyName();
19201921

1921-
metadataManager.getLock().acquireReadLock(BUCKET_LOCK, volumeName, bucketName);
1922+
metadataManager.getLock().acquireReadLock(BUCKET_LOCK, volumeName,
1923+
bucketName);
19221924
try {
19231925
OzoneFileStatus fileStatus = getFileStatus(args);
19241926
if (fileStatus.isFile()) {

hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/bucket/OMBucketSetPropertyRequest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
import org.apache.hadoop.hdds.utils.db.cache.CacheValue;
5959

6060
import static org.apache.hadoop.ozone.om.lock.OzoneManagerLock.Resource.BUCKET_LOCK;
61-
import static org.apache.hadoop.ozone.om.lock.OzoneManagerLock.Resource.VOLUME_LOCK;
6261

6362
/**
6463
* Handle SetBucketProperty Request.

hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/security/S3GetSecretRequest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,8 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
127127
try {
128128
String awsSecret = updateGetS3SecretRequest.getAwsSecret();
129129
acquiredLock =
130-
omMetadataManager.getLock().acquireWriteLock(S3_SECRET_LOCK, kerberosID);
130+
omMetadataManager.getLock().acquireWriteLock(S3_SECRET_LOCK,
131+
kerberosID);
131132

132133
S3SecretValue s3SecretValue =
133134
omMetadataManager.getS3SecretTable().get(kerberosID);
@@ -168,7 +169,8 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
168169
omClientResponse, transactionLogIndex));
169170
}
170171
if (acquiredLock) {
171-
omMetadataManager.getLock().releaseWriteLock(S3_SECRET_LOCK, kerberosID);
172+
omMetadataManager.getLock().releaseWriteLock(S3_SECRET_LOCK,
173+
kerberosID);
172174
}
173175
}
174176

hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeDeleteRequest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
9797
OmVolumeArgs omVolumeArgs = null;
9898
OzoneManagerProtocolProtos.UserVolumeInfo newVolumeList = null;
9999

100-
acquiredVolumeLock = omMetadataManager.getLock().acquireWriteLock(VOLUME_LOCK,
101-
volume);
100+
acquiredVolumeLock = omMetadataManager.getLock().acquireWriteLock(
101+
VOLUME_LOCK, volume);
102102
owner = getVolumeInfo(omMetadataManager, volume).getOwnerName();
103103
acquiredUserLock = omMetadataManager.getLock().acquireWriteLock(USER_LOCK,
104104
owner);

0 commit comments

Comments
 (0)