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

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

commit 46a5bdb8daa2a284be555eb6d2fe0769811a7cd2
Merge: 53c0e4f b52db47
Author: Ivan Bella <i...@bella.name>
AuthorDate: Thu Feb 1 16:51:41 2018 -0500

    Merge branch '1.7' into 1.8

 .../org/apache/accumulo/fate/zookeeper/Retry.java  | 60 ++++++++++++++++++++--
 .../accumulo/fate/zookeeper/RetryFactory.java      | 17 ++++--
 .../accumulo/fate/zookeeper/RetryFactoryTest.java  | 10 ++--
 .../apache/accumulo/fate/zookeeper/RetryTest.java  | 32 ++++++++++--
 .../org/apache/accumulo/tserver/TabletServer.java  |  5 +-
 .../accumulo/tserver/log/TabletServerLogger.java   |  5 +-
 6 files changed, 108 insertions(+), 21 deletions(-)

diff --cc 
server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
index da3ef0b,3843210..fe646b9
--- 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
+++ 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
@@@ -403,19 -322,26 +403,20 @@@ public class TabletServerLogger 
          }
  
          // Make sure that the logs haven't changed out from underneath our 
copy
 -        if (currentLogSet == logSetId.get()) {
 +        if (currentLogId == logId.get()) {
  
            // write the mutation to the logs
 -          ArrayList<LoggerOperation> queuedOperations = new 
ArrayList<>(copy.size());
 -          for (DfsLogger wal : copy) {
 -            queuedOperations.add(writer.write(wal));
 -          }
 -
 -          for (LoggerOperation lop : queuedOperations) {
 -            lop.await();
 -          }
 +          LoggerOperation lop = writer.write(copy);
 +          lop.await();
  
            // double-check: did the log set change?
 -          success = (currentLogSet == logSetId.get());
 +          success = (currentLogId == logId.get());
          }
        } catch (DfsLogger.LogClosedException ex) {
-         log.debug("Logs closed while writing, retrying attempt " + 
writeRetry.retriesCompleted());
+         writeRetry.logRetry(log, "Logs closed while writing");
        } catch (Exception t) {
-         log.warn("Failed to write to WAL, retrying attempt " + 
writeRetry.retriesCompleted(), t);
+         if (writeRetry.retriesCompleted() != 0)
+           writeRetry.logRetry(log, "Failed to write to WAL", t);
  
          try {
            // Backoff

-- 
To stop receiving notification emails like this one, please contact
ibe...@apache.org.

Reply via email to