tephra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject [2/2] incubator-tephra git commit: (TEPHRA-194) Make startShort() throw IllegalArgumentException consistently for invalid timeout values
Date Fri, 21 Oct 2016 06:53:50 GMT
(TEPHRA-194) Make startShort() throw IllegalArgumentException consistently for invalid timeout values

This closes #18 from GitHub.

Signed-off-by: anew <anew@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/incubator-tephra/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tephra/commit/99c7bec4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tephra/tree/99c7bec4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tephra/diff/99c7bec4

Branch: refs/heads/master
Commit: 99c7bec49237c7d47599c9363c751abcc14eecfc
Parents: 36c38f0
Author: anew <anew@apache.org>
Authored: Wed Oct 19 16:59:33 2016 -0700
Committer: anew <anew@apache.org>
Committed: Thu Oct 20 23:53:08 2016 -0700

----------------------------------------------------------------------
 .../apache/tephra/TransactionSystemClient.java  |   1 +
 .../apache/tephra/distributed/RetryNTimes.java  |   8 +-
 .../tephra/distributed/RetryStrategy.java       |   4 +-
 .../tephra/distributed/RetryWithBackoff.java    |  18 +-
 .../distributed/TransactionServiceClient.java   |  12 +-
 .../TransactionServiceThriftClient.java         |  15 +-
 .../TransactionServiceThriftHandler.java        |   9 +
 .../tephra/distributed/thrift/TBoolean.java     |  24 +-
 .../distributed/thrift/TGenericException.java   | 504 ++++++++++
 .../thrift/TInvalidTruncateTimeException.java   |  24 +-
 .../tephra/distributed/thrift/TTransaction.java |  24 +-
 ...ransactionCouldNotTakeSnapshotException.java |  24 +-
 .../TTransactionNotInProgressException.java     |  24 +-
 .../distributed/thrift/TTransactionServer.java  | 929 ++++++++++++++++++-
 .../distributed/thrift/TTransactionType.java    |   4 +
 .../distributed/thrift/TVisibilityLevel.java    |   4 +
 tephra-core/src/main/thrift/README              |   4 +
 tephra-core/src/main/thrift/header              |  18 +
 tephra-core/src/main/thrift/transaction.thrift  |   9 +
 .../tephra/ThriftTransactionSystemTest.java     |  51 +-
 .../apache/tephra/TransactionSystemTest.java    |  28 +-
 21 files changed, 1656 insertions(+), 82 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/99c7bec4/tephra-core/src/main/java/org/apache/tephra/TransactionSystemClient.java
