Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id A4C82200BA1 for ; Mon, 17 Oct 2016 23:27:25 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id A36CB160AEC; Mon, 17 Oct 2016 21:27:25 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 1184B160AFC for ; Mon, 17 Oct 2016 23:27:22 +0200 (CEST) Received: (qmail 82454 invoked by uid 500); 17 Oct 2016 21:27:19 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 82079 invoked by uid 99); 17 Oct 2016 21:27:19 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Oct 2016 21:27:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 57679F0BEA; Mon, 17 Oct 2016 21:27:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dimaspivak@apache.org To: commits@hbase.apache.org Date: Mon, 17 Oct 2016 21:27:26 -0000 Message-Id: <7b9b1b5e44f74cf5a8fc07b1c13e4b5b@git.apache.org> In-Reply-To: <5b0beac2212646a7b8b9107a0a792004@git.apache.org> References: <5b0beac2212646a7b8b9107a0a792004@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [08/52] [partial] hbase-site git commit: Published site at 278625312047a2100f4dbb2d2eaa4e2219d00e14. archived-at: Mon, 17 Oct 2016 21:27:25 -0000 http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f07ee53f/devapidocs/org/apache/hadoop/hbase/client/BufferedMutator.ExceptionListener.html ---------------------------------------------------------------------- diff --git a/devapidocs/org/apache/hadoop/hbase/client/BufferedMutator.ExceptionListener.html b/devapidocs/org/apache/hadoop/hbase/client/BufferedMutator.ExceptionListener.html index 7deca6c..1acadd1 100644 --- a/devapidocs/org/apache/hadoop/hbase/client/BufferedMutator.ExceptionListener.html +++ b/devapidocs/org/apache/hadoop/hbase/client/BufferedMutator.ExceptionListener.html @@ -107,7 +107,7 @@ var activeTableTab = "activeTableTab"; 
@InterfaceAudience.Public
  @InterfaceStability.Evolving
