xiaoyuyao commented on a change in pull request #1164:
URL: https://github.com/apache/hadoop-ozone/pull/1164#discussion_r453918089
##########
File path:
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
##########
@@ -1877,26 +1897,18 @@ 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, false);
//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 != null && fileStatus.isFile()) {
+ if (args.getRefreshPipeline()) {
+ refreshPipeline(fileStatus.getKeyInfo());
+ }
+ if (args.getSortDatanodes()) {
Review comment:
NIT: sortDatanodes can be handled similarly in getOzoneFileStatus?
##########
File path:
hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
##########
@@ -1877,26 +1897,18 @@ 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, false);
//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 != null && fileStatus.isFile()) {
+ if (args.getRefreshPipeline()) {
+ refreshPipeline(fileStatus.getKeyInfo());
Review comment:
The last parameter of getOzoneFileStatus() should have refreshPipeline
handled already. Can we pass args.getRefreshPipeline() on line 1901?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-issues-unsubscr...@hadoop.apache.org
For additional commands, e-mail: ozone-issues-h...@hadoop.apache.org
