accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ibe...@apache.org
Subject [accumulo] 01/01: Merge branch '1.7' into 1.8
Date Tue, 27 Feb 2018 16:57:37 GMT
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 898d2df93ac5189cdc920b1fb693d91a44d72833
Merge: f0684b2 e0cf7cd
Author: Ivan Bella <ivan@bella.name>
AuthorDate: Tue Feb 27 11:55:26 2018 -0500

    Merge branch '1.7' into 1.8

 .../org/apache/accumulo/fate/zookeeper/Retry.java  | 47 +++++++++++++++++-----
 .../apache/accumulo/fate/zookeeper/RetryTest.java  |  8 +++-
 .../accumulo/tserver/log/TabletServerLogger.java   |  5 +--
 3 files changed, 45 insertions(+), 15 deletions(-)

diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
index fe646b9,1b180a2..92efb9c
--- 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,20 -322,25 +403,19 @@@ 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) {
-         writeRetry.logRetry(log, "Logs closed while writing");
+         writeRetry.logRetry(log, "Logs closed while writing", ex);
        } catch (Exception t) {
-         if (writeRetry.retriesCompleted() != 0)
-           writeRetry.logRetry(log, "Failed to write to WAL", t);
+         writeRetry.logRetry(log, "Failed to write to WAL", t);
  
          try {
            // Backoff

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

Mime
View raw message