accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [5/6] accumulo git commit: Merge branch '1.7' into 1.8
Date Mon, 15 Aug 2016 19:12:31 GMT
Merge branch '1.7' into 1.8


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8c3094f6
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8c3094f6
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8c3094f6

Branch: refs/heads/1.8
Commit: 8c3094f66188c086e105211bd4e73577f744824c
Parents: 09c3832 1e087ba
Author: Josh Elser <elserj@apache.org>
Authored: Mon Aug 15 14:14:11 2016 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Mon Aug 15 14:14:11 2016 -0400

----------------------------------------------------------------------
 .../core/client/impl/ThriftScanner.java         | 16 ++++---
 .../org/apache/accumulo/core/conf/Property.java |  2 +
 .../core/client/impl/ThriftScannerTest.java     | 45 ++++++++++++++++++++
 3 files changed, 56 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/8c3094f6/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java
index 91b2637,d2fc259..fc3be57
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ThriftScanner.java
@@@ -38,7 -36,7 +38,8 @@@ import org.apache.accumulo.core.client.
  import org.apache.accumulo.core.client.TableOfflineException;
  import org.apache.accumulo.core.client.impl.TabletLocator.TabletLocation;
  import org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException;
 +import org.apache.accumulo.core.client.sample.SamplerConfiguration;
+ import org.apache.accumulo.core.conf.Property;
  import org.apache.accumulo.core.data.Column;
  import org.apache.accumulo.core.data.Key;
  import org.apache.accumulo.core.data.KeyValue;
@@@ -252,11 -243,11 +254,11 @@@ public class ThriftScanner 
  
                error = "Failed to locate tablet for table : " + scanState.tableId + " row
: " + scanState.startRow;
                if (!error.equals(lastError))
 -                log.debug(error);
 +                log.debug("{}", error);
                else if (log.isTraceEnabled())
 -                log.trace(error);
 +                log.trace("{}", error);
                lastError = error;
-               sleepMillis = pause(sleepMillis);
+               sleepMillis = pause(sleepMillis, maxSleepTime);
              } else {
                // when a tablet splits we do want to continue scanning the low child
                // of the split if we are already passed it
@@@ -279,12 -270,12 +281,12 @@@
            } catch (AccumuloException e) {
              error = "exception from tablet loc " + e.getMessage();
              if (!error.equals(lastError))
 -              log.debug(error);
 +              log.debug("{}", error);
              else if (log.isTraceEnabled())
 -              log.trace(error);
 +              log.trace("{}", error);
  
              lastError = error;
-             sleepMillis = pause(sleepMillis);
+             sleepMillis = pause(sleepMillis, maxSleepTime);
            } finally {
              locateSpan.stop();
            }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/8c3094f6/core/src/main/java/org/apache/accumulo/core/conf/Property.java
----------------------------------------------------------------------


Mime
View raw message