(accumulo) branch elasticity updated: Removed special handling logic in TabletManagementIterator (#4363)

[dlmarion]

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

dlmarion 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 b4a2ac45b6 Removed special handling logic in TabletManagementIterator 
(#4363)
b4a2ac45b6 is described below

commit b4a2ac45b69f2b7b6f052e029354cfebb2e66b9a
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Wed Mar 13 07:38:47 2024 -0400

    Removed special handling logic in TabletManagementIterator (#4363)
    
    Removed the logic that always returns the TabletMetadata
    when the Manager state is not normal, or there are no
    tablet servers, or no online tables. The code now just
    calls computeTabletManagementActions in all cases.
    
    Closes #4256
---
 .../org/apache/accumulo/core/metadata/TabletState.java     |  4 ----
 .../accumulo/server/manager/state/TabletGoalState.java     |  3 +++
 .../server/manager/state/TabletManagementIterator.java     | 14 +-------------
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git 
a/core/src/main/java/org/apache/accumulo/core/metadata/TabletState.java 
b/core/src/main/java/org/apache/accumulo/core/metadata/TabletState.java
index 9fcf8add3f..ba182514d1 100644
--- a/core/src/main/java/org/apache/accumulo/core/metadata/TabletState.java
+++ b/core/src/main/java/org/apache/accumulo/core/metadata/TabletState.java
@@ -21,14 +21,10 @@ package org.apache.accumulo.core.metadata;
 import java.util.Set;
 
 import org.apache.accumulo.core.metadata.schema.TabletMetadata;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public enum TabletState {
   UNASSIGNED, ASSIGNED, HOSTED, ASSIGNED_TO_DEAD_SERVER, SUSPENDED;
 
-  private static Logger log = LoggerFactory.getLogger(TabletState.class);
-
   public static TabletState compute(TabletMetadata tm, Set<TServerInstance> 
liveTServers) {
     TabletMetadata.Location current = null;
     TabletMetadata.Location future = null;
diff --git 
a/server/base/src/main/java/org/apache/accumulo/server/manager/state/TabletGoalState.java
 
b/server/base/src/main/java/org/apache/accumulo/server/manager/state/TabletGoalState.java
index 81e796608c..0b9b83f159 100644
--- 
a/server/base/src/main/java/org/apache/accumulo/server/manager/state/TabletGoalState.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/manager/state/TabletGoalState.java
@@ -103,6 +103,9 @@ public enum TabletGoalState {
             if (!tm.getHostingRequested()) {
               return UNASSIGNED;
             }
+            break;
+          default:
+            break;
         }
       }
 
diff --git 
a/server/base/src/main/java/org/apache/accumulo/server/manager/state/TabletManagementIterator.java
 
b/server/base/src/main/java/org/apache/accumulo/server/manager/state/TabletManagementIterator.java
index 2e6627c78e..39329b0e42 100644
--- 
a/server/base/src/main/java/org/apache/accumulo/server/manager/state/TabletManagementIterator.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/manager/state/TabletManagementIterator.java
@@ -43,7 +43,6 @@ import 
org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 import org.apache.accumulo.core.iterators.user.WholeRowIterator;
 import org.apache.accumulo.core.manager.state.TabletManagement;
 import 
org.apache.accumulo.core.manager.state.TabletManagement.ManagementAction;
-import org.apache.accumulo.core.manager.thrift.ManagerState;
 import org.apache.accumulo.core.metadata.TabletState;
 import org.apache.accumulo.core.metadata.schema.TabletMetadata;
 import org.apache.accumulo.core.metadata.schema.TabletOperationType;
@@ -200,18 +199,7 @@ public class TabletManagementIterator extends 
SkippingIterator {
       Exception error = null;
       try {
         LOG.trace("Evaluating extent: {}", tm);
-        if (tm.getExtent().isMeta()) {
-          computeTabletManagementActions(tm, actions);
-        } else {
-          if (tabletMgmtParams.getManagerState() != ManagerState.NORMAL
-              || tabletMgmtParams.getOnlineTsevers().isEmpty()
-              || tabletMgmtParams.getOnlineTables().isEmpty()) {
-            // when manager is in the process of starting up or shutting down 
return everything.
-            actions.add(ManagementAction.NEEDS_LOCATION_UPDATE);
-          } else {
-            computeTabletManagementActions(tm, actions);
-          }
-        }
+        computeTabletManagementActions(tm, actions);
       } catch (Exception e) {
         LOG.error("Error computing tablet management actions for extent: {}", 
tm.getExtent(), e);
         error = e;