[accumulo] branch 1.9 updated: Removed unused code in TabletGroupWatcher (#1341)

[mmiller]

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

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


The following commit(s) were added to refs/heads/1.9 by this push:
     new d077b46  Removed unused code in TabletGroupWatcher (#1341)
d077b46 is described below

commit d077b4632b664a673a15dd30b8ec7d1d2b93d49a
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Tue Sep 3 11:48:11 2019 -0400

    Removed unused code in TabletGroupWatcher (#1341)
    
    * Also make some local vars private
---
 .../org/apache/accumulo/master/TabletGroupWatcher.java     | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git 
a/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
 
b/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
index cc236d2..6c98f72 100644
--- 
a/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
+++ 
b/server/master/src/main/java/org/apache/accumulo/master/TabletGroupWatcher.java
@@ -103,10 +103,8 @@ abstract class TabletGroupWatcher extends Daemon {
   private static final int ASSINGMENT_BUFFER_MAX_LENGTH = 4096;
 
   private final Master master;
-  final TabletStateStore store;
-  final TabletGroupWatcher dependentWatcher;
-
-  private MasterState masterState;
+  private final TabletStateStore store;
+  private final TabletGroupWatcher dependentWatcher;
 
   final TableStats stats = new TableStats();
   private SortedSet<TServerInstance> lastScanServers = ImmutableSortedSet.of();
@@ -124,11 +122,6 @@ abstract class TabletGroupWatcher extends Daemon {
     return stats.getLast();
   }
 
-  // returns the master state under which stats were collected
-  MasterState statsState() {
-    return masterState;
-  }
-
   TableCounts getStats(String tableId) {
     return stats.getLast(tableId);
   }
@@ -137,7 +130,7 @@ abstract class TabletGroupWatcher extends Daemon {
    * True if the collection of live tservers specified in 'candidates' hasn't 
changed since the last
    * time an assignment scan was started.
    */
-  public synchronized boolean isSameTserversAsLastScan(Set<TServerInstance> 
candidates) {
+  synchronized boolean isSameTserversAsLastScan(Set<TServerInstance> 
candidates) {
     return candidates.equals(lastScanServers);
   }
 
@@ -152,7 +145,6 @@ abstract class TabletGroupWatcher extends Daemon {
     while (this.master.stillMaster()) {
       // slow things down a little, otherwise we spam the logs when there are 
many wake-up events
       sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
-      masterState = master.getMasterState();
 
       int totalUnloaded = 0;
       int unloaded = 0;