accumulo-commits mailing list archives

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


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

Branch: refs/heads/master
Commit: 45d73b1fa7883aa8109f9dec37f4c5b065890348
Parents: 62ba8ef 8c3094f
Author: Josh Elser <elserj@apache.org>
Authored: Mon Aug 15 15:11:38 2016 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Mon Aug 15 15:11:38 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/45d73b1f/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 6e07b30,fc3be57..7f85afc
--- 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
@@@ -207,13 -208,13 +208,13 @@@ public class ThriftScanner 
  
    }
  
-   private static long pause(long millis) throws InterruptedException {
+   static long pause(long millis, long maxSleep) throws InterruptedException {
      Thread.sleep(millis);
      // wait 2 * last time, with +-10% random jitter
-     return (long) (Math.max(millis * 2, 3000) * (.9 + Math.random() / 5));
+     return (long) (Math.min(millis * 2, maxSleep) * (.9 + Math.random() / 5));
    }
  
 -  public static List<KeyValue> scan(ClientContext context, ScanState scanState, int
timeOut) throws ScanTimedOutException, AccumuloException,
 +  public static List<KeyValue> scan(ClientContext context, ScanState scanState, long
timeOut) throws ScanTimedOutException, AccumuloException,
        AccumuloSecurityException, TableNotFoundException {
      TabletLocation loc = null;
      Instance instance = context.getInstance();

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


Mime
View raw message