(accumulo) branch elasticity updated: Rename a couple more Fate variables (#4253)

[cshannon]

This is an automated email from the ASF dual-hosted git repository.

cshannon pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/elasticity by this push:
     new ac6ee4f564 Rename a couple more Fate variables (#4253)
ac6ee4f564 is described below

commit ac6ee4f56415a551d682a6b00e33f89103659856
Author: Christopher L. Shannon <cshan...@apache.org>
AuthorDate: Sat Mar 16 15:29:27 2024 -0400

    Rename a couple more Fate variables (#4253)
---
 .../src/main/java/org/apache/accumulo/core/fate/AdminUtil.java | 10 +++++-----
 .../apache/accumulo/manager/metrics/fate/FateMetricValues.java |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/org/apache/accumulo/core/fate/AdminUtil.java 
b/core/src/main/java/org/apache/accumulo/core/fate/AdminUtil.java
index c18defb1ac..bea7d3518c 100644
--- a/core/src/main/java/org/apache/accumulo/core/fate/AdminUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/fate/AdminUtil.java
@@ -224,7 +224,7 @@ public class AdminUtil<T> {
    * Get the FATE transaction status and lock information stored in zookeeper, 
optionally filtered
    * by fate id, status, and fate instance type
    *
-   * @param zs read-only zoostore
+   * @param mfs read-only MetaFateStore
    * @param zk zookeeper reader.
    * @param lockPath the zookeeper path for locks
    * @param fateIdFilter filter results to include only provided fate 
transaction ids
@@ -234,7 +234,7 @@ public class AdminUtil<T> {
    * @throws KeeperException if zookeeper exception occurs
    * @throws InterruptedException if process is interrupted.
    */
-  public FateStatus getStatus(ReadOnlyFateStore<T> zs, ZooReader zk,
+  public FateStatus getStatus(ReadOnlyFateStore<T> mfs, ZooReader zk,
       ServiceLock.ServiceLockPath lockPath, Set<FateId> fateIdFilter, 
EnumSet<TStatus> statusFilter,
       EnumSet<FateInstanceType> typesFilter) throws KeeperException, 
InterruptedException {
     Map<FateId,List<String>> heldLocks = new HashMap<>();
@@ -242,15 +242,15 @@ public class AdminUtil<T> {
 
     findLocks(zk, lockPath, heldLocks, waitingLocks);
 
-    return getTransactionStatus(Map.of(FateInstanceType.META, zs), 
fateIdFilter, statusFilter,
+    return getTransactionStatus(Map.of(FateInstanceType.META, mfs), 
fateIdFilter, statusFilter,
         typesFilter, heldLocks, waitingLocks);
   }
 
-  public FateStatus getStatus(ReadOnlyFateStore<T> as, Set<FateId> 
fateIdFilter,
+  public FateStatus getStatus(ReadOnlyFateStore<T> ufs, Set<FateId> 
fateIdFilter,
       EnumSet<TStatus> statusFilter, EnumSet<FateInstanceType> typesFilter)
       throws KeeperException, InterruptedException {
 
-    return getTransactionStatus(Map.of(FateInstanceType.USER, as), 
fateIdFilter, statusFilter,
+    return getTransactionStatus(Map.of(FateInstanceType.USER, ufs), 
fateIdFilter, statusFilter,
         typesFilter, new HashMap<>(), new HashMap<>());
   }
 
diff --git 
a/server/manager/src/main/java/org/apache/accumulo/manager/metrics/fate/FateMetricValues.java
 
b/server/manager/src/main/java/org/apache/accumulo/manager/metrics/fate/FateMetricValues.java
index 841cf61dd1..9850e2c7b9 100644
--- 
a/server/manager/src/main/java/org/apache/accumulo/manager/metrics/fate/FateMetricValues.java
+++ 
b/server/manager/src/main/java/org/apache/accumulo/manager/metrics/fate/FateMetricValues.java
@@ -98,11 +98,11 @@ class FateMetricValues {
    *
    * @param context Accumulo context
    * @param fateRootPath the zookeeper path to fate info
-   * @param zooStore a readonly zoostore
+   * @param metaFateStore a readonly MetaFateStore
    * @return the current FATE metric values.
    */
   public static FateMetricValues getFromZooKeeper(final ServerContext context,
-      final String fateRootPath, final ReadOnlyFateStore<FateMetrics> 
zooStore) {
+      final String fateRootPath, final ReadOnlyFateStore<FateMetrics> 
metaFateStore) {
 
     FateMetricValues.Builder builder = FateMetricValues.builder();
 
@@ -110,8 +110,8 @@ class FateMetricValues {
 
     try {
 
-      List<AdminUtil.TransactionStatus> currFates =
-          admin.getTransactionStatus(Map.of(FateInstanceType.META, zooStore), 
null, null, null);
+      List<AdminUtil.TransactionStatus> currFates = admin
+          .getTransactionStatus(Map.of(FateInstanceType.META, metaFateStore), 
null, null, null);
 
       builder.withCurrentFateOps(currFates.size());