accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ktur...@apache.org
Subject [accumulo] 01/01: Merge branch '1.9'
Date Mon, 02 Jul 2018 14:21:12 GMT
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 13a025d740a3f7bc3ca078f3557bff45f7751c60
Merge: 1311520 9a5b7bd
Author: Keith Turner <kturner@apache.org>
AuthorDate: Mon Jul 2 10:20:11 2018 -0400

    Merge branch '1.9'

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

diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
index 28c32a5,4590872..2ef4087
--- 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
@@@ -2484,11 -2500,13 +2473,13 @@@ public class Tablet implements TabletCo
      }
  
      for (String logger : currentLogsCopy) {
 -      log.debug("Logs for current memory: " + getExtent() + " " + logger);
 +      log.debug("Logs for current memory: {} {}", getExtent(), logger);
      }
  
-     for (String logger : doomed) {
-       log.debug("Logs to be destroyed: {} {}", getExtent(), logger);
+     Set<String> doomed = new HashSet<>();
+     for (DfsLogger logger : doomedLogs) {
 -      log.debug("Logs to be destroyed: " + getExtent() + " " + logger.getMeta());
++      log.debug("Logs to be destroyed: {} {}", getExtent(), logger.getMeta());
+       doomed.add(logger.getMeta());
      }
  
      return doomed;


Mime
View raw message