[accumulo] 02/02: Merge branch '1.9'

[kturner]

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

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

commit e374cc513ee13edbcb745ce04ebab34ad523eba2
Merge: 5474f5a 8519514
Author: Keith Turner <ktur...@apache.org>
AuthorDate: Fri Jul 13 16:34:03 2018 -0400

    Merge branch '1.9'

 .../org/apache/accumulo/tserver/tablet/Tablet.java | 64 ++++++++++++++--------
 1 file changed, 42 insertions(+), 22 deletions(-)

diff --cc 
server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
index 013c5c7,4dc19f2..b2733ca
--- 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
+++ 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
@@@ -147,14 -148,17 +147,17 @@@ import org.apache.hadoop.fs.FileStatus
  import org.apache.hadoop.fs.FileSystem;
  import org.apache.hadoop.fs.Path;
  import org.apache.hadoop.io.Text;
 -import org.apache.log4j.Logger;
  import org.apache.zookeeper.KeeperException;
  import org.apache.zookeeper.KeeperException.NoNodeException;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
  
  import com.google.common.annotations.VisibleForTesting;
 -import com.google.common.base.Optional;
+ import com.google.common.base.Preconditions;
  import com.google.common.cache.Cache;
  import com.google.common.cache.CacheBuilder;
+ import com.google.common.collect.ImmutableSet;
+ import com.google.common.collect.ImmutableSet.Builder;
  
  /**
   *
@@@ -494,9 -498,11 +497,11 @@@ public class Tablet implements TabletCo
              logEntry.getColumnQualifier().toString()));
        }
  
+       rebuildReferencedLogs();
+ 
        log.info(
 -          "Write-Ahead Log recovery complete for " + this.extent + " (" + 
entriesUsedOnTablet.get()
 -              + " mutations applied, " + getTabletMemory().getNumEntries() + 
" entries created)");
 +          "Write-Ahead Log recovery complete for {} ({} mutations applied, {} 
entries created)",
 +          this.extent, entriesUsedOnTablet.get(), 
getTabletMemory().getNumEntries());
      }
  
      String contextName = tableConfiguration.get(Property.TABLE_CLASSPATH);
@@@ -2480,16 -2519,14 +2499,14 @@@
      }
  
      for (String logger : currentLogsCopy) {
 -      log.debug("Logs for current memory: " + getExtent() + " " + logger);
 +      log.debug("Logs for current memory: {} {}", getExtent(), logger);
      }
  
-     Set<String> doomed = new HashSet<>();
-     for (DfsLogger logger : doomedLogs) {
-       log.debug("Logs to be destroyed: {} {}", getExtent(), logger.getMeta());
-       doomed.add(logger.getMeta());
+     for (String logger : unusedLogs) {
 -      log.debug("Logs to be destroyed: " + getExtent() + " " + logger);
++      log.debug("Logs to be destroyed: {} {}", getExtent(), logger);
      }
  
-     return doomed;
+     return unusedLogs;
    }
  
    synchronized void finishClearingUnusedLogs() {