[GitHub] [iceberg] pvary commented on a diff in pull request #6451: Hive: Lock hardening

[GitBox <gi...@apache.org>]

pvary commented on code in PR #6451:
URL: https://github.com/apache/iceberg/pull/6451#discussion_r1056518850


##########
hive-metastore/src/main/java/org/apache/iceberg/hive/HiveTableOperations.java:
##########
@@ -617,9 +624,27 @@ long acquireLock() throws UnknownHostException, TException, InterruptedException
             Lists.newArrayList(lockComponent),
             System.getProperty("user.name"),
             InetAddress.getLocalHost().getHostName());
-    LockResponse lockResponse = metaClients.run(client -> client.lock(lockRequest));
-    AtomicReference<LockState> state = new AtomicReference<>(lockResponse.getState());
-    long lockId = lockResponse.getLockid();
+
+    // Only works in Hive 2 or later.
+    if (MetastoreVersion.min(MetastoreVersion.HIVE_2)) {
+      lockRequest.setAgentInfo(agentInfo);
+    }
+
+    Pair<Long, LockState> lockResult;
+    try {
+      lockResult = tryLock(lockRequest);
+    } catch (TException e) {
+      // Try to find the lock. Only works in Hive 2 or later.
+      if (MetastoreVersion.min(MetastoreVersion.HIVE_2)) {
+        lockResult = reTryLock(agentInfo, lockRequest);
+      } else {
+        LOG.info("Could not retry with HMSClient {}", MetastoreVersion.current(), e);

Review Comment:
   The Exception is rethrown, and most likely logged later.
   This log line is only here to highlight the  codepath used
   



-- 
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: issues-unsubscribe@iceberg.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org