virajjasani commented on code in PR #5603:
URL: https://github.com/apache/hbase/pull/5603#discussion_r1443865810
##########
hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/TakeSnapshotHandler.java:
##########
@@ -129,6 +132,8 @@ public TakeSnapshotHandler(SnapshotDescription snapshot,
final MasterServices ma
"Taking " + snapshot.getType() + " snapshot on table: " + snapshotTable,
false, true);
this.snapshotManifest =
SnapshotManifest.create(conf, rootFs, workingDir, snapshot, monitor,
status);
+ this.lockAcquireTimeoutMs =
+ conf.getLong(HBASE_SNAPSHOT_MASTER_LOCK_ACQUIRE_TIMEOUT, 5 * 60 * 1000L);
Review Comment:
done
##########
hbase-server/src/main/java/org/apache/hadoop/hbase/master/snapshot/TakeSnapshotHandler.java:
##########
@@ -147,12 +152,16 @@ private TableDescriptor loadTableDescriptor() throws
IOException {
public TakeSnapshotHandler prepare() throws Exception {
super.prepare();
// after this, you should ensure to release this lock in case of exceptions
- this.tableLock.acquire();
- try {
- this.htd = loadTableDescriptor(); // check that .tableinfo is present
- } catch (Exception e) {
- this.tableLock.release();
- throw e;
+ if (this.tableLock.tryAcquire(this.lockAcquireTimeoutMs)) {
+ try {
+ this.htd = loadTableDescriptor(); // check that .tableinfo is present
+ } catch (Exception e) {
+ this.tableLock.release();
+ throw e;
+ }
+ } else {
+ LOG.error("Master lock could not be acquired in {} ms",
lockAcquireTimeoutMs);
+ throw new IOException("Master lock could not be acquired");
Review Comment:
done
--
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.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
