Skip to content

HDDS-1672. Improve locking in OzoneManager. #949

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

Closed
bharatviswa504 wants to merge 3 commits into from
Closed

HDDS-1672. Improve locking in OzoneManager. #949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
301fbab
HDDS-1727. Use generation of resourceName for locks in OzoneManagerLock.
bharatviswa504 Jun 25, 2019
b6ded12
fix findbug
bharatviswa504 Jun 25, 2019
2b29eea
HDDS-1672. Improve locking in OzoneManager.
bharatviswa504 Jun 25, 2019
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
1 change: 1 addition & 0 deletions hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConsts.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ public static Versioning getVersioning(boolean versioning) {
public static final String OM_S3_PREFIX ="S3:";
public static final String OM_S3_VOLUME_PREFIX = "s3";
public static final String OM_S3_SECRET = "S3Secret:";
public static final String OM_PREFIX = "Prefix:";

/**
* Max chunk size limit.
Expand Down
1 change: 1 addition & 0 deletions hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.apache.hadoop.ozone.om.helpers.OmPrefixInfo;
import org.apache.hadoop.ozone.om.helpers.OmVolumeArgs;
import org.apache.hadoop.ozone.om.helpers.S3SecretValue;
import org.apache.hadoop.ozone.om.lock.OzoneManagerLock;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.VolumeList;
import org.apache.hadoop.ozone.security.OzoneTokenIdentifier;
import org.apache.hadoop.utils.db.DBStore;
Expand Down
269 changes: 0 additions & 269 deletions hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OzoneManagerLock.java
View file
Open in desktop

This file was deleted.

9 changes: 5 additions & 4 deletions hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/S3SecretManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@

import java.io.IOException;

import static org.apache.hadoop.ozone.om.lock.OzoneManagerLock.Resource.S3_SECRET_LOCK;
import static org.apache.hadoop.ozone.security.OzoneSecurityException.ResultCodes.S3_SECRET_NOT_FOUND;

/**
Expand Down Expand Up @@ -60,7 +61,7 @@ public S3SecretValue getS3Secret(String kerberosID) throws IOException {
Preconditions.checkArgument(Strings.isNotBlank(kerberosID),
"kerberosID cannot be null or empty.");
S3SecretValue result = null;
omMetadataManager.getLock().acquireS3SecretLock(kerberosID);
omMetadataManager.getLock().acquireLock(S3_SECRET_LOCK, kerberosID);
try {
S3SecretValue s3Secret =
omMetadataManager.getS3SecretTable().get(kerberosID);
Expand All @@ -72,7 +73,7 @@ public S3SecretValue getS3Secret(String kerberosID) throws IOException {
return s3Secret;
}
} finally {
omMetadataManager.getLock().releaseS3SecretLock(kerberosID);
omMetadataManager.getLock().releaseLock(S3_SECRET_LOCK, kerberosID);
}
LOG.trace("Secret for accessKey:{}, proto:{}", kerberosID, result);
return result;
Expand All @@ -86,15 +87,15 @@ public String getS3UserSecretString(String kerberosID)
LOG.trace("Get secret for awsAccessKey:{}", kerberosID);

S3SecretValue s3Secret;
omMetadataManager.getLock().acquireS3SecretLock(kerberosID);
omMetadataManager.getLock().acquireLock(S3_SECRET_LOCK, kerberosID);
try {
s3Secret = omMetadataManager.getS3SecretTable().get(kerberosID);
if (s3Secret == null) {
throw new OzoneSecurityException("S3 secret not found for " +
"awsAccessKeyId " + kerberosID, S3_SECRET_NOT_FOUND);
}
} finally {
omMetadataManager.getLock().releaseS3SecretLock(kerberosID);
omMetadataManager.getLock().releaseLock(S3_SECRET_LOCK, kerberosID);
}

return s3Secret.getAwsSecret();
Expand Down
Loading