bharatviswa504 commented on a change in pull request #1589: HDDS-2244. Use new
ReadWrite lock in OzoneManager.
URL: https://github.com/apache/hadoop/pull/1589#discussion_r332255791
##########
File path:
hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/lock/OzoneManagerLock.java
##########
@@ -105,15 +109,66 @@ public OzoneManagerLock(Configuration conf) {
* should be bucket name. For remaining all resource only one param should
* be passed.
*/
+ @Deprecated
public boolean acquireLock(Resource resource, String... resources) {
String resourceName = generateResourceName(resource, resources);
+ return lock(resource, resourceName, manager::writeLock, WRITE_LOCK);
+ }
+
+ /**
+ * Acquire read lock on resource.
+ *
+ * For S3_BUCKET_LOCK, VOLUME_LOCK, BUCKET_LOCK type resource, same
+ * thread acquiring lock again is allowed.
+ *
+ * For USER_LOCK, PREFIX_LOCK, S3_SECRET_LOCK type resource, same thread
+ * acquiring lock again is not allowed.
+ *
+ * Special Note for USER_LOCK: Single thread can acquire single user lock/
+ * multi user lock. But not both at the same time.
+ * @param resource - Type of the resource.
+ * @param resources - Resource names on which user want to acquire lock.
+ * For Resource type BUCKET_LOCK, first param should be volume, second param
+ * should be bucket name. For remaining all resource only one param should
+ * be passed.
+ */
+ public boolean acquireReadLock(Resource resource, String... resources) {
+ String resourceName = generateResourceName(resource, resources);
+ return lock(resource, resourceName, manager::readLock, READ_LOCK);
+ }
+
+
+ /**
+ * Acquire write lock on resource.
+ *
+ * For S3_BUCKET_LOCK, VOLUME_LOCK, BUCKET_LOCK type resource, same
+ * thread acquiring lock again is allowed.
+ *
+ * For USER_LOCK, PREFIX_LOCK, S3_SECRET_LOCK type resource, same thread
+ * acquiring lock again is not allowed.
+ *
+ * Special Note for USER_LOCK: Single thread can acquire single user lock/
+ * multi user lock. But not both at the same time.
+ * @param resource - Type of the resource.
+ * @param resources - Resource names on which user want to acquire lock.
+ * For Resource type BUCKET_LOCK, first param should be volume, second param
+ * should be bucket name. For remaining all resource only one param should
+ * be passed.
+ */
+ public boolean acquireWriteLock(Resource resource, String... resources) {
+ String resourceName = generateResourceName(resource, resources);
+ return lock(resource, resourceName, manager::writeLock, WRITE_LOCK);
+ }
+
+ private boolean lock(Resource resource, String resourceName,
+ Consumer<String> lockFn, String lockType) {
if (!resource.canLock(lockSet.get())) {
String errorMessage = getErrorMessage(resource);
LOG.error(errorMessage);
throw new RuntimeException(errorMessage);
} else {
- manager.lock(resourceName);
- LOG.debug("Acquired {} lock on resource {}", resource.name,
+ lockFn.accept(resourceName);
+ LOG.debug("Acquired {} {} lock on resource {}", lockType, resource.name,
resourceName);
Review comment:
Here the first resource.name prints VOLUME_LOCK/BUCKET_LOCK, next
resourceName prints actual resource name.
----------------------------------------------------------------
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
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: common-issues-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-issues-h...@hadoop.apache.org
