Skip to content

HDDS-3824: OM read requests should make SCM#refreshPipeline outside BUCKET_LOCK #1164

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
xiaoyuyao merged 6 commits into from
Jul 16, 2020
Merged

HDDS-3824: OM read requests should make SCM#refreshPipeline outside BUCKET_LOCK #1164

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2511f13
HDDS-3824: OM read requests should make SCM#refreshPipeline outside t…
Jul 6, 2020
ea12069
HDDS-3824: Fixed checkstyle warnings
Jul 7, 2020
3547106
HDDS-3824: Fixed review comment - generating of the secret token can …
Jul 8, 2020
c500b2a
HDDS-3824: Review comments
Jul 14, 2020
fc330f2
trigger new CI check
Jul 14, 2020
69a2100
trigger new CI check
adoroszlai Jul 14, 2020
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
164 changes: 89 additions & 75 deletions hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,48 +638,53 @@ public OmKeyInfo lookupKey(OmKeyArgs args, String clientAddress)
String keyName = args.getKeyName();
metadataManager.getLock().acquireReadLock(BUCKET_LOCK, volumeName,
bucketName);
OmKeyInfo value = null;
try {
String keyBytes = metadataManager.getOzoneKey(
volumeName, bucketName, keyName);
OmKeyInfo value = metadataManager.getKeyTable().get(keyBytes);
if (value == null) {
LOG.debug("volume:{} bucket:{} Key:{} not found",
volumeName, bucketName, keyName);
throw new OMException("Key not found",
KEY_NOT_FOUND);
}
if (grpcBlockTokenEnabled) {
String remoteUser = getRemoteUser().getShortUserName();
for (OmKeyLocationInfoGroup key : value.getKeyLocationVersions()) {
key.getLocationList().forEach(k -> {
k.setToken(secretManager.generateToken(remoteUser,
k.getBlockID().getContainerBlockID().toString(),
getAclForUser(remoteUser),
k.getLength()));
});
}
}
// Refresh container pipeline info from SCM
// based on OmKeyArgs.refreshPipeline flag
if (args.getRefreshPipeline()) {
refreshPipeline(value);
}
if (args.getSortDatanodes()) {
sortDatanodeInPipeline(value, clientAddress);
}
return value;
value = metadataManager.getKeyTable().get(keyBytes);
} catch (IOException ex) {
if (ex instanceof OMException) {
throw ex;
}
LOG.debug("Get key failed for volume:{} bucket:{} key:{}",
volumeName, bucketName, keyName, ex);
throw new OMException(ex.getMessage(),
KEY_NOT_FOUND);
if (LOG.isDebugEnabled()) {
LOG.debug("Get key failed for volume:{} bucket:{} key:{}", volumeName,
bucketName, keyName, ex);
}
throw new OMException(ex.getMessage(), KEY_NOT_FOUND);
} finally {
metadataManager.getLock().releaseReadLock(BUCKET_LOCK, volumeName,
bucketName);
}

if (value == null) {
if (LOG.isDebugEnabled()) {
LOG.debug("volume:{} bucket:{} Key:{} not found", volumeName,
bucketName, keyName);
}
throw new OMException("Key not found", KEY_NOT_FOUND);
}
if (grpcBlockTokenEnabled) {
String remoteUser = getRemoteUser().getShortUserName();
for (OmKeyLocationInfoGroup key : value.getKeyLocationVersions()) {
key.getLocationList().forEach(k -> {
k.setToken(secretManager.generateToken(remoteUser,
k.getBlockID().getContainerBlockID().toString(),
getAclForUser(remoteUser), k.getLength()));
});
}
}

// Refresh container pipeline info from SCM
// based on OmKeyArgs.refreshPipeline flag
// value won't be null as the check is done inside try/catch block.
if (args.getRefreshPipeline()) {
refreshPipeline(value);
}
if (args.getSortDatanodes()) {
sortDatanodeInPipeline(value, clientAddress);
}
return value;
}

