review-1

apache · Jan 7, 2025 · 0390bf3 · 0390bf3
1 parent 205d484
commit 0390bf3
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 29 deletions.
diff --git a/ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/Cleaner.java b/ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/Cleaner.java
@@ -21,7 +21,7 @@
 import org.apache.hadoop.hive.metastore.ReplChangeManager;
 import org.apache.hadoop.hive.metastore.conf.MetastoreConf;
 import org.apache.hadoop.hive.metastore.metrics.MetricsConstants;
-import org.apache.hadoop.hive.metastore.txn.TxnDummyMutex;
+import org.apache.hadoop.hive.metastore.txn.NoMutex;
 import org.apache.hadoop.hive.metastore.txn.TxnStore;
 import org.apache.hadoop.hive.ql.txn.compactor.handler.TaskHandler;
 import org.apache.hadoop.hive.ql.txn.compactor.handler.TaskHandlerFactory;
@@ -72,7 +72,7 @@ public void run() {
     LOG.info("Starting Cleaner thread");
     try {
       do {
-        TxnStore.MutexAPI mutex =  shouldUseMutex ? txnHandler.getMutexAPI() : new TxnDummyMutex();
+        TxnStore.MutexAPI mutex =  shouldUseMutex ? txnHandler.getMutexAPI() : new NoMutex();
         metadataCache.invalidate();
         long startedAt = -1;
 

diff --git a/ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/Initiator.java b/ql/src/java/org/apache/hadoop/hive/ql/txn/compactor/Initiator.java
@@ -26,7 +26,7 @@
 import org.apache.hadoop.hive.metastore.conf.MetastoreConf;
 import org.apache.hadoop.hive.metastore.metrics.MetricsConstants;
 import org.apache.hadoop.hive.metastore.metrics.PerfLogger;
-import org.apache.hadoop.hive.metastore.txn.TxnDummyMutex;
+import org.apache.hadoop.hive.metastore.txn.NoMutex;
 import org.apache.hadoop.hive.metastore.txn.entities.CompactionInfo;
 import org.apache.hadoop.hive.metastore.txn.TxnCommonUtils;
 import org.apache.hadoop.hive.metastore.txn.TxnStore;
@@ -72,7 +72,7 @@ public void run() {
       long abortedTimeThreshold = HiveConf
           .getTimeVar(conf, HiveConf.ConfVars.HIVE_COMPACTOR_ABORTEDTXN_TIME_THRESHOLD,
               TimeUnit.MILLISECONDS);
-      TxnStore.MutexAPI mutex = shouldUseMutex ? txnHandler.getMutexAPI() : new TxnDummyMutex();
+      TxnStore.MutexAPI mutex = shouldUseMutex ? txnHandler.getMutexAPI() : new NoMutex();
 
       // Make sure we run through the loop once before checking to stop as this makes testing
       // much easier.  The stop value is only for testing anyway and not used when called from

diff --git a/.../metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetastoreTaskThread.java b/.../metastore-common/src/main/java/org/apache/hadoop/hive/metastore/MetastoreTaskThread.java
@@ -46,9 +46,9 @@ default long initialDelay(TimeUnit unit) {
 
   /**
    * Should use mutex support to allow only one copy of this task running across the warehouse.
-   * @param enableMutex true for enabling the mutex, false otherwise
+   * @param useMutex true for enabling the mutex, false otherwise
    */
-  default void shouldUseMutex(boolean enableMutex) {
+  default void enforceMutex(boolean useMutex) {
     // no-op
   }
 }
diff --git a/...rc/main/java/org/apache/hadoop/hive/metastore/MaterializationsRebuildLockCleanerTask.java b/...rc/main/java/org/apache/hadoop/hive/metastore/MaterializationsRebuildLockCleanerTask.java
@@ -21,7 +21,7 @@
 import org.apache.hadoop.hive.common.ValidTxnList;
 import org.apache.hadoop.hive.metastore.conf.MetastoreConf;
 import org.apache.hadoop.hive.metastore.txn.TxnCommonUtils;
-import org.apache.hadoop.hive.metastore.txn.TxnDummyMutex;
+import org.apache.hadoop.hive.metastore.txn.NoMutex;
 import org.apache.hadoop.hive.metastore.txn.TxnStore;
 import org.apache.hadoop.hive.metastore.txn.TxnUtils;
 import org.slf4j.Logger;
@@ -62,7 +62,7 @@ public void run() {
       LOG.debug("Cleaning up materialization rebuild locks");
     }
 
-    TxnStore.MutexAPI mutex = shouldUseMutex ? txnHandler.getMutexAPI() : new TxnDummyMutex();
+    TxnStore.MutexAPI mutex = shouldUseMutex ? txnHandler.getMutexAPI() : new NoMutex();
     try (AutoCloseable closeable = mutex.acquireLock(TxnStore.MUTEX_KEY.MaterializationRebuild.name())) {
       ValidTxnList validTxnList = TxnCommonUtils.createValidReadTxnList(txnHandler.getOpenTxns(), 0);
       long removedCnt = txnHandler.cleanupMaterializationRebuildLocks(validTxnList,
@@ -78,7 +78,7 @@ public void run() {
   }
 
   @Override
-  public void shouldUseMutex(boolean enableMutex) {
+  public void enforceMutex(boolean enableMutex) {
     this.shouldUseMutex = enableMutex;
   }
 }
diff --git a/...etastore-server/src/main/java/org/apache/hadoop/hive/metastore/leader/CompactorTasks.java b/...etastore-server/src/main/java/org/apache/hadoop/hive/metastore/leader/CompactorTasks.java
@@ -138,7 +138,7 @@ public void takeLeadership(LeaderElection election) throws Exception {
       AtomicBoolean flag = new AtomicBoolean();
       thread.setConf(configuration);
       thread.init(flag);
-      thread.shouldUseMutex(election.hasMultipleLeaders());
+      thread.shouldUseMutex(election.enforceMutex());
       metastoreThreadsMap.put(thread, flag);
       HiveMetaStore.LOG.info("Starting metastore thread of type " + thread.getClass().getName());
       thread.start();

diff --git a/...store-server/src/main/java/org/apache/hadoop/hive/metastore/leader/HouseKeepingTasks.java b/...store-server/src/main/java/org/apache/hadoop/hive/metastore/leader/HouseKeepingTasks.java
@@ -99,7 +99,7 @@ public void takeLeadership(LeaderElection election) throws Exception {
       List<MetastoreTaskThread> alwaysTasks = new ArrayList<>(getAlwaysTasks());
       for (MetastoreTaskThread task : alwaysTasks) {
         task.setConf(configuration);
-        task.shouldUseMutex(election.hasMultipleLeaders());
+        task.enforceMutex(election.enforceMutex());
         long freq = task.runFrequency(TimeUnit.MILLISECONDS);
         // For backwards compatibility, since some threads used to be hard coded but only run if
         // frequency was > 0
@@ -112,7 +112,7 @@ public void takeLeadership(LeaderElection election) throws Exception {
       List<MetastoreTaskThread> remoteOnlyTasks = new ArrayList<>(getRemoteOnlyTasks());
       for (MetastoreTaskThread task : remoteOnlyTasks) {
         task.setConf(configuration);
-        task.shouldUseMutex(election.hasMultipleLeaders());
+        task.enforceMutex(election.enforceMutex());
         long freq = task.runFrequency(TimeUnit.MILLISECONDS);
         runningTasks.add(task);
         metastoreTaskThreadPool.getPool().scheduleAtFixedRate(task, freq, freq, TimeUnit.MILLISECONDS);

diff --git a/...etastore-server/src/main/java/org/apache/hadoop/hive/metastore/leader/LeaderElection.java b/...etastore-server/src/main/java/org/apache/hadoop/hive/metastore/leader/LeaderElection.java
@@ -35,7 +35,7 @@ public interface LeaderElection<T> extends Closeable {
   // leader election methods running inside the warehouse, so it's hard to know how many HMS instances
   // that elected as the leader. Relying on this property to tell us, default is true, means it has multiple
   // HMS instances acting as the leader.
-  public static final String HAVE_MULTIPLE_LEADERS = "hive.metastore.have.multiple.leaders";
+  static final String HIVE_TXN_ENFORCE_AUX_MUTEX = "hive.metastore.enforce.aux.mutex";
 
   /**
    * Place where election happens
@@ -70,7 +70,7 @@ public void tryBeLeader(Configuration conf, T mutex)
    */
   public String getName();
 
-  default boolean hasMultipleLeaders() {
+  default boolean enforceMutex() {
     return true;
   }
 

diff --git a/...ore-server/src/main/java/org/apache/hadoop/hive/metastore/leader/LeaseLeaderElection.java b/...ore-server/src/main/java/org/apache/hadoop/hive/metastore/leader/LeaseLeaderElection.java
@@ -95,7 +95,7 @@ public class LeaseLeaderElection implements LeaderElection<TableName> {
   private String name;
   private String userName;
   private String hostName;
-  private boolean multipleLeaders;
+  private boolean enforceMutex;
 
   public LeaseLeaderElection() throws IOException {
     userName = SecurityUtils.getUser();
@@ -153,7 +153,7 @@ private void notifyListener() {
   public void tryBeLeader(Configuration conf, TableName table) throws LeaderException {
     requireNonNull(conf, "conf is null");
     requireNonNull(table, "table is null");
-    this.multipleLeaders = conf.getBoolean(HAVE_MULTIPLE_LEADERS, true);
+    this.enforceMutex = conf.getBoolean(HIVE_TXN_ENFORCE_AUX_MUTEX, true);
     if (store == null) {
       store = TxnUtils.getTxnStore(conf);
     }
@@ -474,7 +474,7 @@ public String getName() {
   }
 
   @Override
-  public boolean hasMultipleLeaders() {
+  public boolean enforceMutex() {
     return this.multipleLeaders;
   }
 }
diff --git a/...re-server/src/main/java/org/apache/hadoop/hive/metastore/leader/StaticLeaderElection.java b/...re-server/src/main/java/org/apache/hadoop/hive/metastore/leader/StaticLeaderElection.java
@@ -39,14 +39,14 @@ public class StaticLeaderElection implements LeaderElection<String> {
   private volatile boolean isLeader;
   private String name;
   private List<LeadershipStateListener> listeners = new ArrayList<>();
-  private boolean multipleLeaders;
+  private boolean enforceMutex;
 
   @Override
   public void tryBeLeader(Configuration conf, String hostName)
       throws LeaderException {
     String leaderHost = MetastoreConf.getVar(conf,
         MetastoreConf.ConfVars.METASTORE_HOUSEKEEPING_LEADER_HOSTNAME);
-    this.multipleLeaders = conf.getBoolean(HAVE_MULTIPLE_LEADERS, true);
+    this.enforceMutex = conf.getBoolean(HIVE_TXN_ENFORCE_AUX_MUTEX, true);
     // For the sake of backward compatibility, when the current HMS becomes the leader when no
     // leader is specified.
     if (leaderHost == null || leaderHost.isEmpty()) {
@@ -105,7 +105,7 @@ public void close() {
   }
 
   @Override
-  public boolean hasMultipleLeaders() {
-    return this.multipleLeaders;
+  public boolean enforceMutex() {
+    return this.enforceMutex;
   }
 }
diff --git a/...astore-server/src/main/java/org/apache/hadoop/hive/metastore/leader/StatsUpdaterTask.java b/...astore-server/src/main/java/org/apache/hadoop/hive/metastore/leader/StatsUpdaterTask.java
@@ -76,7 +76,7 @@ public void takeLeadership(LeaderElection election) throws Exception {
         thread.setConf(configuration);
         stop = new AtomicBoolean(false);
         thread.init(stop);
-        thread.shouldUseMutex(election.hasMultipleLeaders());
+        thread.shouldUseMutex(election.enforceMutex());
         HiveMetaStore.LOG.info("Starting metastore thread of type " + thread.getClass().getName());
         thread.start();
       } catch (Exception e) {

diff --git a/...oop/hive/metastore/txn/TxnDummyMutex.java → ...he/hadoop/hive/metastore/txn/NoMutex.java b/...oop/hive/metastore/txn/TxnDummyMutex.java → ...he/hadoop/hive/metastore/txn/NoMutex.java
@@ -22,7 +22,7 @@
 /**
  * An empty implementation of TxnStore.MutexAPI
  */
-public class TxnDummyMutex implements TxnStore.MutexAPI {
+public class NoMutex implements TxnStore.MutexAPI {
 
   @Override
   public LockHandle acquireLock(String key) throws MetaException {

diff --git a/...er/src/main/java/org/apache/hadoop/hive/metastore/txn/service/AcidHouseKeeperService.java b/...er/src/main/java/org/apache/hadoop/hive/metastore/txn/service/AcidHouseKeeperService.java
@@ -23,7 +23,7 @@
 import org.apache.hadoop.hive.metastore.MetastoreTaskThread;
 import org.apache.hadoop.hive.metastore.api.MetaException;
 import org.apache.hadoop.hive.metastore.conf.MetastoreConf;
-import org.apache.hadoop.hive.metastore.txn.TxnDummyMutex;
+import org.apache.hadoop.hive.metastore.txn.NoMutex;
 import org.apache.hadoop.hive.metastore.txn.TxnStore;
 import org.apache.hadoop.hive.metastore.txn.TxnUtils;
 import org.slf4j.Logger;
@@ -80,7 +80,7 @@ public long runFrequency(TimeUnit unit) {
 
   @Override
   public void run() {
-    TxnStore.MutexAPI mutex = shouldUseMutex ? txnHandler.getMutexAPI() : new TxnDummyMutex();
+    TxnStore.MutexAPI mutex = shouldUseMutex ? txnHandler.getMutexAPI() : new NoMutex();
     try (AutoCloseable closeable = mutex.acquireLock(TxnStore.MUTEX_KEY.HouseKeeper.name())) {
       LOG.info("Starting to run {}", serviceName);
       long start = System.currentTimeMillis();
@@ -106,7 +106,7 @@ private long elapsedSince(long start) {
   }
 
   @Override
-  public void shouldUseMutex(boolean enableMutex) {
+  public void enforceMutex(boolean enableMutex) {
     this.shouldUseMutex = enableMutex;
   }
 }
diff --git a/...ver/src/main/java/org/apache/hadoop/hive/metastore/txn/service/AcidTxnCleanerService.java b/...ver/src/main/java/org/apache/hadoop/hive/metastore/txn/service/AcidTxnCleanerService.java
@@ -20,7 +20,7 @@
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hive.metastore.MetastoreTaskThread;
 import org.apache.hadoop.hive.metastore.conf.MetastoreConf;
-import org.apache.hadoop.hive.metastore.txn.TxnDummyMutex;
+import org.apache.hadoop.hive.metastore.txn.NoMutex;
 import org.apache.hadoop.hive.metastore.txn.TxnStore;
 import org.apache.hadoop.hive.metastore.txn.TxnUtils;
 import org.slf4j.Logger;
@@ -58,7 +58,7 @@ public long runFrequency(TimeUnit unit) {
 
   @Override
   public void run() {
-    TxnStore.MutexAPI mutex = shouldUseMutex ? txnHandler.getMutexAPI() : new TxnDummyMutex();
+    TxnStore.MutexAPI mutex = shouldUseMutex ? txnHandler.getMutexAPI() : new NoMutex();
     try (AutoCloseable closeable = mutex.acquireLock(TxnStore.MUTEX_KEY.TxnCleaner.name())) {
       long start = System.currentTimeMillis();
       txnHandler.cleanEmptyAbortedAndCommittedTxns();
@@ -73,7 +73,7 @@ private long elapsedSince(long start) {
   }
 
   @Override
-  public void shouldUseMutex(boolean enableMutex) {
+  public void enforceMutex(boolean enableMutex) {
     this.shouldUseMutex = enableMutex;
   }
 }