----------------------------------------------------------------------
diff --git a/tephra-core/src/main/java/org/apache/tephra/TransactionSystemClient.java b/tephra-core/src/main/java/org/apache/tephra/TransactionSystemClient.java
index 9009f84..fe4b63e 100644
--- a/tephra-core/src/main/java/org/apache/tephra/TransactionSystemClient.java
+++ b/tephra-core/src/main/java/org/apache/tephra/TransactionSystemClient.java
@@ -39,6 +39,7 @@ public interface TransactionSystemClient {
    * Starts new short transaction.
    * @param timeout the timeout for the transaction
    * @return instance of {@link Transaction}
+   * @throws IllegalArgumentException if the provided timeout is negative or exceeds the configured maximum
    */
   Transaction startShort(int timeout);
 

http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/99c7bec4/tephra-core/src/main/java/org/apache/tephra/distributed/RetryNTimes.java
----------------------------------------------------------------------
diff --git a/tephra-core/src/main/java/org/apache/tephra/distributed/RetryNTimes.java b/tephra-core/src/main/java/org/apache/tephra/distributed/RetryNTimes.java
index 8655c44..2dbaba2 100644
--- a/tephra-core/src/main/java/org/apache/tephra/distributed/RetryNTimes.java
+++ b/tephra-core/src/main/java/org/apache/tephra/distributed/RetryNTimes.java
@@ -28,18 +28,18 @@ import org.apache.tephra.TxConstants;
  */
 public class RetryNTimes extends RetryStrategy {
 
-  int attempts = 0;
-  int limit;
+  private int attempts = 0;
+  private int limit;
 
   /**
    * @param maxAttempts the number of attempts after which to stop
    */
-  protected RetryNTimes(int maxAttempts) {
+  private RetryNTimes(int maxAttempts) {
     limit = maxAttempts;
   }
 
   @Override
-  boolean failOnce() {
+  public boolean failOnce() {
     ++attempts;
     return attempts < limit;
   }

http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/99c7bec4/tephra-core/src/main/java/org/apache/tephra/distributed/RetryStrategy.java
----------------------------------------------------------------------
diff --git a/tephra-core/src/main/java/org/apache/tephra/distributed/RetryStrategy.java b/tephra-core/src/main/java/org/apache/tephra/distributed/RetryStrategy.java
index 6fd6c9f..f2862da 100644
--- a/tephra-core/src/main/java/org/apache/tephra/distributed/RetryStrategy.java
+++ b/tephra-core/src/main/java/org/apache/tephra/distributed/RetryStrategy.java
@@ -28,14 +28,14 @@ public abstract class RetryStrategy {
    * Increments the number of failed attempts.
    * @return whether another attempt should be made
    */
-  abstract boolean failOnce();
+  public abstract boolean failOnce();
 
   /**
    * Should be called before re-attempting. This can, for instance
    * inject a sleep time between retries. Default implementation is
    * to do nothing.
    */
-  void beforeRetry() {
+  public void beforeRetry() {
     // do nothinhg
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/99c7bec4/tephra-core/src/main/java/org/apache/tephra/distributed/RetryWithBackoff.java
----------------------------------------------------------------------
diff --git a/tephra-core/src/main/java/org/apache/tephra/distributed/RetryWithBackoff.java b/tephra-core/src/main/java/org/apache/tephra/distributed/RetryWithBackoff.java
index ce1130e..992bb92 100644
--- a/tephra-core/src/main/java/org/apache/tephra/distributed/RetryWithBackoff.java
+++ b/tephra-core/src/main/java/org/apache/tephra/distributed/RetryWithBackoff.java
@@ -33,33 +33,31 @@ public class RetryWithBackoff extends RetryStrategy {
   private static final Logger LOG =
       LoggerFactory.getLogger(RetryWithBackoff.class);
 
-  int initialSleep; // initial sleep time
-  int backoffFactor; // factor by which to increase sleep for each retry
-  int maxSleep; // max sleep time. stop retrying when we exceed this
-  int sleep; // current sleep time
+  private int backoffFactor; // factor by which to increase sleep for each retry
+  private int maxSleep; // max sleep time. stop retrying when we exceed this
+  private int sleep; // current sleep time
 
   /**
-   * @param initial the initial sleep time (before first retry)
+   * @param initialSleep the initial sleep time (before first retry)
    * @param backoff the backoff factor by which sleep time is multiplied
    *                after each retry
    * @param limit the max sleep time. if sleep time reaches this limit, we
    *              stop retrying
    */
-  protected RetryWithBackoff(int initial, int backoff, int limit) {
-    initialSleep = initial;
+  private RetryWithBackoff(int initialSleep, int backoff, int limit) {
     backoffFactor = backoff;
     maxSleep = limit;
     sleep = initialSleep;
   }
 
   @Override
-  boolean failOnce() {
+  public boolean failOnce() {
     return sleep < maxSleep;
   }
 
   @Override
-  void beforeRetry() {
-    LOG.info("Sleeping " + sleep + " ms before retry.");
+  public void beforeRetry() {
+    LOG.debug("Sleeping " + sleep + " ms before retry.");
     long current = System.currentTimeMillis();
     long end = current + sleep;
     while (current < end) {

http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/99c7bec4/tephra-core/src/main/java/org/apache/tephra/distributed/TransactionServiceClient.java
----------------------------------------------------------------------
diff --git a/tephra-core/src/main/java/org/apache/tephra/distributed/TransactionServiceClient.java b/tephra-core/src/main/java/org/apache/tephra/distributed/TransactionServiceClient.java
index ca15e9e..4ee9615 100644
--- a/tephra-core/src/main/java/org/apache/tephra/distributed/TransactionServiceClient.java
+++ b/tephra-core/src/main/java/org/apache/tephra/distributed/TransactionServiceClient.java
@@ -144,9 +144,12 @@ public class TransactionServiceClient implements TransactionSystemClient {
     } else if ("n-times".equals(retryStrat)) {
       this.retryStrategyProvider = new RetryNTimes.Provider();
     } else {
-      String message = "Unknown Retry Strategy '" + retryStrat + "'.";
-      LOG.error(message);
-      throw new IllegalArgumentException(message);
+      try {
+        this.retryStrategyProvider = (RetryStrategyProvider) Class.forName(retryStrat).newInstance();
+      } catch (IllegalAccessException | InstantiationException | ClassNotFoundException e) {
+        throw new IllegalArgumentException(
+          String.format("Unable to instantiate RetryStrategyProvider '%s'", retryStrat), e);
+      }
     }
     this.retryStrategyProvider.configure(config);
     LOG.debug("Retry strategy is " + this.retryStrategyProvider);
@@ -224,7 +227,7 @@ public class TransactionServiceClient implements TransactionSystemClient {
               "Thrift error for " + operation + ": " + te.getMessage();
           LOG.error(message);
           LOG.debug(message, te);
-          throw new Exception(message, te);
+          throw te;
         } else {
           // call retry strategy before retrying
           retryStrategy.beforeRetry();
@@ -232,7 +235,6 @@ public class TransactionServiceClient implements TransactionSystemClient {
           LOG.info(msg);
           LOG.debug(msg, te);
         }
-
       }
     }
   }

http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/99c7bec4/tephra-core/src/main/java/org/apache/tephra/distributed/TransactionServiceThriftClient.java
----------------------------------------------------------------------
diff --git a/tephra-core/src/main/java/org/apache/tephra/distributed/TransactionServiceThriftClient.java b/tephra-core/src/main/java/org/apache/tephra/distributed/TransactionServiceThriftClient.java
index a7e9592..b76412f 100644
--- a/tephra-core/src/main/java/org/apache/tephra/distributed/TransactionServiceThriftClient.java
+++ b/tephra-core/src/main/java/org/apache/tephra/distributed/TransactionServiceThriftClient.java
@@ -25,6 +25,7 @@ import org.apache.tephra.InvalidTruncateTimeException;
 import org.apache.tephra.Transaction;
 import org.apache.tephra.TransactionCouldNotTakeSnapshotException;
 import org.apache.tephra.TransactionNotInProgressException;
+import org.apache.tephra.distributed.thrift.TGenericException;
 import org.apache.tephra.distributed.thrift.TInvalidTruncateTimeException;
 import org.apache.tephra.distributed.thrift.TTransactionCouldNotTakeSnapshotException;
 import org.apache.tephra.distributed.thrift.TTransactionNotInProgressException;
@@ -33,6 +34,8 @@ import org.apache.thrift.TException;
 import org.apache.thrift.protocol.TBinaryProtocol;
 import org.apache.thrift.protocol.TProtocol;
 import org.apache.thrift.transport.TTransport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
@@ -55,6 +58,8 @@ public class TransactionServiceThriftClient {
     }
   };
 
+  private static final Logger LOG = LoggerFactory.getLogger(TransactionServiceThriftClient.class);
+
   /**
    * The thrift transport layer. We need this when we close the connection.
    */
@@ -112,7 +117,15 @@ public class TransactionServiceThriftClient {
 
   public Transaction startShort(int timeout) throws TException {
     try {
-      return TransactionConverterUtils.unwrap(client.startShortTimeout(timeout));
+      return TransactionConverterUtils.unwrap(client.startShortWithTimeout(timeout));
+    } catch (TGenericException e) {
+      // currently, we only expect IllegalArgumentException here, if the timeout is invalid
+      if (!IllegalArgumentException.class.getName().equals(e.getOriginalExceptionClass())) {
+        LOG.trace("Expecting only {} as the original exception class but found {}",
+                  IllegalArgumentException.class.getName(), e.getOriginalExceptionClass());
+        throw e;
+      }
+      throw new IllegalArgumentException(e.getMessage());
     } catch (TException e) {
       isValid.set(false);
       throw e;

http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/99c7bec4/tephra-core/src/main/java/org/apache/tephra/distributed/TransactionServiceThriftHandler.java
----------------------------------------------------------------------
diff --git a/tephra-core/src/main/java/org/apache/tephra/distributed/TransactionServiceThriftHandler.java b/tephra-core/src/main/java/org/apache/tephra/distributed/TransactionServiceThriftHandler.java
index 8edc1a6..6552cfe 100644
--- a/tephra-core/src/main/java/org/apache/tephra/distributed/TransactionServiceThriftHandler.java
+++ b/tephra-core/src/main/java/org/apache/tephra/distributed/TransactionServiceThriftHandler.java
@@ -24,6 +24,7 @@ import org.apache.tephra.TransactionManager;
 import org.apache.tephra.TransactionNotInProgressException;
 import org.apache.tephra.TxConstants;
 import org.apache.tephra.distributed.thrift.TBoolean;
+import org.apache.tephra.distributed.thrift.TGenericException;
 import org.apache.tephra.distributed.thrift.TInvalidTruncateTimeException;
 import org.apache.tephra.distributed.thrift.TTransaction;
 import org.apache.tephra.distributed.thrift.TTransactionCouldNotTakeSnapshotException;
@@ -76,6 +77,14 @@ public class TransactionServiceThriftHandler implements TTransactionServer.Iface
     return TransactionConverterUtils.wrap(txManager.startShort(timeout));
   }
 
+  @Override
+  public TTransaction startShortWithTimeout(int timeout) throws TException {
+    try {
+      return TransactionConverterUtils.wrap(txManager.startShort(timeout));
+    } catch (IllegalArgumentException e) {
+      throw new TGenericException(e.getMessage(), e.getClass().getName());
+    }
+  }
 
   @Override
   public TBoolean canCommitTx(TTransaction tx, Set<ByteBuffer> changes) throws TException {

http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/99c7bec4/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TBoolean.java
----------------------------------------------------------------------
diff --git a/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TBoolean.java b/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TBoolean.java
index d33c7aa..f21dc08 100644
--- a/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TBoolean.java
+++ b/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TBoolean.java
@@ -24,19 +24,29 @@
  */
 package org.apache.tephra.distributed.thrift;
 
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.scheme.IScheme;
 import org.apache.thrift.scheme.SchemeFactory;
 import org.apache.thrift.scheme.StandardScheme;
-import org.apache.thrift.scheme.TupleScheme;
 
-import java.util.BitSet;
-import java.util.Collections;
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
 import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
 import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TBoolean implements org.apache.thrift.TBase<TBoolean, TBoolean._Fields>, java.io.Serializable, Cloneable {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TBoolean");

http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/99c7bec4/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TGenericException.java
----------------------------------------------------------------------
diff --git a/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TGenericException.java b/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TGenericException.java
new file mode 100644
index 0000000..6b60805
--- /dev/null
+++ b/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TGenericException.java
@@ -0,0 +1,504 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Autogenerated by Thrift Compiler (0.9.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+package org.apache.tephra.distributed.thrift;
+
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TGenericException extends TException implements org.apache.thrift.TBase<TGenericException, TGenericException._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TGenericException");
+
+  private static final org.apache.thrift.protocol.TField MESSAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("message", org.apache.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.thrift.protocol.TField ORIGINAL_EXCEPTION_CLASS_FIELD_DESC = new org.apache.thrift.protocol.TField("originalExceptionClass", org.apache.thrift.protocol.TType.STRING, (short)2);
+
+  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+  static {
+    schemes.put(StandardScheme.class, new TGenericExceptionStandardSchemeFactory());
+    schemes.put(TupleScheme.class, new TGenericExceptionTupleSchemeFactory());
+  }
+
+  public String message; // required
+  public String originalExceptionClass; // required
+
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+    MESSAGE((short)1, "message"),
+    ORIGINAL_EXCEPTION_CLASS((short)2, "originalExceptionClass");
+
+    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        case 1: // MESSAGE
+          return MESSAGE;
+        case 2: // ORIGINAL_EXCEPTION_CLASS
+          return ORIGINAL_EXCEPTION_CLASS;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, throwing an exception
+     * if it is not found.
+     */
+    public static _Fields findByThriftIdOrThrow(int fieldId) {
+      _Fields fields = findByThriftId(fieldId);
+      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      return fields;
+    }
+
+    /**
+     * Find the _Fields constant that matches name, or null if its not found.
+     */
+    public static _Fields findByName(String name) {
+      return byName.get(name);
+    }
+
+    private final short _thriftId;
+    private final String _fieldName;
+
+    _Fields(short thriftId, String fieldName) {
+      _thriftId = thriftId;
+      _fieldName = fieldName;
+    }
+
+    public short getThriftFieldId() {
+      return _thriftId;
+    }
+
+    public String getFieldName() {
+      return _fieldName;
+    }
+  }
+
+  // isset id assignments
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  static {
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData("message", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.ORIGINAL_EXCEPTION_CLASS, new org.apache.thrift.meta_data.FieldMetaData("originalExceptionClass", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TGenericException.class, metaDataMap);
+  }
+
+  public TGenericException() {
+  }
+
+  public TGenericException(
+    String message,
+    String originalExceptionClass)
+  {
+    this();
+    this.message = message;
+    this.originalExceptionClass = originalExceptionClass;
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public TGenericException(TGenericException other) {
+    if (other.isSetMessage()) {
+      this.message = other.message;
+    }
+    if (other.isSetOriginalExceptionClass()) {
+      this.originalExceptionClass = other.originalExceptionClass;
+    }
+  }
+
+  public TGenericException deepCopy() {
+    return new TGenericException(this);
+  }
+
+  @Override
+  public void clear() {
+    this.message = null;
+    this.originalExceptionClass = null;
+  }
+
+  public String getMessage() {
+    return this.message;
+  }
+
+  public TGenericException setMessage(String message) {
+    this.message = message;
+    return this;
+  }
+
+  public void unsetMessage() {
+    this.message = null;
+  }
+
+  /** Returns true if field message is set (has been assigned a value) and false otherwise */
+  public boolean isSetMessage() {
+    return this.message != null;
+  }
+
+  public void setMessageIsSet(boolean value) {
+    if (!value) {
+      this.message = null;
+    }
+  }
+
+  public String getOriginalExceptionClass() {
+    return this.originalExceptionClass;
+  }
+
+  public TGenericException setOriginalExceptionClass(String originalExceptionClass) {
+    this.originalExceptionClass = originalExceptionClass;
+    return this;
+  }
+
+  public void unsetOriginalExceptionClass() {
+    this.originalExceptionClass = null;
+  }
+
+  /** Returns true if field originalExceptionClass is set (has been assigned a value) and false otherwise */
+  public boolean isSetOriginalExceptionClass() {
+    return this.originalExceptionClass != null;
+  }
+
+  public void setOriginalExceptionClassIsSet(boolean value) {
+    if (!value) {
+      this.originalExceptionClass = null;
+    }
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    case MESSAGE:
+      if (value == null) {
+        unsetMessage();
+      } else {
+        setMessage((String)value);
+      }
+      break;
+
+    case ORIGINAL_EXCEPTION_CLASS:
+      if (value == null) {
+        unsetOriginalExceptionClass();
+      } else {
+        setOriginalExceptionClass((String)value);
+      }
+      break;
+
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    case MESSAGE:
+      return getMessage();
+
+    case ORIGINAL_EXCEPTION_CLASS:
+      return getOriginalExceptionClass();
+
+    }
+    throw new IllegalStateException();
+  }
+
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
+    case MESSAGE:
+      return isSetMessage();
+    case ORIGINAL_EXCEPTION_CLASS:
+      return isSetOriginalExceptionClass();
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof TGenericException)
+      return this.equals((TGenericException)that);
+    return false;
+  }
+
+  public boolean equals(TGenericException that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_message = true && this.isSetMessage();
+    boolean that_present_message = true && that.isSetMessage();
+    if (this_present_message || that_present_message) {
+      if (!(this_present_message && that_present_message))
+        return false;
+      if (!this.message.equals(that.message))
+        return false;
+    }
+
+    boolean this_present_originalExceptionClass = true && this.isSetOriginalExceptionClass();
+    boolean that_present_originalExceptionClass = true && that.isSetOriginalExceptionClass();
+    if (this_present_originalExceptionClass || that_present_originalExceptionClass) {
+      if (!(this_present_originalExceptionClass && that_present_originalExceptionClass))
+        return false;
+      if (!this.originalExceptionClass.equals(that.originalExceptionClass))
+        return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return 0;
+  }
+
+  public int compareTo(TGenericException other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    TGenericException typedOther = (TGenericException)other;
+
+    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetMessage()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetOriginalExceptionClass()).compareTo(typedOther.isSetOriginalExceptionClass());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetOriginalExceptionClass()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.originalExceptionClass, typedOther.originalExceptionClass);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+  }
+
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder("TGenericException(");
+    boolean first = true;
+
+    sb.append("message:");
+    if (this.message == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.message);
+    }
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("originalExceptionClass:");
+    if (this.originalExceptionClass == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.originalExceptionClass);
+    }
+    first = false;
+    sb.append(")");
+    return sb.toString();
+  }
+
+  public void validate() throws org.apache.thrift.TException {
+    // check for required fields
+    // check for sub-struct validity
+  }
+
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private static class TGenericExceptionStandardSchemeFactory implements SchemeFactory {
+    public TGenericExceptionStandardScheme getScheme() {
+      return new TGenericExceptionStandardScheme();
+    }
+  }
+
+  private static class TGenericExceptionStandardScheme extends StandardScheme<TGenericException> {
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot, TGenericException struct) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField schemeField;
+      iprot.readStructBegin();
+      while (true)
+      {
+        schemeField = iprot.readFieldBegin();
+        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (schemeField.id) {
+          case 1: // MESSAGE
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.message = iprot.readString();
+              struct.setMessageIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 2: // ORIGINAL_EXCEPTION_CLASS
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.originalExceptionClass = iprot.readString();
+              struct.setOriginalExceptionClassIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      struct.validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot, TGenericException struct) throws org.apache.thrift.TException {
+      struct.validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (struct.message != null) {
+        oprot.writeFieldBegin(MESSAGE_FIELD_DESC);
+        oprot.writeString(struct.message);
+        oprot.writeFieldEnd();
+      }
+      if (struct.originalExceptionClass != null) {
+        oprot.writeFieldBegin(ORIGINAL_EXCEPTION_CLASS_FIELD_DESC);
+        oprot.writeString(struct.originalExceptionClass);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+  }
+
+  private static class TGenericExceptionTupleSchemeFactory implements SchemeFactory {
+    public TGenericExceptionTupleScheme getScheme() {
+      return new TGenericExceptionTupleScheme();
+    }
+  }
+
+  private static class TGenericExceptionTupleScheme extends TupleScheme<TGenericException> {
+
+    @Override
+    public void write(org.apache.thrift.protocol.TProtocol prot, TGenericException struct) throws org.apache.thrift.TException {
+      TTupleProtocol oprot = (TTupleProtocol) prot;
+      BitSet optionals = new BitSet();
+      if (struct.isSetMessage()) {
+        optionals.set(0);
+      }
+      if (struct.isSetOriginalExceptionClass()) {
+        optionals.set(1);
+      }
+      oprot.writeBitSet(optionals, 2);
+      if (struct.isSetMessage()) {
+        oprot.writeString(struct.message);
+      }
+      if (struct.isSetOriginalExceptionClass()) {
+        oprot.writeString(struct.originalExceptionClass);
+      }
+    }
+
+    @Override
+    public void read(org.apache.thrift.protocol.TProtocol prot, TGenericException struct) throws org.apache.thrift.TException {
+      TTupleProtocol iprot = (TTupleProtocol) prot;
+      BitSet incoming = iprot.readBitSet(2);
+      if (incoming.get(0)) {
+        struct.message = iprot.readString();
+        struct.setMessageIsSet(true);
+      }
+      if (incoming.get(1)) {
+        struct.originalExceptionClass = iprot.readString();
+        struct.setOriginalExceptionClassIsSet(true);
+      }
+    }
+  }
+
+}
+

http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/99c7bec4/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TInvalidTruncateTimeException.java
----------------------------------------------------------------------
diff --git a/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TInvalidTruncateTimeException.java b/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TInvalidTruncateTimeException.java
index 6587ae0..df5761b 100644
--- a/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TInvalidTruncateTimeException.java
+++ b/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TInvalidTruncateTimeException.java
@@ -24,19 +24,29 @@
  */
 package org.apache.tephra.distributed.thrift;
 
-import org.apache.thrift.TException;
-import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.scheme.IScheme;
 import org.apache.thrift.scheme.SchemeFactory;
 import org.apache.thrift.scheme.StandardScheme;
-import org.apache.thrift.scheme.TupleScheme;
 
-import java.util.BitSet;
-import java.util.Collections;
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
 import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
 import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TInvalidTruncateTimeException extends TException implements org.apache.thrift.TBase<TInvalidTruncateTimeException, TInvalidTruncateTimeException._Fields>, java.io.Serializable, Cloneable {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TInvalidTruncateTimeException");

http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/99c7bec4/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TTransaction.java
----------------------------------------------------------------------
diff --git a/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TTransaction.java b/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TTransaction.java
index ae2f72d..c263dc7 100644
--- a/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TTransaction.java
+++ b/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TTransaction.java
@@ -24,21 +24,29 @@
  */
 package org.apache.tephra.distributed.thrift;
 
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.scheme.IScheme;
 import org.apache.thrift.scheme.SchemeFactory;
 import org.apache.thrift.scheme.StandardScheme;
-import org.apache.thrift.scheme.TupleScheme;
 
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import java.util.List;
 import java.util.ArrayList;
-import java.util.BitSet;
-import java.util.Collections;
+import java.util.Map;
+import java.util.HashMap;
 import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
 import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TTransaction implements org.apache.thrift.TBase<TTransaction, TTransaction._Fields>, java.io.Serializable, Cloneable {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TTransaction");

http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/99c7bec4/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TTransactionCouldNotTakeSnapshotException.java
----------------------------------------------------------------------
diff --git a/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TTransactionCouldNotTakeSnapshotException.java b/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TTransactionCouldNotTakeSnapshotException.java
index d7a09bc..97e4bcc 100644
--- a/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TTransactionCouldNotTakeSnapshotException.java
+++ b/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TTransactionCouldNotTakeSnapshotException.java
@@ -24,19 +24,29 @@
  */
 package org.apache.tephra.distributed.thrift;
 
-import org.apache.thrift.TException;
-import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.scheme.IScheme;
 import org.apache.thrift.scheme.SchemeFactory;
 import org.apache.thrift.scheme.StandardScheme;
-import org.apache.thrift.scheme.TupleScheme;
 
-import java.util.BitSet;
-import java.util.Collections;
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
 import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
 import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TTransactionCouldNotTakeSnapshotException extends TException implements org.apache.thrift.TBase<TTransactionCouldNotTakeSnapshotException, TTransactionCouldNotTakeSnapshotException._Fields>, java.io.Serializable, Cloneable {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TTransactionCouldNotTakeSnapshotException");

http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/99c7bec4/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TTransactionNotInProgressException.java
----------------------------------------------------------------------
diff --git a/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TTransactionNotInProgressException.java b/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TTransactionNotInProgressException.java
index 6ca6dd4..5c1c6c0 100644
--- a/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TTransactionNotInProgressException.java
+++ b/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TTransactionNotInProgressException.java
@@ -24,19 +24,29 @@
  */
 package org.apache.tephra.distributed.thrift;
 
-import org.apache.thrift.TException;
-import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.scheme.IScheme;
 import org.apache.thrift.scheme.SchemeFactory;
 import org.apache.thrift.scheme.StandardScheme;
-import org.apache.thrift.scheme.TupleScheme;
 
-import java.util.BitSet;
-import java.util.Collections;
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
 import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
 import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TTransactionNotInProgressException extends TException implements org.apache.thrift.TBase<TTransactionNotInProgressException, TTransactionNotInProgressException._Fields>, java.io.Serializable, Cloneable {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TTransactionNotInProgressException");

http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/99c7bec4/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TTransactionServer.java
----------------------------------------------------------------------
diff --git a/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TTransactionServer.java b/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TTransactionServer.java
index 3b44534..3d47a8a 100644
--- a/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TTransactionServer.java
+++ b/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TTransactionServer.java
@@ -24,24 +24,29 @@
  */
 package org.apache.tephra.distributed.thrift;
 
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.scheme.IScheme;
 import org.apache.thrift.scheme.SchemeFactory;
 import org.apache.thrift.scheme.StandardScheme;
-import org.apache.thrift.scheme.TupleScheme;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import java.nio.ByteBuffer;
-import java.util.BitSet;
-import java.util.Collections;
-import java.util.EnumMap;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.HashSet;
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import java.util.List;
+import java.util.ArrayList;
 import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
 import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TTransactionServer {
 
@@ -53,6 +58,8 @@ public class TTransactionServer {
 
     public TTransaction startShortTimeout(int timeout) throws org.apache.thrift.TException;
 
+    public TTransaction startShortWithTimeout(int timeout) throws TGenericException, org.apache.thrift.TException;
+
     public TBoolean canCommitTx(TTransaction tx, Set<ByteBuffer> changes) throws TTransactionNotInProgressException, org.apache.thrift.TException;
 
     public TBoolean commitTx(TTransaction tx) throws TTransactionNotInProgressException, org.apache.thrift.TException;
@@ -85,6 +92,8 @@ public class TTransactionServer {
 
     public void startShortTimeout(int timeout, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.startShortTimeout_call> resultHandler) throws org.apache.thrift.TException;
 
+    public void startShortWithTimeout(int timeout, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.startShortWithTimeout_call> resultHandler) throws org.apache.thrift.TException;
+
     public void canCommitTx(TTransaction tx, Set<ByteBuffer> changes, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.canCommitTx_call> resultHandler) throws org.apache.thrift.TException;
 
     public void commitTx(TTransaction tx, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.commitTx_call> resultHandler) throws org.apache.thrift.TException;
@@ -196,6 +205,32 @@ public class TTransactionServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "startShortTimeout failed: unknown result");
     }
 
+    public TTransaction startShortWithTimeout(int timeout) throws TGenericException, org.apache.thrift.TException
+    {
+      send_startShortWithTimeout(timeout);
+      return recv_startShortWithTimeout();
+    }
+
+    public void send_startShortWithTimeout(int timeout) throws org.apache.thrift.TException
+    {
+      startShortWithTimeout_args args = new startShortWithTimeout_args();
+      args.setTimeout(timeout);
+      sendBase("startShortWithTimeout", args);
+    }
+
+    public TTransaction recv_startShortWithTimeout() throws TGenericException, org.apache.thrift.TException
+    {
+      startShortWithTimeout_result result = new startShortWithTimeout_result();
+      receiveBase(result, "startShortWithTimeout");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      if (result.e != null) {
+        throw result.e;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "startShortWithTimeout failed: unknown result");
+    }
+
     public TBoolean canCommitTx(TTransaction tx, Set<ByteBuffer> changes) throws TTransactionNotInProgressException, org.apache.thrift.TException
     {
       send_canCommitTx(tx, changes);
@@ -563,6 +598,38 @@ public class TTransactionServer {
       }
     }
 
+    public void startShortWithTimeout(int timeout, org.apache.thrift.async.AsyncMethodCallback<startShortWithTimeout_call> resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      startShortWithTimeout_call method_call = new startShortWithTimeout_call(timeout, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class startShortWithTimeout_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private int timeout;
+      public startShortWithTimeout_call(int timeout, org.apache.thrift.async.AsyncMethodCallback<startShortWithTimeout_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.timeout = timeout;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("startShortWithTimeout", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        startShortWithTimeout_args args = new startShortWithTimeout_args();
+        args.setTimeout(timeout);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public TTransaction getResult() throws TGenericException, org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_startShortWithTimeout();
+      }
+    }
+
     public void canCommitTx(TTransaction tx, Set<ByteBuffer> changes, org.apache.thrift.async.AsyncMethodCallback<canCommitTx_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       canCommitTx_call method_call = new canCommitTx_call(tx, changes, resultHandler, this, ___protocolFactory, ___transport);
@@ -922,6 +989,7 @@ public class TTransactionServer {
       processMap.put("startLong", new startLong());
       processMap.put("startShort", new startShort());
       processMap.put("startShortTimeout", new startShortTimeout());
+      processMap.put("startShortWithTimeout", new startShortWithTimeout());
       processMap.put("canCommitTx", new canCommitTx());
       processMap.put("commitTx", new commitTx());
       processMap.put("abortTx", new abortTx());
@@ -996,6 +1064,30 @@ public class TTransactionServer {
       }
     }
 
+    public static class startShortWithTimeout<I extends Iface> extends org.apache.thrift.ProcessFunction<I, startShortWithTimeout_args> {
+      public startShortWithTimeout() {
+        super("startShortWithTimeout");
+      }
+
+      public startShortWithTimeout_args getEmptyArgsInstance() {
+        return new startShortWithTimeout_args();
+      }
+
+      protected boolean isOneway() {
+        return false;
+      }
+
+      public startShortWithTimeout_result getResult(I iface, startShortWithTimeout_args args) throws org.apache.thrift.TException {
+        startShortWithTimeout_result result = new startShortWithTimeout_result();
+        try {
+          result.success = iface.startShortWithTimeout(args.timeout);
+        } catch (TGenericException e) {
+          result.e = e;
+        }
+        return result;
+      }
+    }
+
     public static class canCommitTx<I extends Iface> extends org.apache.thrift.ProcessFunction<I, canCommitTx_args> {
       public canCommitTx() {
         super("canCommitTx");
@@ -3161,6 +3253,819 @@ public class TTransactionServer {
 
   }
 
+  public static class startShortWithTimeout_args implements org.apache.thrift.TBase<startShortWithTimeout_args, startShortWithTimeout_args._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("startShortWithTimeout_args");
+
+    private static final org.apache.thrift.protocol.TField TIMEOUT_FIELD_DESC = new org.apache.thrift.protocol.TField("timeout", org.apache.thrift.protocol.TType.I32, (short)1);
+
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    static {
+      schemes.put(StandardScheme.class, new startShortWithTimeout_argsStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new startShortWithTimeout_argsTupleSchemeFactory());
+    }
+
+    public int timeout; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      TIMEOUT((short)1, "timeout");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // TIMEOUT
+            return TIMEOUT;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+    private static final int __TIMEOUT_ISSET_ID = 0;
+    private byte __isset_bitfield = 0;
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.TIMEOUT, new org.apache.thrift.meta_data.FieldMetaData("timeout", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(startShortWithTimeout_args.class, metaDataMap);
+    }
+
+    public startShortWithTimeout_args() {
+    }
+
+    public startShortWithTimeout_args(
+      int timeout)
+    {
+      this();
+      this.timeout = timeout;
+      setTimeoutIsSet(true);
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public startShortWithTimeout_args(startShortWithTimeout_args other) {
+      __isset_bitfield = other.__isset_bitfield;
+      this.timeout = other.timeout;
+    }
+
+    public startShortWithTimeout_args deepCopy() {
+      return new startShortWithTimeout_args(this);
+    }
+
+    @Override
+    public void clear() {
+      setTimeoutIsSet(false);
+      this.timeout = 0;
+    }
+
+    public int getTimeout() {
+      return this.timeout;
+    }
+
+    public startShortWithTimeout_args setTimeout(int timeout) {
+      this.timeout = timeout;
+      setTimeoutIsSet(true);
+      return this;
+    }
+
+    public void unsetTimeout() {
+      __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __TIMEOUT_ISSET_ID);
+    }
+
+    /** Returns true if field timeout is set (has been assigned a value) and false otherwise */
+    public boolean isSetTimeout() {
+      return EncodingUtils.testBit(__isset_bitfield, __TIMEOUT_ISSET_ID);
+    }
+
+    public void setTimeoutIsSet(boolean value) {
+      __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TIMEOUT_ISSET_ID, value);
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case TIMEOUT:
+        if (value == null) {
+          unsetTimeout();
+        } else {
+          setTimeout((Integer)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case TIMEOUT:
+        return Integer.valueOf(getTimeout());
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case TIMEOUT:
+        return isSetTimeout();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof startShortWithTimeout_args)
+        return this.equals((startShortWithTimeout_args)that);
+      return false;
+    }
+
+    public boolean equals(startShortWithTimeout_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_timeout = true;
+      boolean that_present_timeout = true;
+      if (this_present_timeout || that_present_timeout) {
+        if (!(this_present_timeout && that_present_timeout))
+          return false;
+        if (this.timeout != that.timeout)
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(startShortWithTimeout_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      startShortWithTimeout_args typedOther = (startShortWithTimeout_args)other;
+
+      lastComparison = Boolean.valueOf(isSetTimeout()).compareTo(typedOther.isSetTimeout());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetTimeout()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.timeout, typedOther.timeout);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("startShortWithTimeout_args(");
+      boolean first = true;
+
+      sb.append("timeout:");
+      sb.append(this.timeout);
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+      // check for sub-struct validity
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+        __isset_bitfield = 0;
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private static class startShortWithTimeout_argsStandardSchemeFactory implements SchemeFactory {
+      public startShortWithTimeout_argsStandardScheme getScheme() {
+        return new startShortWithTimeout_argsStandardScheme();
+      }
+    }
+
+    private static class startShortWithTimeout_argsStandardScheme extends StandardScheme<startShortWithTimeout_args> {
+
+      public void read(org.apache.thrift.protocol.TProtocol iprot, startShortWithTimeout_args struct) throws org.apache.thrift.TException {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+            break;
+          }
+          switch (schemeField.id) {
+            case 1: // TIMEOUT
+              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+                struct.timeout = iprot.readI32();
+                struct.setTimeoutIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
+        }
+        iprot.readStructEnd();
+
+        // check for required fields of primitive type, which can't be checked in the validate method
+        struct.validate();
+      }
+
+      public void write(org.apache.thrift.protocol.TProtocol oprot, startShortWithTimeout_args struct) throws org.apache.thrift.TException {
+        struct.validate();
+
+        oprot.writeStructBegin(STRUCT_DESC);
+        oprot.writeFieldBegin(TIMEOUT_FIELD_DESC);
+        oprot.writeI32(struct.timeout);
+        oprot.writeFieldEnd();
+        oprot.writeFieldStop();
+        oprot.writeStructEnd();
+      }
+
+    }
+
+    private static class startShortWithTimeout_argsTupleSchemeFactory implements SchemeFactory {
+      public startShortWithTimeout_argsTupleScheme getScheme() {
+        return new startShortWithTimeout_argsTupleScheme();
+      }
+    }
+
+    private static class startShortWithTimeout_argsTupleScheme extends TupleScheme<startShortWithTimeout_args> {
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol prot, startShortWithTimeout_args struct) throws org.apache.thrift.TException {
+        TTupleProtocol oprot = (TTupleProtocol) prot;
+        BitSet optionals = new BitSet();
+        if (struct.isSetTimeout()) {
+          optionals.set(0);
+        }
+        oprot.writeBitSet(optionals, 1);
+        if (struct.isSetTimeout()) {
+          oprot.writeI32(struct.timeout);
+        }
+      }
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol prot, startShortWithTimeout_args struct) throws org.apache.thrift.TException {
+        TTupleProtocol iprot = (TTupleProtocol) prot;
+        BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.timeout = iprot.readI32();
+          struct.setTimeoutIsSet(true);
+        }
+      }
+    }
+
+  }
+
+  public static class startShortWithTimeout_result implements org.apache.thrift.TBase<startShortWithTimeout_result, startShortWithTimeout_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("startShortWithTimeout_result");
+
+    private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0);
+    private static final org.apache.thrift.protocol.TField E_FIELD_DESC = new org.apache.thrift.protocol.TField("e", org.apache.thrift.protocol.TType.STRUCT, (short)1);
+
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    static {
+      schemes.put(StandardScheme.class, new startShortWithTimeout_resultStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new startShortWithTimeout_resultTupleSchemeFactory());
+    }
+
+    public TTransaction success; // required
+    public TGenericException e; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success"),
+      E((short)1, "e");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 0: // SUCCESS
+            return SUCCESS;
+          case 1: // E
+            return E;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TTransaction.class)));
+      tmpMap.put(_Fields.E, new org.apache.thrift.meta_data.FieldMetaData("e", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(startShortWithTimeout_result.class, metaDataMap);
+    }
+
+    public startShortWithTimeout_result() {
+    }
+
+    public startShortWithTimeout_result(
+      TTransaction success,
+      TGenericException e)
+    {
+      this();
+      this.success = success;
+      this.e = e;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public startShortWithTimeout_result(startShortWithTimeout_result other) {
+      if (other.isSetSuccess()) {
+        this.success = new TTransaction(other.success);
+      }
+      if (other.isSetE()) {
+        this.e = new TGenericException(other.e);
+      }
+    }
+
+    public startShortWithTimeout_result deepCopy() {
+      return new startShortWithTimeout_result(this);
+    }
+
+    @Override
+    public void clear() {
+      this.success = null;
+      this.e = null;
+    }
+
+    public TTransaction getSuccess() {
+      return this.success;
+    }
+
+    public startShortWithTimeout_result setSuccess(TTransaction success) {
+      this.success = success;
+      return this;
+    }
+
+    public void unsetSuccess() {
+      this.success = null;
+    }
+
+    /** Returns true if field success is set (has been assigned a value) and false otherwise */
+    public boolean isSetSuccess() {
+      return this.success != null;
+    }
+
+    public void setSuccessIsSet(boolean value) {
+      if (!value) {
+        this.success = null;
+      }
+    }
+
+    public TGenericException getE() {
+      return this.e;
+    }
+
+    public startShortWithTimeout_result setE(TGenericException e) {
+      this.e = e;
+      return this;
+    }
+
+    public void unsetE() {
+      this.e = null;
+    }
+
+    /** Returns true if field e is set (has been assigned a value) and false otherwise */
+    public boolean isSetE() {
+      return this.e != null;
+    }
+
+    public void setEIsSet(boolean value) {
+      if (!value) {
+        this.e = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case SUCCESS:
+        if (value == null) {
+          unsetSuccess();
+        } else {
+          setSuccess((TTransaction)value);
+        }
+        break;
+
+      case E:
+        if (value == null) {
+          unsetE();
+        } else {
+          setE((TGenericException)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SUCCESS:
+        return getSuccess();
+
+      case E:
+        return getE();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
+      case E:
+        return isSetE();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof startShortWithTimeout_result)
+        return this.equals((startShortWithTimeout_result)that);
+      return false;
+    }
+
+    public boolean equals(startShortWithTimeout_result that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_success = true && this.isSetSuccess();
+      boolean that_present_success = true && that.isSetSuccess();
+      if (this_present_success || that_present_success) {
+        if (!(this_present_success && that_present_success))
+          return false;
+        if (!this.success.equals(that.success))
+          return false;
+      }
+
+      boolean this_present_e = true && this.isSetE();
+      boolean that_present_e = true && that.isSetE();
+      if (this_present_e || that_present_e) {
+        if (!(this_present_e && that_present_e))
+          return false;
+        if (!this.e.equals(that.e))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    public int compareTo(startShortWithTimeout_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+      startShortWithTimeout_result typedOther = (startShortWithTimeout_result)other;
+
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSuccess()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetE()).compareTo(typedOther.isSetE());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetE()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.e, typedOther.e);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("startShortWithTimeout_result(");
+      boolean first = true;
+
+      sb.append("success:");
+      if (this.success == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.success);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("e:");
+      if (this.e == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.e);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+      // check for sub-struct validity
+      if (success != null) {
+        success.validate();
+      }
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private static class startShortWithTimeout_resultStandardSchemeFactory implements SchemeFactory {
+      public startShortWithTimeout_resultStandardScheme getScheme() {
+        return new startShortWithTimeout_resultStandardScheme();
+      }
+    }
+
+    private static class startShortWithTimeout_resultStandardScheme extends StandardScheme<startShortWithTimeout_result> {
+
+      public void read(org.apache.thrift.protocol.TProtocol iprot, startShortWithTimeout_result struct) throws org.apache.thrift.TException {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+            break;
+          }
+          switch (schemeField.id) {
+            case 0: // SUCCESS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.success = new TTransaction();
+                struct.success.read(iprot);
+                struct.setSuccessIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 1: // E
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.e = new TGenericException();
+                struct.e.read(iprot);
+                struct.setEIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
+        }
+        iprot.readStructEnd();
+
+        // check for required fields of primitive type, which can't be checked in the validate method
+        struct.validate();
+      }
+
+      public void write(org.apache.thrift.protocol.TProtocol oprot, startShortWithTimeout_result struct) throws org.apache.thrift.TException {
+        struct.validate();
+
+        oprot.writeStructBegin(STRUCT_DESC);
+        if (struct.success != null) {
+          oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+          struct.success.write(oprot);
+          oprot.writeFieldEnd();
+        }
+        if (struct.e != null) {
+          oprot.writeFieldBegin(E_FIELD_DESC);
+          struct.e.write(oprot);
+          oprot.writeFieldEnd();
+        }
+        oprot.writeFieldStop();
+        oprot.writeStructEnd();
+      }
+
+    }
+
+    private static class startShortWithTimeout_resultTupleSchemeFactory implements SchemeFactory {
+      public startShortWithTimeout_resultTupleScheme getScheme() {
+        return new startShortWithTimeout_resultTupleScheme();
+      }
+    }
+
+    private static class startShortWithTimeout_resultTupleScheme extends TupleScheme<startShortWithTimeout_result> {
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol prot, startShortWithTimeout_result struct) throws org.apache.thrift.TException {
+        TTupleProtocol oprot = (TTupleProtocol) prot;
+        BitSet optionals = new BitSet();
+        if (struct.isSetSuccess()) {
+          optionals.set(0);
+        }
+        if (struct.isSetE()) {
+          optionals.set(1);
+        }
+        oprot.writeBitSet(optionals, 2);
+        if (struct.isSetSuccess()) {
+          struct.success.write(oprot);
+        }
+        if (struct.isSetE()) {
+          struct.e.write(oprot);
+        }
+      }
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol prot, startShortWithTimeout_result struct) throws org.apache.thrift.TException {
+        TTupleProtocol iprot = (TTupleProtocol) prot;
+        BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
+          struct.success = new TTransaction();
+          struct.success.read(iprot);
+          struct.setSuccessIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.e = new TGenericException();
+          struct.e.read(iprot);
+          struct.setEIsSet(true);
+        }
+      }
+    }
+
+  }
+
   public static class canCommitTx_args implements org.apache.thrift.TBase<canCommitTx_args, canCommitTx_args._Fields>, java.io.Serializable, Cloneable   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("canCommitTx_args");
 

http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/99c7bec4/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TTransactionType.java
----------------------------------------------------------------------
diff --git a/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TTransactionType.java b/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TTransactionType.java
index 8abfc3b..e78bb1b 100644
--- a/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TTransactionType.java
+++ b/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TTransactionType.java
@@ -25,6 +25,10 @@
 package org.apache.tephra.distributed.thrift;
 
 
+import java.util.Map;
+import java.util.HashMap;
+import org.apache.thrift.TEnum;
+
 public enum TTransactionType implements org.apache.thrift.TEnum {
   SHORT(1),
   LONG(2);

http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/99c7bec4/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TVisibilityLevel.java
----------------------------------------------------------------------
diff --git a/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TVisibilityLevel.java b/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TVisibilityLevel.java
index ed081b5..d71b896 100644
--- a/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TVisibilityLevel.java
+++ b/tephra-core/src/main/java/org/apache/tephra/distributed/thrift/TVisibilityLevel.java
@@ -25,6 +25,10 @@
 package org.apache.tephra.distributed.thrift;
 
 
+import java.util.Map;
+import java.util.HashMap;
+import org.apache.thrift.TEnum;
+
 public enum TVisibilityLevel implements org.apache.thrift.TEnum {
   SNAPSHOT(1),
   SNAPSHOT_EXCLUDE_CURRENT(2),

http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/99c7bec4/tephra-core/src/main/thrift/README
----------------------------------------------------------------------
diff --git a/tephra-core/src/main/thrift/README b/tephra-core/src/main/thrift/README
index 7a9b00d..a4962be 100644
--- a/tephra-core/src/main/thrift/README
+++ b/tephra-core/src/main/thrift/README
@@ -18,3 +18,7 @@
 
 To generate thrift classes:
 	thrift --gen java --out ../java/ transaction.thrift
+
+To add the Apache license header to the generated fiels:
+  for f in ../java/org/apache/tephra/distributed/thrift/T*.java; do mv $f nn; cat header nn > $f; rm -f nn; done
+

http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/99c7bec4/tephra-core/src/main/thrift/header
----------------------------------------------------------------------
diff --git a/tephra-core/src/main/thrift/header b/tephra-core/src/main/thrift/header
new file mode 100644
index 0000000..56c64d4
--- /dev/null
+++ b/tephra-core/src/main/thrift/header
@@ -0,0 +1,18 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+

http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/99c7bec4/tephra-core/src/main/thrift/transaction.thrift
----------------------------------------------------------------------
diff --git a/tephra-core/src/main/thrift/transaction.thrift b/tephra-core/src/main/thrift/transaction.thrift
index 0e3d712..454450e 100644
--- a/tephra-core/src/main/thrift/transaction.thrift
+++ b/tephra-core/src/main/thrift/transaction.thrift
@@ -1,3 +1,4 @@
+/*
 #
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
@@ -15,6 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+*/
 
 namespace java org.apache.tephra.distributed.thrift
 
@@ -53,6 +55,11 @@ exception TInvalidTruncateTimeException {
   1: string message
 }
 
+exception TGenericException {
+  1: string message,
+  2: string originalExceptionClass
+}
+
 # workaround for THRIFT-1474
 struct TBoolean {
   1: bool value
@@ -62,7 +69,9 @@ service TTransactionServer {
   // temporary tx2 stuff
   TTransaction startLong(),
   TTransaction startShort(),
+  // TODO remove this as it was replaced with startShortWithTimeout in 0.10
   TTransaction startShortTimeout(1: i32 timeout),
+  TTransaction startShortWithTimeout(1: i32 timeout) throws (1:TGenericException e),
   TBoolean canCommitTx(1: TTransaction tx, 2: set<binary> changes) throws (1:TTransactionNotInProgressException e),
   TBoolean commitTx(1: TTransaction tx) throws (1:TTransactionNotInProgressException e),
   void abortTx(1: TTransaction tx),

http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/99c7bec4/tephra-core/src/test/java/org/apache/tephra/ThriftTransactionSystemTest.java
----------------------------------------------------------------------
diff --git a/tephra-core/src/test/java/org/apache/tephra/ThriftTransactionSystemTest.java b/tephra-core/src/test/java/org/apache/tephra/ThriftTransactionSystemTest.java
index 3f7e88c..7fca246 100644
--- a/tephra-core/src/test/java/org/apache/tephra/ThriftTransactionSystemTest.java
+++ b/tephra-core/src/test/java/org/apache/tephra/ThriftTransactionSystemTest.java
@@ -24,6 +24,8 @@ import com.google.inject.Injector;
 import com.google.inject.Scopes;
 import com.google.inject.util.Modules;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.tephra.distributed.RetryNTimes;
+import org.apache.tephra.distributed.RetryStrategy;
 import org.apache.tephra.distributed.TransactionService;
 import org.apache.tephra.persist.InMemoryTransactionStateStorage;
 import org.apache.tephra.persist.TransactionStateStorage;
@@ -36,6 +38,7 @@ import org.apache.tephra.util.Tests;
 import org.apache.twill.internal.zookeeper.InMemoryZKServer;
 import org.apache.twill.zookeeper.ZKClientService;
 import org.junit.AfterClass;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
@@ -44,6 +47,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
 
 public class ThriftTransactionSystemTest extends TransactionSystemTest {
   private static final Logger LOG = LoggerFactory.getLogger(ThriftTransactionSystemTest.class);
@@ -65,8 +69,9 @@ public class ThriftTransactionSystemTest extends TransactionSystemTest {
     Configuration conf = new Configuration();
     conf.setBoolean(TxConstants.Manager.CFG_DO_PERSIST, false);
     conf.set(TxConstants.Service.CFG_DATA_TX_ZOOKEEPER_QUORUM, zkServer.getConnectionStr());
-    conf.set(TxConstants.Service.CFG_DATA_TX_CLIENT_RETRY_STRATEGY, "n-times");
-    conf.setInt(TxConstants.Service.CFG_DATA_TX_CLIENT_ATTEMPTS, 1);
+    // we want to use a retry strategy that lets us query the number of times it retried:
+    conf.set(TxConstants.Service.CFG_DATA_TX_CLIENT_RETRY_STRATEGY, CountingRetryStrategyProvider.class.getName());
+    conf.setInt(TxConstants.Service.CFG_DATA_TX_CLIENT_ATTEMPTS, 2);
     conf.setInt(TxConstants.Manager.CFG_TX_MAX_TIMEOUT, (int) TimeUnit.DAYS.toSeconds(5)); // very long limit
 
     Injector injector = Guice.createInjector(
@@ -124,4 +129,46 @@ public class ThriftTransactionSystemTest extends TransactionSystemTest {
   protected TransactionStateStorage getStateStorage() throws Exception {
     return storage;
   }
+
+  @Override
+  public void testNegativeTimeout() throws Exception {
+    // the super class tests that this throws IllegalArgumentException
+    // here we want to test additionally that the thrift client does not retry the request. That makes sense for
+    // other errors such as a lost connection, but not if the provided timeout argument was invalid.
+    CountingRetryStrategyProvider.retries.set(0);
+    super.testNegativeTimeout();
+    Assert.assertEquals(0, CountingRetryStrategyProvider.retries.get());
+  }
+
+  @Override
+  public void testExcessiveTimeout() throws Exception {
+    // the super class tests that this throws IllegalArgumentException
+    // here we want to test additionally that the thrift client does not retry the request. That makes sense for
+    // other errors such as a lost connection, but not if the provided timeout argument was invalid.
+    CountingRetryStrategyProvider.retries.set(0);
+    super.testExcessiveTimeout();
+    Assert.assertEquals(0, CountingRetryStrategyProvider.retries.get());
+  }
+
+  // implements a retry strategy that lets us verify how many times it retried
+  public static class CountingRetryStrategyProvider extends RetryNTimes.Provider {
+
+    static AtomicInteger retries = new AtomicInteger();
+
+    @Override
+    public RetryStrategy newRetryStrategy() {
+      final RetryStrategy delegate = super.newRetryStrategy();
+      return new RetryStrategy() {
+        @Override
+        public boolean failOnce() {
+          return delegate.failOnce();
+        }
+        @Override
+        public void beforeRetry() {
+          retries.incrementAndGet();
+          delegate.beforeRetry();
+        }
+      };
+    }
+  }
 }



Mime
View raw message