-public static interface BufferedMutator.ExceptionListener
+public static interface BufferedMutator.ExceptionListener
Listens for asynchronous exceptions on a BufferedMutator.
@@ -153,7 +153,7 @@ public static interface

  • onException

    -
    void onException(RetriesExhaustedWithDetailsException exception,
+
    void onException(RetriesExhaustedWithDetailsException exception,
                  BufferedMutator mutator)
           throws RetriesExhaustedWithDetailsException
    
 
    

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f07ee53f/devapidocs/org/apache/hadoop/hbase/client/BufferedMutator.html
----------------------------------------------------------------------
diff --git a/devapidocs/org/apache/hadoop/hbase/client/BufferedMutator.html b/devapidocs/org/apache/hadoop/hbase/client/BufferedMutator.html
index 99260f2..8347580 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/BufferedMutator.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/BufferedMutator.html
@@ -18,7 +18,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":6};
+var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":6,"i7":6,"i8":6};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -230,6 +230,18 @@ extends Sends a Mutation to the table.
 
 
+
+void
+setOperationTimeout(int timeout)
+
    Set operation timeout for this mutator instance
    
+
+
+
+void
+setRpcTimeout(int timeout)
+
    Set rpc timeout for this mutator instance
    
+
+
    • @@ -343,7 +355,7 @@ extends -
      +

      • getWriteBufferSize

        long getWriteBufferSize()
        @@ -356,6 +368,26 @@ extends + + +
          +
        • +

          setRpcTimeout

          +
          void setRpcTimeout(int timeout)
          +
          Set rpc timeout for this mutator instance
          +
          • +
        + + + +
          +
        • +

          setOperationTimeout

          +
          void setOperationTimeout(int timeout)
          +
          Set operation timeout for this mutator instance
          +
          • +
      http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f07ee53f/devapidocs/org/apache/hadoop/hbase/client/BufferedMutatorImpl.QueueRowAccess.html ---------------------------------------------------------------------- diff --git a/devapidocs/org/apache/hadoop/hbase/client/BufferedMutatorImpl.QueueRowAccess.html b/devapidocs/org/apache/hadoop/hbase/client/BufferedMutatorImpl.QueueRowAccess.html index 7ecf3ac..368253f 100644 --- a/devapidocs/org/apache/hadoop/hbase/client/BufferedMutatorImpl.QueueRowAccess.html +++ b/devapidocs/org/apache/hadoop/hbase/client/BufferedMutatorImpl.QueueRowAccess.html @@ -117,7 +117,7 @@ var activeTableTab = "activeTableTab";

      -
      private class BufferedMutatorImpl.QueueRowAccess
+
      private class BufferedMutatorImpl.QueueRowAccess
 extends Object
 implements RowAccess<Row>
      
 
@@ -231,7 +231,7 @@ implements 
 
    • 
 
      remainder
      
-
      private int remainder
      
+
      private int remainder
      
 
      •
    @@ -248,7 +248,7 @@ implements

  • QueueRowAccess

    -
    private QueueRowAccess()
    +
    private QueueRowAccess()
    • @@ -265,7 +265,7 @@ implements

  • reset

    -
    void reset()
    +
    void reset()
    • @@ -274,7 +274,7 @@ implements

  • iterator

    -
    public Iterator<Row> iterator()
    +
    public Iterator<Row> iterator()
    Specified by:
    iterator in interface Iterable<Row>
    @@ -287,7 +287,7 @@ implements

  • size

    -
    public int size()
    +
    public int size()
    Specified by:
    size in interface RowAccess<Row>
    @@ -302,7 +302,7 @@ implements

  • restoreRemainder

    -
    void restoreRemainder()
    +
    void restoreRemainder()
    • @@ -311,7 +311,7 @@ implements

  • isEmpty

    -
    public boolean isEmpty()
    +
    public boolean isEmpty()
    Specified by:
    isEmpty in interface RowAccess<Row>
    http://git-wip-us.apache.org/repos/asf/hbase-site/blob/f07ee53f/devapidocs/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html ---------------------------------------------------------------------- diff --git a/devapidocs/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html b/devapidocs/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html index 0ea4a67..f0c65bd 100644 --- a/devapidocs/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html +++ b/devapidocs/org/apache/hadoop/hbase/client/BufferedMutatorImpl.html @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":42,"i9":10}; +var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":42,"i11":10}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -213,28 +213,32 @@ implements maxKeyValueSize  +private int +operationTimeout  + + private ExecutorService pool  - + private TableName tableName  - + (package private) AtomicInteger undealtMutationCount
    Count the size of writeAsyncBuffer.
    - + (package private) ConcurrentLinkedQueue<Mutation> writeAsyncBuffer  - + private long writeBufferSize  - + private int writeRpcTimeout  @@ -324,13 +328,25 @@ implements void +setOperationTimeout(int timeout) +
    Set operation timeout for this mutator instance
    + + + +void +setRpcTimeout(int timeout) +
    Set rpc timeout for this mutator instance
    + + + +void setWriteBufferSize(long writeBufferSize)
    Deprecated. 
    Going away when we drop public support for HTable.
    - + void validatePut(Put put)  @@ -475,13 +491,22 @@ implements writeRpcTimeout
    • + + + +
    • @@ -498,7 +523,7 @@ implements

  • BufferedMutatorImpl

    -
    BufferedMutatorImpl(ClusterConnection conn,
+
    BufferedMutatorImpl(ClusterConnection conn,
                     RpcRetryingCallerFactory rpcCallerFactory,
                     RpcControllerFactory rpcFactory,
                     BufferedMutatorParams params)
    
@@ -518,7 +543,7 @@ implements 
 
  • 
 
    getName
    
-
    public TableName getName()
    
+
    public TableName getName()
    
 
    Description copied from interface: BufferedMutator
    
 
    Gets the fully qualified table name instance of the table that this BufferedMutator writes to.
    
 
    
@@ -533,7 +558,7 @@ implements 
 
  • 
 
    getConfiguration
    
-
    public org.apache.hadoop.conf.Configuration getConfiguration()
    
+
    public org.apache.hadoop.conf.Configuration getConfiguration()
    
 
    Description copied from interface: BufferedMutator
    
 
    Returns the Configuration object used by this instance.
  
    
@@ -551,7 +576,7 @@ implements 
 
  • 
 
    mutate
    
-
    public void mutate(Mutation m)
+
    public void mutate(Mutation m)
             throws InterruptedIOException,
                    RetriesExhaustedWithDetailsException
    
 
    Description copied from interface: BufferedMutator
    
@@ -574,7 +599,7 @@ implements 
 
  • 
 
    mutate
    
-
    public void mutate(List<? extends Mutation> ms)
+
    public void mutate(List<? extends Mutation> ms)
             throws InterruptedIOException,
                    RetriesExhaustedWithDetailsException
    
 
    Description copied from interface: BufferedMutator
    
@@ -598,7 +623,7 @@ implements 
 
  • 
 
    validatePut
    
-
    public void validatePut(Put put)
+
    public void validatePut(Put put)
                  throws IllegalArgumentException
    
 
    
 
    Throws:
    
@@ -612,7 +637,7 @@ implements 
 
  • 
 
    close
    
-
    public void close()
+
    public void close()
            throws IOException
    
 
    Description copied from interface: BufferedMutator
    
 
    Performs a BufferedMutator.flush() and releases any resources held.
    
@@ -634,7 +659,7 @@ implements 
 
  • 
 
    flush
    
-
    public void flush()
+
    public void flush()
            throws InterruptedIOException,
                   RetriesExhaustedWithDetailsException
    
 
    Description copied from interface: BufferedMutator
    
@@ -655,7 +680,7 @@ implements 
 
  • 
 
    backgroundFlushCommits
    
-
    private void backgroundFlushCommits(boolean synchronous)
+
    private void backgroundFlushCommits(boolean synchronous)
                              throws InterruptedIOException,
                                     RetriesExhaustedWithDetailsException
    
 
    Send the operations in the buffer to the servers. Does not wait for the server's answer. If
@@ -678,7 +703,7 @@ implements 
 
    setWriteBufferSize
    
 
    @Deprecated
-public void setWriteBufferSize(long writeBufferSize)
+public void setWriteBufferSize(long writeBufferSize)
                                     throws RetriesExhaustedWithDetailsException,
                                            InterruptedIOException
    
 
    Deprecated. Going away when we drop public support for HTable.
    
@@ -694,10 +719,10 @@ public void 
 
 
-
    • 
 
    
 
    Direct Known Subclasses:
    
-
    MultiServerCallable, NoncedRegionServerCallable, RpcRetryingCallerWithReadReplicas.ReplicaRegionServerCallable
    
+
    MultiServerCallable, RpcRetryingCallerWithReadReplicas.ReplicaRegionServerCallable
    
 
    
 
    
 
    
 
    @InterfaceAudience.Private
-abstract class CancellableRegionServerCallable<T>
+abstract class CancellableRegionServerCallable<T>
 extends ClientServiceCallable<T>
 implements Cancellable
    
 
    This class is used to unify HTable calls with AsyncProcess Framework. HTable can use
  AsyncProcess directly though this class. Also adds global timeout tracking on top of
- RegionServerCallable and implements Cancellable.
    
+ RegionServerCallable and implements Cancellable.
+ Global timeout tracking conflicts with logic in RpcRetryingCallerImpl's callWithRetries. So you
+ can only use this callable in AsyncProcess which only uses callWithoutRetries and retries in its
+ own implementation.
 
    • 
 
 
@@ -153,6 +156,10 @@ implements Field and Description
 
 
+private int
+rpcTimeout 
+
+
 private RetryingTimeTracker
 tracker 
 
@@ -178,10 +185,12 @@ implements Constructor and Description
 
 
-CancellableRegionServerCallable(Connection connection,
+CancellableRegionServerCallable(Connection connection,
                                TableName tableName,
                                byte[] row,
-                               org.apache.hadoop.hbase.shaded.com.google.protobuf.RpcController rpcController) 
+                               org.apache.hadoop.hbase.shaded.com.google.protobuf.RpcController rpcController,
+                               int rpcTimeout,
+                               RetryingTimeTracker tracker) 
 
 
 
    • 
@@ -200,7 +209,7 @@ implements 
 T
-call(int callTimeout)
+call(int operationTimeout)
 
    Override that changes call Exception from Exception to IOException.
    
 
 
@@ -283,10 +292,19 @@ implements 
 
 
-