/**
Expand Down Expand Up @@ -1695,6 +1700,18 @@ public OzoneFileStatus getFileStatus(OmKeyArgs args) throws IOException {
String bucketName = args.getBucketName();
String keyName = args.getKeyName();

return getOzoneFileStatus(volumeName, bucketName, keyName,
args.getRefreshPipeline(), false, null);
}

private OzoneFileStatus getOzoneFileStatus(String volumeName,
String bucketName,
String keyName,
boolean refreshPipeline,
boolean sortDatanodes,
String clientAddress)
throws IOException {
OmKeyInfo fileKeyInfo = null;
metadataManager.getLock().acquireReadLock(BUCKET_LOCK, volumeName,
bucketName);
try {
Expand All @@ -1706,36 +1723,44 @@ public OzoneFileStatus getFileStatus(OmKeyArgs args) throws IOException {

// Check if the key is a file.
String fileKeyBytes = metadataManager.getOzoneKey(
volumeName, bucketName, keyName);
OmKeyInfo fileKeyInfo = metadataManager.getKeyTable().get(fileKeyBytes);
volumeName, bucketName, keyName);
fileKeyInfo = metadataManager.getKeyTable().get(fileKeyBytes);

// Check if the key is a directory.
if (fileKeyInfo == null) {
String dirKey = OzoneFSUtils.addTrailingSlashIfNeeded(keyName);
String dirKeyBytes = metadataManager.getOzoneKey(
volumeName, bucketName, dirKey);
OmKeyInfo dirKeyInfo = metadataManager.getKeyTable().get(dirKeyBytes);
if (dirKeyInfo != null) {
return new OzoneFileStatus(dirKeyInfo, scmBlockSize, true);
}
}
} finally {
metadataManager.getLock().releaseReadLock(BUCKET_LOCK, volumeName,
bucketName);

// if the key is a file then do refresh pipeline info in OM by asking SCM
if (fileKeyInfo != null) {
if (args.getRefreshPipeline()) {
if (refreshPipeline) {
refreshPipeline(fileKeyInfo);
}
// this is a file
if (sortDatanodes) {
sortDatanodeInPipeline(fileKeyInfo, clientAddress);
}
return new OzoneFileStatus(fileKeyInfo, scmBlockSize, false);
}
}

String dirKey = OzoneFSUtils.addTrailingSlashIfNeeded(keyName);
String dirKeyBytes = metadataManager.getOzoneKey(
volumeName, bucketName, dirKey);
OmKeyInfo dirKeyInfo = metadataManager.getKeyTable().get(dirKeyBytes);
if (dirKeyInfo != null) {
return new OzoneFileStatus(dirKeyInfo, scmBlockSize, true);
}

if (LOG.isDebugEnabled()) {
LOG.debug("Unable to get file status for the key: volume: {}, bucket:" +
" {}, key: {}, with error: No such file exists.", volumeName,
bucketName, keyName);
}
throw new OMException("Unable to get file status: volume: " +
volumeName + " bucket: " + bucketName + " key: " + keyName,
FILE_NOT_FOUND);
} finally {
metadataManager.getLock().releaseReadLock(BUCKET_LOCK, volumeName,
bucketName);
// Key is not found, throws exception
if (LOG.isDebugEnabled()) {
LOG.debug("Unable to get file status for the key: volume: {}, bucket:" +
" {}, key: {}, with error: No such file exists.",
volumeName, bucketName, keyName);
}
throw new OMException("Unable to get file status: volume: " +
volumeName + " bucket: " + bucketName + " key: " + keyName,
FILE_NOT_FOUND);
}

/**
Expand Down Expand Up @@ -1877,26 +1902,13 @@ public OmKeyInfo lookupFile(OmKeyArgs args, String clientAddress)
String volumeName = args.getVolumeName();
String bucketName = args.getBucketName();
String keyName = args.getKeyName();

metadataManager.getLock().acquireReadLock(BUCKET_LOCK, volumeName,
bucketName);
try {
OzoneFileStatus fileStatus = getFileStatus(args);
if (fileStatus.isFile()) {
if (args.getRefreshPipeline()) {
refreshPipeline(fileStatus.getKeyInfo());
}
if (args.getSortDatanodes()) {
sortDatanodeInPipeline(fileStatus.getKeyInfo(), clientAddress);
}
return fileStatus.getKeyInfo();
}
OzoneFileStatus fileStatus = getOzoneFileStatus(volumeName, bucketName,
keyName, args.getRefreshPipeline(), args.getSortDatanodes(),
clientAddress);
//if key is not of type file or if key is not found we throw an exception
} finally {
metadataManager.getLock().releaseReadLock(BUCKET_LOCK, volumeName,
bucketName);
if (fileStatus.isFile()) {
return fileStatus.getKeyInfo();
}

throw new OMException("Can not write to directory: " + keyName,
ResultCodes.NOT_A_FILE);
}
Expand Down Expand Up @@ -2067,9 +2079,6 @@ public List<OzoneFileStatus> listStatus(OmKeyArgs args, boolean recursive,
for (Map.Entry<String, OzoneFileStatus> entry : cacheKeyMap.entrySet()) {
// No need to check if a key is deleted or not here, this is handled
// when adding entries to cacheKeyMap from DB.
if (args.getRefreshPipeline()) {
refreshPipeline(entry.getValue().getKeyInfo());
}
fileStatusList.add(entry.getValue());
countEntries++;
if (countEntries >= numEntries) {
Expand All @@ -2083,6 +2092,11 @@ public List<OzoneFileStatus> listStatus(OmKeyArgs args, boolean recursive,
metadataManager.getLock().releaseReadLock(BUCKET_LOCK, volumeName,
bucketName);
}
if (args.getRefreshPipeline()) {
for(OzoneFileStatus fileStatus : fileStatusList){
refreshPipeline(fileStatus.getKeyInfo());
}
}
return fileStatusList;
}

Expand Down