You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by su...@apache.org on 2015/12/08 17:01:54 UTC
[1/3] incubator-trafodion git commit: [TRAFODION-1663] Prepare, Commit,
and Abort requests from TransactionManager now carry a participant
number that helps track the specific requenst in the
RegionEndpointCoprocessor causing a problem when an UnknownTra
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 0b7112f0e -> 9ce3c07e3
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/84af9603/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/generated/TrxRegionProtos.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/generated/TrxRegionProtos.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/generated/TrxRegionProtos.java
index ea3ba54..cdca02f 100755
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/generated/TrxRegionProtos.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/generated/TrxRegionProtos.java
@@ -19,6 +19,9 @@
//
// @@@ END COPYRIGHT @@@
+// Generated by the protocol buffer compiler. DO NOT EDIT!
+// source: TrxRegion.proto
+
package org.apache.hadoop.hbase.coprocessor.transactional.generated;
public final class TrxRegionProtos {
@@ -48,6 +51,16 @@ public final class TrxRegionProtos {
* <code>required int64 transactionId = 2;</code>
*/
long getTransactionId();
+
+ // required int32 participantNum = 3;
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ boolean hasParticipantNum();
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ int getParticipantNum();
}
/**
* Protobuf type {@code AbortTransactionRequest}
@@ -110,6 +123,11 @@ public final class TrxRegionProtos {
transactionId_ = input.readInt64();
break;
}
+ case 24: {
+ bitField0_ |= 0x00000004;
+ participantNum_ = input.readInt32();
+ break;
+ }
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -182,9 +200,26 @@ public final class TrxRegionProtos {
return transactionId_;
}
+ // required int32 participantNum = 3;
+ public static final int PARTICIPANTNUM_FIELD_NUMBER = 3;
+ private int participantNum_;
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public boolean hasParticipantNum() {
+ return ((bitField0_ & 0x00000004) == 0x00000004);
+ }
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public int getParticipantNum() {
+ return participantNum_;
+ }
+
private void initFields() {
regionName_ = com.google.protobuf.ByteString.EMPTY;
transactionId_ = 0L;
+ participantNum_ = 0;
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -199,6 +234,10 @@ public final class TrxRegionProtos {
memoizedIsInitialized = 0;
return false;
}
+ if (!hasParticipantNum()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
memoizedIsInitialized = 1;
return true;
}
@@ -212,6 +251,9 @@ public final class TrxRegionProtos {
if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeInt64(2, transactionId_);
}
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
+ output.writeInt32(3, participantNum_);
+ }
getUnknownFields().writeTo(output);
}
@@ -229,6 +271,10 @@ public final class TrxRegionProtos {
size += com.google.protobuf.CodedOutputStream
.computeInt64Size(2, transactionId_);
}
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeInt32Size(3, participantNum_);
+ }
size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size;
return size;
@@ -349,6 +395,8 @@ public final class TrxRegionProtos {
bitField0_ = (bitField0_ & ~0x00000001);
transactionId_ = 0L;
bitField0_ = (bitField0_ & ~0x00000002);
+ participantNum_ = 0;
+ bitField0_ = (bitField0_ & ~0x00000004);
return this;
}
@@ -385,6 +433,10 @@ public final class TrxRegionProtos {
to_bitField0_ |= 0x00000002;
}
result.transactionId_ = transactionId_;
+ if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
+ to_bitField0_ |= 0x00000004;
+ }
+ result.participantNum_ = participantNum_;
result.bitField0_ = to_bitField0_;
onBuilt();
return result;
@@ -407,6 +459,9 @@ public final class TrxRegionProtos {
if (other.hasTransactionId()) {
setTransactionId(other.getTransactionId());
}
+ if (other.hasParticipantNum()) {
+ setParticipantNum(other.getParticipantNum());
+ }
this.mergeUnknownFields(other.getUnknownFields());
return this;
}
@@ -420,6 +475,10 @@ public final class TrxRegionProtos {
return false;
}
+ if (!hasParticipantNum()) {
+
+ return false;
+ }
return true;
}
@@ -511,6 +570,39 @@ public final class TrxRegionProtos {
return this;
}
+ // required int32 participantNum = 3;
+ private int participantNum_ ;
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public boolean hasParticipantNum() {
+ return ((bitField0_ & 0x00000004) == 0x00000004);
+ }
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public int getParticipantNum() {
+ return participantNum_;
+ }
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public Builder setParticipantNum(int value) {
+ bitField0_ |= 0x00000004;
+ participantNum_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public Builder clearParticipantNum() {
+ bitField0_ = (bitField0_ & ~0x00000004);
+ participantNum_ = 0;
+ onChanged();
+ return this;
+ }
+
// @@protoc_insertion_point(builder_scope:AbortTransactionRequest)
}
@@ -1100,6 +1192,16 @@ public final class TrxRegionProtos {
* <code>required int64 transactionId = 2;</code>
*/
long getTransactionId();
+
+ // required int32 participantNum = 3;
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ boolean hasParticipantNum();
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ int getParticipantNum();
}
/**
* Protobuf type {@code AbortTransactionMultipleRequest}
@@ -1165,6 +1267,11 @@ public final class TrxRegionProtos {
transactionId_ = input.readInt64();
break;
}
+ case 24: {
+ bitField0_ |= 0x00000002;
+ participantNum_ = input.readInt32();
+ break;
+ }
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -1247,9 +1354,26 @@ public final class TrxRegionProtos {
return transactionId_;
}
+ // required int32 participantNum = 3;
+ public static final int PARTICIPANTNUM_FIELD_NUMBER = 3;
+ private int participantNum_;
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public boolean hasParticipantNum() {
+ return ((bitField0_ & 0x00000002) == 0x00000002);
+ }
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public int getParticipantNum() {
+ return participantNum_;
+ }
+
private void initFields() {
regionName_ = java.util.Collections.emptyList();
transactionId_ = 0L;
+ participantNum_ = 0;
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -1260,6 +1384,10 @@ public final class TrxRegionProtos {
memoizedIsInitialized = 0;
return false;
}
+ if (!hasParticipantNum()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
memoizedIsInitialized = 1;
return true;
}
@@ -1273,6 +1401,9 @@ public final class TrxRegionProtos {
if (((bitField0_ & 0x00000001) == 0x00000001)) {
output.writeInt64(2, transactionId_);
}
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ output.writeInt32(3, participantNum_);
+ }
getUnknownFields().writeTo(output);
}
@@ -1295,6 +1426,10 @@ public final class TrxRegionProtos {
size += com.google.protobuf.CodedOutputStream
.computeInt64Size(2, transactionId_);
}
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeInt32Size(3, participantNum_);
+ }
size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size;
return size;
@@ -1415,6 +1550,8 @@ public final class TrxRegionProtos {
bitField0_ = (bitField0_ & ~0x00000001);
transactionId_ = 0L;
bitField0_ = (bitField0_ & ~0x00000002);
+ participantNum_ = 0;
+ bitField0_ = (bitField0_ & ~0x00000004);
return this;
}
@@ -1452,6 +1589,10 @@ public final class TrxRegionProtos {
to_bitField0_ |= 0x00000001;
}
result.transactionId_ = transactionId_;
+ if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
+ to_bitField0_ |= 0x00000002;
+ }
+ result.participantNum_ = participantNum_;
result.bitField0_ = to_bitField0_;
onBuilt();
return result;
@@ -1481,6 +1622,9 @@ public final class TrxRegionProtos {
if (other.hasTransactionId()) {
setTransactionId(other.getTransactionId());
}
+ if (other.hasParticipantNum()) {
+ setParticipantNum(other.getParticipantNum());
+ }
this.mergeUnknownFields(other.getUnknownFields());
return this;
}
@@ -1490,6 +1634,10 @@ public final class TrxRegionProtos {
return false;
}
+ if (!hasParticipantNum()) {
+
+ return false;
+ }
return true;
}
@@ -1617,6 +1765,39 @@ public final class TrxRegionProtos {
return this;
}
+ // required int32 participantNum = 3;
+ private int participantNum_ ;
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public boolean hasParticipantNum() {
+ return ((bitField0_ & 0x00000004) == 0x00000004);
+ }
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public int getParticipantNum() {
+ return participantNum_;
+ }
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public Builder setParticipantNum(int value) {
+ bitField0_ |= 0x00000004;
+ participantNum_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public Builder clearParticipantNum() {
+ bitField0_ = (bitField0_ & ~0x00000004);
+ participantNum_ = 0;
+ onChanged();
+ return this;
+ }
+
// @@protoc_insertion_point(builder_scope:AbortTransactionMultipleRequest)
}
@@ -3280,13 +3461,23 @@ public final class TrxRegionProtos {
*/
long getTransactionId();
- // optional bool ignoreUnknownTransactionException = 3;
+ // required int32 participantNum = 3;
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ boolean hasParticipantNum();
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ int getParticipantNum();
+
+ // optional bool ignoreUnknownTransactionException = 4;
/**
- * <code>optional bool ignoreUnknownTransactionException = 3;</code>
+ * <code>optional bool ignoreUnknownTransactionException = 4;</code>
*/
boolean hasIgnoreUnknownTransactionException();
/**
- * <code>optional bool ignoreUnknownTransactionException = 3;</code>
+ * <code>optional bool ignoreUnknownTransactionException = 4;</code>
*/
boolean getIgnoreUnknownTransactionException();
}
@@ -3353,6 +3544,11 @@ public final class TrxRegionProtos {
}
case 24: {
bitField0_ |= 0x00000004;
+ participantNum_ = input.readInt32();
+ break;
+ }
+ case 32: {
+ bitField0_ |= 0x00000008;
ignoreUnknownTransactionException_ = input.readBool();
break;
}
@@ -3428,17 +3624,33 @@ public final class TrxRegionProtos {
return transactionId_;
}
- // optional bool ignoreUnknownTransactionException = 3;
- public static final int IGNOREUNKNOWNTRANSACTIONEXCEPTION_FIELD_NUMBER = 3;
+ // required int32 participantNum = 3;
+ public static final int PARTICIPANTNUM_FIELD_NUMBER = 3;
+ private int participantNum_;
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public boolean hasParticipantNum() {
+ return ((bitField0_ & 0x00000004) == 0x00000004);
+ }
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public int getParticipantNum() {
+ return participantNum_;
+ }
+
+ // optional bool ignoreUnknownTransactionException = 4;
+ public static final int IGNOREUNKNOWNTRANSACTIONEXCEPTION_FIELD_NUMBER = 4;
private boolean ignoreUnknownTransactionException_;
/**
- * <code>optional bool ignoreUnknownTransactionException = 3;</code>
+ * <code>optional bool ignoreUnknownTransactionException = 4;</code>
*/
public boolean hasIgnoreUnknownTransactionException() {
- return ((bitField0_ & 0x00000004) == 0x00000004);
+ return ((bitField0_ & 0x00000008) == 0x00000008);
}
/**
- * <code>optional bool ignoreUnknownTransactionException = 3;</code>
+ * <code>optional bool ignoreUnknownTransactionException = 4;</code>
*/
public boolean getIgnoreUnknownTransactionException() {
return ignoreUnknownTransactionException_;
@@ -3447,6 +3659,7 @@ public final class TrxRegionProtos {
private void initFields() {
regionName_ = com.google.protobuf.ByteString.EMPTY;
transactionId_ = 0L;
+ participantNum_ = 0;
ignoreUnknownTransactionException_ = false;
}
private byte memoizedIsInitialized = -1;
@@ -3462,6 +3675,10 @@ public final class TrxRegionProtos {
memoizedIsInitialized = 0;
return false;
}
+ if (!hasParticipantNum()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
memoizedIsInitialized = 1;
return true;
}
@@ -3476,7 +3693,10 @@ public final class TrxRegionProtos {
output.writeInt64(2, transactionId_);
}
if (((bitField0_ & 0x00000004) == 0x00000004)) {
- output.writeBool(3, ignoreUnknownTransactionException_);
+ output.writeInt32(3, participantNum_);
+ }
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ output.writeBool(4, ignoreUnknownTransactionException_);
}
getUnknownFields().writeTo(output);
}
@@ -3497,7 +3717,11 @@ public final class TrxRegionProtos {
}
if (((bitField0_ & 0x00000004) == 0x00000004)) {
size += com.google.protobuf.CodedOutputStream
- .computeBoolSize(3, ignoreUnknownTransactionException_);
+ .computeInt32Size(3, participantNum_);
+ }
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeBoolSize(4, ignoreUnknownTransactionException_);
}
size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size;
@@ -3619,8 +3843,10 @@ public final class TrxRegionProtos {
bitField0_ = (bitField0_ & ~0x00000001);
transactionId_ = 0L;
bitField0_ = (bitField0_ & ~0x00000002);
- ignoreUnknownTransactionException_ = false;
+ participantNum_ = 0;
bitField0_ = (bitField0_ & ~0x00000004);
+ ignoreUnknownTransactionException_ = false;
+ bitField0_ = (bitField0_ & ~0x00000008);
return this;
}
@@ -3660,6 +3886,10 @@ public final class TrxRegionProtos {
if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
to_bitField0_ |= 0x00000004;
}
+ result.participantNum_ = participantNum_;
+ if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
+ to_bitField0_ |= 0x00000008;
+ }
result.ignoreUnknownTransactionException_ = ignoreUnknownTransactionException_;
result.bitField0_ = to_bitField0_;
onBuilt();
@@ -3683,6 +3913,9 @@ public final class TrxRegionProtos {
if (other.hasTransactionId()) {
setTransactionId(other.getTransactionId());
}
+ if (other.hasParticipantNum()) {
+ setParticipantNum(other.getParticipantNum());
+ }
if (other.hasIgnoreUnknownTransactionException()) {
setIgnoreUnknownTransactionException(other.getIgnoreUnknownTransactionException());
}
@@ -3699,6 +3932,10 @@ public final class TrxRegionProtos {
return false;
}
+ if (!hasParticipantNum()) {
+
+ return false;
+ }
return true;
}
@@ -3790,34 +4027,67 @@ public final class TrxRegionProtos {
return this;
}
- // optional bool ignoreUnknownTransactionException = 3;
+ // required int32 participantNum = 3;
+ private int participantNum_ ;
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public boolean hasParticipantNum() {
+ return ((bitField0_ & 0x00000004) == 0x00000004);
+ }
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public int getParticipantNum() {
+ return participantNum_;
+ }
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public Builder setParticipantNum(int value) {
+ bitField0_ |= 0x00000004;
+ participantNum_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public Builder clearParticipantNum() {
+ bitField0_ = (bitField0_ & ~0x00000004);
+ participantNum_ = 0;
+ onChanged();
+ return this;
+ }
+
+ // optional bool ignoreUnknownTransactionException = 4;
private boolean ignoreUnknownTransactionException_ ;
/**
- * <code>optional bool ignoreUnknownTransactionException = 3;</code>
+ * <code>optional bool ignoreUnknownTransactionException = 4;</code>
*/
public boolean hasIgnoreUnknownTransactionException() {
- return ((bitField0_ & 0x00000004) == 0x00000004);
+ return ((bitField0_ & 0x00000008) == 0x00000008);
}
/**
- * <code>optional bool ignoreUnknownTransactionException = 3;</code>
+ * <code>optional bool ignoreUnknownTransactionException = 4;</code>
*/
public boolean getIgnoreUnknownTransactionException() {
return ignoreUnknownTransactionException_;
}
/**
- * <code>optional bool ignoreUnknownTransactionException = 3;</code>
+ * <code>optional bool ignoreUnknownTransactionException = 4;</code>
*/
public Builder setIgnoreUnknownTransactionException(boolean value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000008;
ignoreUnknownTransactionException_ = value;
onChanged();
return this;
}
/**
- * <code>optional bool ignoreUnknownTransactionException = 3;</code>
+ * <code>optional bool ignoreUnknownTransactionException = 4;</code>
*/
public Builder clearIgnoreUnknownTransactionException() {
- bitField0_ = (bitField0_ & ~0x00000004);
+ bitField0_ = (bitField0_ & ~0x00000008);
ignoreUnknownTransactionException_ = false;
onChanged();
return this;
@@ -4413,13 +4683,23 @@ public final class TrxRegionProtos {
*/
long getTransactionId();
- // optional bool ignoreUnknownTransactionException = 3;
+ // required int32 participantNum = 3;
/**
- * <code>optional bool ignoreUnknownTransactionException = 3;</code>
+ * <code>required int32 participantNum = 3;</code>
+ */
+ boolean hasParticipantNum();
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ int getParticipantNum();
+
+ // optional bool ignoreUnknownTransactionException = 4;
+ /**
+ * <code>optional bool ignoreUnknownTransactionException = 4;</code>
*/
boolean hasIgnoreUnknownTransactionException();
/**
- * <code>optional bool ignoreUnknownTransactionException = 3;</code>
+ * <code>optional bool ignoreUnknownTransactionException = 4;</code>
*/
boolean getIgnoreUnknownTransactionException();
}
@@ -4489,6 +4769,11 @@ public final class TrxRegionProtos {
}
case 24: {
bitField0_ |= 0x00000002;
+ participantNum_ = input.readInt32();
+ break;
+ }
+ case 32: {
+ bitField0_ |= 0x00000004;
ignoreUnknownTransactionException_ = input.readBool();
break;
}
@@ -4574,17 +4859,33 @@ public final class TrxRegionProtos {
return transactionId_;
}
- // optional bool ignoreUnknownTransactionException = 3;
- public static final int IGNOREUNKNOWNTRANSACTIONEXCEPTION_FIELD_NUMBER = 3;
+ // required int32 participantNum = 3;
+ public static final int PARTICIPANTNUM_FIELD_NUMBER = 3;
+ private int participantNum_;
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public boolean hasParticipantNum() {
+ return ((bitField0_ & 0x00000002) == 0x00000002);
+ }
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public int getParticipantNum() {
+ return participantNum_;
+ }
+
+ // optional bool ignoreUnknownTransactionException = 4;
+ public static final int IGNOREUNKNOWNTRANSACTIONEXCEPTION_FIELD_NUMBER = 4;
private boolean ignoreUnknownTransactionException_;
/**
- * <code>optional bool ignoreUnknownTransactionException = 3;</code>
+ * <code>optional bool ignoreUnknownTransactionException = 4;</code>
*/
public boolean hasIgnoreUnknownTransactionException() {
- return ((bitField0_ & 0x00000002) == 0x00000002);
+ return ((bitField0_ & 0x00000004) == 0x00000004);
}
/**
- * <code>optional bool ignoreUnknownTransactionException = 3;</code>
+ * <code>optional bool ignoreUnknownTransactionException = 4;</code>
*/
public boolean getIgnoreUnknownTransactionException() {
return ignoreUnknownTransactionException_;
@@ -4593,6 +4894,7 @@ public final class TrxRegionProtos {
private void initFields() {
regionName_ = java.util.Collections.emptyList();
transactionId_ = 0L;
+ participantNum_ = 0;
ignoreUnknownTransactionException_ = false;
}
private byte memoizedIsInitialized = -1;
@@ -4604,6 +4906,10 @@ public final class TrxRegionProtos {
memoizedIsInitialized = 0;
return false;
}
+ if (!hasParticipantNum()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
memoizedIsInitialized = 1;
return true;
}
@@ -4618,7 +4924,10 @@ public final class TrxRegionProtos {
output.writeInt64(2, transactionId_);
}
if (((bitField0_ & 0x00000002) == 0x00000002)) {
- output.writeBool(3, ignoreUnknownTransactionException_);
+ output.writeInt32(3, participantNum_);
+ }
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
+ output.writeBool(4, ignoreUnknownTransactionException_);
}
getUnknownFields().writeTo(output);
}
@@ -4644,7 +4953,11 @@ public final class TrxRegionProtos {
}
if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += com.google.protobuf.CodedOutputStream
- .computeBoolSize(3, ignoreUnknownTransactionException_);
+ .computeInt32Size(3, participantNum_);
+ }
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeBoolSize(4, ignoreUnknownTransactionException_);
}
size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size;
@@ -4766,8 +5079,10 @@ public final class TrxRegionProtos {
bitField0_ = (bitField0_ & ~0x00000001);
transactionId_ = 0L;
bitField0_ = (bitField0_ & ~0x00000002);
- ignoreUnknownTransactionException_ = false;
+ participantNum_ = 0;
bitField0_ = (bitField0_ & ~0x00000004);
+ ignoreUnknownTransactionException_ = false;
+ bitField0_ = (bitField0_ & ~0x00000008);
return this;
}
@@ -4808,6 +5123,10 @@ public final class TrxRegionProtos {
if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
to_bitField0_ |= 0x00000002;
}
+ result.participantNum_ = participantNum_;
+ if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
+ to_bitField0_ |= 0x00000004;
+ }
result.ignoreUnknownTransactionException_ = ignoreUnknownTransactionException_;
result.bitField0_ = to_bitField0_;
onBuilt();
@@ -4838,6 +5157,9 @@ public final class TrxRegionProtos {
if (other.hasTransactionId()) {
setTransactionId(other.getTransactionId());
}
+ if (other.hasParticipantNum()) {
+ setParticipantNum(other.getParticipantNum());
+ }
if (other.hasIgnoreUnknownTransactionException()) {
setIgnoreUnknownTransactionException(other.getIgnoreUnknownTransactionException());
}
@@ -4850,6 +5172,10 @@ public final class TrxRegionProtos {
return false;
}
+ if (!hasParticipantNum()) {
+
+ return false;
+ }
return true;
}
@@ -4977,34 +5303,67 @@ public final class TrxRegionProtos {
return this;
}
- // optional bool ignoreUnknownTransactionException = 3;
+ // required int32 participantNum = 3;
+ private int participantNum_ ;
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public boolean hasParticipantNum() {
+ return ((bitField0_ & 0x00000004) == 0x00000004);
+ }
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public int getParticipantNum() {
+ return participantNum_;
+ }
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public Builder setParticipantNum(int value) {
+ bitField0_ |= 0x00000004;
+ participantNum_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public Builder clearParticipantNum() {
+ bitField0_ = (bitField0_ & ~0x00000004);
+ participantNum_ = 0;
+ onChanged();
+ return this;
+ }
+
+ // optional bool ignoreUnknownTransactionException = 4;
private boolean ignoreUnknownTransactionException_ ;
/**
- * <code>optional bool ignoreUnknownTransactionException = 3;</code>
+ * <code>optional bool ignoreUnknownTransactionException = 4;</code>
*/
public boolean hasIgnoreUnknownTransactionException() {
- return ((bitField0_ & 0x00000004) == 0x00000004);
+ return ((bitField0_ & 0x00000008) == 0x00000008);
}
/**
- * <code>optional bool ignoreUnknownTransactionException = 3;</code>
+ * <code>optional bool ignoreUnknownTransactionException = 4;</code>
*/
public boolean getIgnoreUnknownTransactionException() {
return ignoreUnknownTransactionException_;
}
/**
- * <code>optional bool ignoreUnknownTransactionException = 3;</code>
+ * <code>optional bool ignoreUnknownTransactionException = 4;</code>
*/
public Builder setIgnoreUnknownTransactionException(boolean value) {
- bitField0_ |= 0x00000004;
+ bitField0_ |= 0x00000008;
ignoreUnknownTransactionException_ = value;
onChanged();
return this;
}
/**
- * <code>optional bool ignoreUnknownTransactionException = 3;</code>
+ * <code>optional bool ignoreUnknownTransactionException = 4;</code>
*/
public Builder clearIgnoreUnknownTransactionException() {
- bitField0_ = (bitField0_ & ~0x00000004);
+ bitField0_ = (bitField0_ & ~0x00000008);
ignoreUnknownTransactionException_ = false;
onChanged();
return this;
@@ -5624,6 +5983,16 @@ public final class TrxRegionProtos {
* <code>required int64 transactionId = 2;</code>
*/
long getTransactionId();
+
+ // required int32 participantNum = 3;
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ boolean hasParticipantNum();
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ int getParticipantNum();
}
/**
* Protobuf type {@code CommitRequestRequest}
@@ -5686,6 +6055,11 @@ public final class TrxRegionProtos {
transactionId_ = input.readInt64();
break;
}
+ case 24: {
+ bitField0_ |= 0x00000004;
+ participantNum_ = input.readInt32();
+ break;
+ }
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -5758,9 +6132,26 @@ public final class TrxRegionProtos {
return transactionId_;
}
+ // required int32 participantNum = 3;
+ public static final int PARTICIPANTNUM_FIELD_NUMBER = 3;
+ private int participantNum_;
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public boolean hasParticipantNum() {
+ return ((bitField0_ & 0x00000004) == 0x00000004);
+ }
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public int getParticipantNum() {
+ return participantNum_;
+ }
+
private void initFields() {
regionName_ = com.google.protobuf.ByteString.EMPTY;
transactionId_ = 0L;
+ participantNum_ = 0;
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -5775,6 +6166,10 @@ public final class TrxRegionProtos {
memoizedIsInitialized = 0;
return false;
}
+ if (!hasParticipantNum()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
memoizedIsInitialized = 1;
return true;
}
@@ -5788,6 +6183,9 @@ public final class TrxRegionProtos {
if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeInt64(2, transactionId_);
}
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
+ output.writeInt32(3, participantNum_);
+ }
getUnknownFields().writeTo(output);
}
@@ -5805,6 +6203,10 @@ public final class TrxRegionProtos {
size += com.google.protobuf.CodedOutputStream
.computeInt64Size(2, transactionId_);
}
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeInt32Size(3, participantNum_);
+ }
size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size;
return size;
@@ -5925,6 +6327,8 @@ public final class TrxRegionProtos {
bitField0_ = (bitField0_ & ~0x00000001);
transactionId_ = 0L;
bitField0_ = (bitField0_ & ~0x00000002);
+ participantNum_ = 0;
+ bitField0_ = (bitField0_ & ~0x00000004);
return this;
}
@@ -5961,6 +6365,10 @@ public final class TrxRegionProtos {
to_bitField0_ |= 0x00000002;
}
result.transactionId_ = transactionId_;
+ if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
+ to_bitField0_ |= 0x00000004;
+ }
+ result.participantNum_ = participantNum_;
result.bitField0_ = to_bitField0_;
onBuilt();
return result;
@@ -5983,6 +6391,9 @@ public final class TrxRegionProtos {
if (other.hasTransactionId()) {
setTransactionId(other.getTransactionId());
}
+ if (other.hasParticipantNum()) {
+ setParticipantNum(other.getParticipantNum());
+ }
this.mergeUnknownFields(other.getUnknownFields());
return this;
}
@@ -5996,6 +6407,10 @@ public final class TrxRegionProtos {
return false;
}
+ if (!hasParticipantNum()) {
+
+ return false;
+ }
return true;
}
@@ -6087,6 +6502,39 @@ public final class TrxRegionProtos {
return this;
}
+ // required int32 participantNum = 3;
+ private int participantNum_ ;
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public boolean hasParticipantNum() {
+ return ((bitField0_ & 0x00000004) == 0x00000004);
+ }
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public int getParticipantNum() {
+ return participantNum_;
+ }
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public Builder setParticipantNum(int value) {
+ bitField0_ |= 0x00000004;
+ participantNum_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public Builder clearParticipantNum() {
+ bitField0_ = (bitField0_ & ~0x00000004);
+ participantNum_ = 0;
+ onChanged();
+ return this;
+ }
+
// @@protoc_insertion_point(builder_scope:CommitRequestRequest)
}
@@ -6765,6 +7213,16 @@ public final class TrxRegionProtos {
* <code>required int64 transactionId = 2;</code>
*/
long getTransactionId();
+
+ // required int32 participantNum = 3;
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ boolean hasParticipantNum();
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ int getParticipantNum();
}
/**
* Protobuf type {@code CommitRequestMultipleRequest}
@@ -6830,6 +7288,11 @@ public final class TrxRegionProtos {
transactionId_ = input.readInt64();
break;
}
+ case 24: {
+ bitField0_ |= 0x00000002;
+ participantNum_ = input.readInt32();
+ break;
+ }
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -6912,9 +7375,26 @@ public final class TrxRegionProtos {
return transactionId_;
}
+ // required int32 participantNum = 3;
+ public static final int PARTICIPANTNUM_FIELD_NUMBER = 3;
+ private int participantNum_;
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public boolean hasParticipantNum() {
+ return ((bitField0_ & 0x00000002) == 0x00000002);
+ }
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public int getParticipantNum() {
+ return participantNum_;
+ }
+
private void initFields() {
regionName_ = java.util.Collections.emptyList();
transactionId_ = 0L;
+ participantNum_ = 0;
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -6925,6 +7405,10 @@ public final class TrxRegionProtos {
memoizedIsInitialized = 0;
return false;
}
+ if (!hasParticipantNum()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
memoizedIsInitialized = 1;
return true;
}
@@ -6938,6 +7422,9 @@ public final class TrxRegionProtos {
if (((bitField0_ & 0x00000001) == 0x00000001)) {
output.writeInt64(2, transactionId_);
}
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ output.writeInt32(3, participantNum_);
+ }
getUnknownFields().writeTo(output);
}
@@ -6960,6 +7447,10 @@ public final class TrxRegionProtos {
size += com.google.protobuf.CodedOutputStream
.computeInt64Size(2, transactionId_);
}
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeInt32Size(3, participantNum_);
+ }
size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size;
return size;
@@ -7080,6 +7571,8 @@ public final class TrxRegionProtos {
bitField0_ = (bitField0_ & ~0x00000001);
transactionId_ = 0L;
bitField0_ = (bitField0_ & ~0x00000002);
+ participantNum_ = 0;
+ bitField0_ = (bitField0_ & ~0x00000004);
return this;
}
@@ -7117,6 +7610,10 @@ public final class TrxRegionProtos {
to_bitField0_ |= 0x00000001;
}
result.transactionId_ = transactionId_;
+ if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
+ to_bitField0_ |= 0x00000002;
+ }
+ result.participantNum_ = participantNum_;
result.bitField0_ = to_bitField0_;
onBuilt();
return result;
@@ -7146,6 +7643,9 @@ public final class TrxRegionProtos {
if (other.hasTransactionId()) {
setTransactionId(other.getTransactionId());
}
+ if (other.hasParticipantNum()) {
+ setParticipantNum(other.getParticipantNum());
+ }
this.mergeUnknownFields(other.getUnknownFields());
return this;
}
@@ -7155,6 +7655,10 @@ public final class TrxRegionProtos {
return false;
}
+ if (!hasParticipantNum()) {
+
+ return false;
+ }
return true;
}
@@ -7282,6 +7786,39 @@ public final class TrxRegionProtos {
return this;
}
+ // required int32 participantNum = 3;
+ private int participantNum_ ;
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public boolean hasParticipantNum() {
+ return ((bitField0_ & 0x00000004) == 0x00000004);
+ }
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public int getParticipantNum() {
+ return participantNum_;
+ }
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public Builder setParticipantNum(int value) {
+ bitField0_ |= 0x00000004;
+ participantNum_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public Builder clearParticipantNum() {
+ bitField0_ = (bitField0_ & ~0x00000004);
+ participantNum_ = 0;
+ onChanged();
+ return this;
+ }
+
// @@protoc_insertion_point(builder_scope:CommitRequestMultipleRequest)
}
@@ -8053,6 +8590,16 @@ public final class TrxRegionProtos {
* <code>required int64 transactionId = 2;</code>
*/
long getTransactionId();
+
+ // required int32 participantNum = 3;
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ boolean hasParticipantNum();
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ int getParticipantNum();
}
/**
* Protobuf type {@code CommitIfPossibleRequest}
@@ -8115,6 +8662,11 @@ public final class TrxRegionProtos {
transactionId_ = input.readInt64();
break;
}
+ case 24: {
+ bitField0_ |= 0x00000004;
+ participantNum_ = input.readInt32();
+ break;
+ }
}
}
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -8187,9 +8739,26 @@ public final class TrxRegionProtos {
return transactionId_;
}
+ // required int32 participantNum = 3;
+ public static final int PARTICIPANTNUM_FIELD_NUMBER = 3;
+ private int participantNum_;
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public boolean hasParticipantNum() {
+ return ((bitField0_ & 0x00000004) == 0x00000004);
+ }
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public int getParticipantNum() {
+ return participantNum_;
+ }
+
private void initFields() {
regionName_ = com.google.protobuf.ByteString.EMPTY;
transactionId_ = 0L;
+ participantNum_ = 0;
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -8204,6 +8773,10 @@ public final class TrxRegionProtos {
memoizedIsInitialized = 0;
return false;
}
+ if (!hasParticipantNum()) {
+ memoizedIsInitialized = 0;
+ return false;
+ }
memoizedIsInitialized = 1;
return true;
}
@@ -8217,6 +8790,9 @@ public final class TrxRegionProtos {
if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeInt64(2, transactionId_);
}
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
+ output.writeInt32(3, participantNum_);
+ }
getUnknownFields().writeTo(output);
}
@@ -8234,6 +8810,10 @@ public final class TrxRegionProtos {
size += com.google.protobuf.CodedOutputStream
.computeInt64Size(2, transactionId_);
}
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
+ size += com.google.protobuf.CodedOutputStream
+ .computeInt32Size(3, participantNum_);
+ }
size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size;
return size;
@@ -8354,6 +8934,8 @@ public final class TrxRegionProtos {
bitField0_ = (bitField0_ & ~0x00000001);
transactionId_ = 0L;
bitField0_ = (bitField0_ & ~0x00000002);
+ participantNum_ = 0;
+ bitField0_ = (bitField0_ & ~0x00000004);
return this;
}
@@ -8390,6 +8972,10 @@ public final class TrxRegionProtos {
to_bitField0_ |= 0x00000002;
}
result.transactionId_ = transactionId_;
+ if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
+ to_bitField0_ |= 0x00000004;
+ }
+ result.participantNum_ = participantNum_;
result.bitField0_ = to_bitField0_;
onBuilt();
return result;
@@ -8412,6 +8998,9 @@ public final class TrxRegionProtos {
if (other.hasTransactionId()) {
setTransactionId(other.getTransactionId());
}
+ if (other.hasParticipantNum()) {
+ setParticipantNum(other.getParticipantNum());
+ }
this.mergeUnknownFields(other.getUnknownFields());
return this;
}
@@ -8425,6 +9014,10 @@ public final class TrxRegionProtos {
return false;
}
+ if (!hasParticipantNum()) {
+
+ return false;
+ }
return true;
}
@@ -8516,6 +9109,39 @@ public final class TrxRegionProtos {
return this;
}
+ // required int32 participantNum = 3;
+ private int participantNum_ ;
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public boolean hasParticipantNum() {
+ return ((bitField0_ & 0x00000004) == 0x00000004);
+ }
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public int getParticipantNum() {
+ return participantNum_;
+ }
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public Builder setParticipantNum(int value) {
+ bitField0_ |= 0x00000004;
+ participantNum_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * <code>required int32 participantNum = 3;</code>
+ */
+ public Builder clearParticipantNum() {
+ bitField0_ = (bitField0_ & ~0x00000004);
+ participantNum_ = 0;
+ onChanged();
+ return this;
+ }
+
// @@protoc_insertion_point(builder_scope:CommitIfPossibleRequest)
}
@@ -32667,158 +33293,162 @@ public final class TrxRegionProtos {
static {
java.lang.String[] descriptorData = {
"\n\017TrxRegion.proto\032\013HBase.proto\032\023ClusterS" +
- "tatus.proto\032\014Client.proto\"D\n\027AbortTransa" +
+ "tatus.proto\032\014Client.proto\"\\\n\027AbortTransa" +
"ctionRequest\022\022\n\nregionName\030\001 \002(\014\022\025\n\rtran" +
- "sactionId\030\002 \002(\003\"C\n\030AbortTransactionRespo" +
- "nse\022\021\n\texception\030\001 \001(\t\022\024\n\014hasException\030\002" +
- " \001(\010\"L\n\037AbortTransactionMultipleRequest\022" +
- "\022\n\nregionName\030\001 \003(\014\022\025\n\rtransactionId\030\002 \002" +
- "(\003\"K\n AbortTransactionMultipleResponse\022\021" +
- "\n\texception\030\001 \003(\t\022\024\n\014hasException\030\002 \001(\010\"" +
- "D\n\027BeginTransactionRequest\022\025\n\rtransactio",
- "nId\030\001 \002(\003\022\022\n\nregionName\030\002 \002(\014\"C\n\030BeginTr" +
- "ansactionResponse\022\021\n\texception\030\001 \001(\t\022\024\n\014" +
- "hasException\030\002 \001(\010\"e\n\rCommitRequest\022\022\n\nr" +
- "egionName\030\001 \002(\014\022\025\n\rtransactionId\030\002 \002(\003\022)" +
- "\n!ignoreUnknownTransactionException\030\003 \001(" +
- "\010\"9\n\016CommitResponse\022\021\n\texception\030\001 \001(\t\022\024" +
- "\n\014hasException\030\002 \001(\010\"m\n\025CommitMultipleRe" +
- "quest\022\022\n\nregionName\030\001 \003(\014\022\025\n\rtransaction" +
- "Id\030\002 \002(\003\022)\n!ignoreUnknownTransactionExce" +
- "ption\030\003 \001(\010\"A\n\026CommitMultipleResponse\022\021\n",
- "\texception\030\001 \003(\t\022\024\n\014hasException\030\002 \001(\010\"A" +
- "\n\024CommitRequestRequest\022\022\n\nregionName\030\001 \002" +
- "(\014\022\025\n\rtransactionId\030\002 \002(\003\"P\n\025CommitReque" +
- "stResponse\022\016\n\006result\030\001 \002(\005\022\021\n\texception\030" +
- "\002 \001(\t\022\024\n\014hasException\030\003 \001(\010\"I\n\034CommitReq" +
- "uestMultipleRequest\022\022\n\nregionName\030\001 \003(\014\022" +
- "\025\n\rtransactionId\030\002 \002(\003\"X\n\035CommitRequestM" +
- "ultipleResponse\022\016\n\006result\030\001 \003(\005\022\021\n\texcep" +
- "tion\030\002 \003(\t\022\024\n\014hasException\030\003 \001(\010\"D\n\027Comm" +
- "itIfPossibleRequest\022\022\n\nregionName\030\001 \002(\014\022",
- "\025\n\rtransactionId\030\002 \002(\003\"C\n\030CommitIfPossib" +
- "leResponse\022\021\n\texception\030\001 \001(\t\022\024\n\014hasExce" +
- "ption\030\002 \001(\010\"\241\001\n\025CheckAndDeleteRequest\022\025\n" +
- "\rtransactionId\030\001 \002(\003\022\022\n\nregionName\030\002 \002(\014" +
- "\022\013\n\003row\030\003 \002(\014\022\016\n\006family\030\004 \002(\014\022\021\n\tqualifi" +
- "er\030\005 \002(\014\022\r\n\005value\030\006 \002(\014\022\036\n\006delete\030\007 \002(\0132" +
- "\016.MutationProto\"Q\n\026CheckAndDeleteRespons" +
- "e\022\016\n\006result\030\001 \002(\010\022\021\n\texception\030\002 \001(\t\022\024\n\014" +
- "hasException\030\003 \001(\010\"\233\001\n\022CheckAndPutReques" +
- "t\022\025\n\rtransactionId\030\001 \002(\003\022\022\n\nregionName\030\002",
- " \002(\014\022\013\n\003row\030\003 \002(\014\022\016\n\006family\030\004 \002(\014\022\021\n\tqua" +
- "lifier\030\005 \002(\014\022\r\n\005value\030\006 \002(\014\022\033\n\003put\030\007 \002(\013" +
- "2\016.MutationProto\"N\n\023CheckAndPutResponse\022" +
- "\016\n\006result\030\001 \002(\010\022\021\n\texception\030\002 \001(\t\022\024\n\014ha" +
- "sException\030\003 \001(\010\"S\n\023CloseScannerRequest\022" +
- "\025\n\rtransactionId\030\001 \002(\003\022\022\n\nregionName\030\002 \002" +
- "(\014\022\021\n\tscannerId\030\003 \002(\003\"?\n\024CloseScannerRes" +
- "ponse\022\021\n\texception\030\001 \001(\t\022\024\n\014hasException" +
- "\030\002 \001(\010\"o\n\"DeleteMultipleTransactionalReq" +
- "uest\022\025\n\rtransactionId\030\001 \002(\003\022\022\n\nregionNam",
- "e\030\002 \002(\014\022\036\n\006delete\030\003 \003(\0132\016.MutationProto\"" +
- "g\n#DeleteMultipleTransactionalResponse\022\027" +
- "\n\006result\030\001 \001(\0132\007.Result\022\021\n\texception\030\002 \001" +
- "(\t\022\024\n\014hasException\030\003 \001(\010\"g\n\032DeleteTransa" +
- "ctionalRequest\022\025\n\rtransactionId\030\001 \002(\003\022\022\n" +
- "\nregionName\030\002 \002(\014\022\036\n\006delete\030\003 \002(\0132\016.Muta" +
- "tionProto\"_\n\033DeleteTransactionalResponse" +
- "\022\027\n\006result\030\001 \001(\0132\007.Result\022\021\n\texception\030\002" +
- " \001(\t\022\024\n\014hasException\030\003 \001(\010\"W\n\027GetTransac" +
- "tionalRequest\022\025\n\rtransactionId\030\001 \002(\003\022\022\n\n",
- "regionName\030\002 \002(\014\022\021\n\003get\030\003 \002(\0132\004.Get\"\\\n\030G" +
- "etTransactionalResponse\022\027\n\006result\030\001 \001(\0132" +
- "\007.Result\022\021\n\texception\030\002 \001(\t\022\024\n\014hasExcept" +
- "ion\030\003 \001(\010\"T\n\022OpenScannerRequest\022\025\n\rtrans" +
- "actionId\030\001 \002(\003\022\022\n\nregionName\030\002 \002(\014\022\023\n\004sc" +
- "an\030\003 \002(\0132\005.Scan\"Q\n\023OpenScannerResponse\022\021" +
- "\n\tscannerId\030\001 \002(\003\022\021\n\texception\030\002 \001(\t\022\024\n\014" +
- "hasException\030\003 \001(\010\"\223\001\n\022PerformScanReques" +
- "t\022\025\n\rtransactionId\030\001 \002(\003\022\022\n\nregionName\030\002" +
- " \002(\014\022\021\n\tscannerId\030\003 \002(\003\022\024\n\014numberOfRows\030",
- "\004 \002(\005\022\024\n\014closeScanner\030\005 \002(\010\022\023\n\013nextCallS" +
- "eq\030\006 \002(\003\"\214\001\n\023PerformScanResponse\022\027\n\006resu" +
- "lt\030\001 \003(\0132\007.Result\022\r\n\005count\030\002 \002(\003\022\023\n\013next" +
- "CallSeq\030\003 \002(\003\022\017\n\007hasMore\030\004 \002(\010\022\021\n\texcept" +
- "ion\030\005 \001(\t\022\024\n\014hasException\030\006 \001(\010\"a\n\027PutTr" +
- "ansactionalRequest\022\025\n\rtransactionId\030\001 \002(" +
- "\003\022\022\n\nregionName\030\002 \002(\014\022\033\n\003put\030\003 \002(\0132\016.Mut" +
- "ationProto\"\\\n\030PutTransactionalResponse\022\027" +
- "\n\006result\030\001 \001(\0132\007.Result\022\021\n\texception\030\002 \001" +
- "(\t\022\024\n\014hasException\030\003 \001(\010\"i\n\037PutMultipleT",
- "ransactionalRequest\022\025\n\rtransactionId\030\001 \002" +
- "(\003\022\022\n\nregionName\030\002 \002(\014\022\033\n\003put\030\003 \003(\0132\016.Mu" +
- "tationProto\"d\n PutMultipleTransactionalR" +
+ "sactionId\030\002 \002(\003\022\026\n\016participantNum\030\003 \002(\005\"" +
+ "C\n\030AbortTransactionResponse\022\021\n\texception" +
+ "\030\001 \001(\t\022\024\n\014hasException\030\002 \001(\010\"d\n\037AbortTra" +
+ "nsactionMultipleRequest\022\022\n\nregionName\030\001 " +
+ "\003(\014\022\025\n\rtransactionId\030\002 \002(\003\022\026\n\016participan" +
+ "tNum\030\003 \002(\005\"K\n AbortTransactionMultipleRe" +
+ "sponse\022\021\n\texception\030\001 \003(\t\022\024\n\014hasExceptio",
+ "n\030\002 \001(\010\"D\n\027BeginTransactionRequest\022\025\n\rtr" +
+ "ansactionId\030\001 \002(\003\022\022\n\nregionName\030\002 \002(\014\"C\n" +
+ "\030BeginTransactionResponse\022\021\n\texception\030\001" +
+ " \001(\t\022\024\n\014hasException\030\002 \001(\010\"}\n\rCommitRequ" +
+ "est\022\022\n\nregionName\030\001 \002(\014\022\025\n\rtransactionId" +
+ "\030\002 \002(\003\022\026\n\016participantNum\030\003 \002(\005\022)\n!ignore" +
+ "UnknownTransactionException\030\004 \001(\010\"9\n\016Com" +
+ "mitResponse\022\021\n\texception\030\001 \001(\t\022\024\n\014hasExc" +
+ "eption\030\002 \001(\010\"\205\001\n\025CommitMultipleRequest\022\022" +
+ "\n\nregionName\030\001 \003(\014\022\025\n\rtransactionId\030\002 \002(",
+ "\003\022\026\n\016participantNum\030\003 \002(\005\022)\n!ignoreUnkno" +
+ "wnTransactionException\030\004 \001(\010\"A\n\026CommitMu" +
+ "ltipleResponse\022\021\n\texception\030\001 \003(\t\022\024\n\014has" +
+ "Exception\030\002 \001(\010\"Y\n\024CommitRequestRequest\022" +
+ "\022\n\nregionName\030\001 \002(\014\022\025\n\rtransactionId\030\002 \002" +
+ "(\003\022\026\n\016participantNum\030\003 \002(\005\"P\n\025CommitRequ" +
+ "estResponse\022\016\n\006result\030\001 \002(\005\022\021\n\texception" +
+ "\030\002 \001(\t\022\024\n\014hasException\030\003 \001(\010\"a\n\034CommitRe" +
+ "questMultipleRequest\022\022\n\nregionName\030\001 \003(\014" +
+ "\022\025\n\rtransactionId\030\002 \002(\003\022\026\n\016participantNu",
+ "m\030\003 \002(\005\"X\n\035CommitRequestMultipleResponse" +
+ "\022\016\n\006result\030\001 \003(\005\022\021\n\texception\030\002 \003(\t\022\024\n\014h" +
+ "asException\030\003 \001(\010\"\\\n\027CommitIfPossibleReq" +
+ "uest\022\022\n\nregionName\030\001 \002(\014\022\025\n\rtransactionI" +
+ "d\030\002 \002(\003\022\026\n\016participantNum\030\003 \002(\005\"C\n\030Commi" +
+ "tIfPossibleResponse\022\021\n\texception\030\001 \001(\t\022\024" +
+ "\n\014hasException\030\002 \001(\010\"\241\001\n\025CheckAndDeleteR" +
+ "equest\022\025\n\rtransactionId\030\001 \002(\003\022\022\n\nregionN" +
+ "ame\030\002 \002(\014\022\013\n\003row\030\003 \002(\014\022\016\n\006family\030\004 \002(\014\022\021" +
+ "\n\tqualifier\030\005 \002(\014\022\r\n\005value\030\006 \002(\014\022\036\n\006dele",
+ "te\030\007 \002(\0132\016.MutationProto\"Q\n\026CheckAndDele" +
+ "teResponse\022\016\n\006result\030\001 \002(\010\022\021\n\texception\030" +
+ "\002 \001(\t\022\024\n\014hasException\030\003 \001(\010\"\233\001\n\022CheckAnd" +
+ "PutRequest\022\025\n\rtransactionId\030\001 \002(\003\022\022\n\nreg" +
+ "ionName\030\002 \002(\014\022\013\n\003row\030\003 \002(\014\022\016\n\006family\030\004 \002" +
+ "(\014\022\021\n\tqualifier\030\005 \002(\014\022\r\n\005value\030\006 \002(\014\022\033\n\003" +
+ "put\030\007 \002(\0132\016.MutationProto\"N\n\023CheckAndPut" +
+ "Response\022\016\n\006result\030\001 \002(\010\022\021\n\texception\030\002 " +
+ "\001(\t\022\024\n\014hasException\030\003 \001(\010\"S\n\023CloseScanne" +
+ "rRequest\022\025\n\rtransactionId\030\001 \002(\003\022\022\n\nregio",
+ "nName\030\002 \002(\014\022\021\n\tscannerId\030\003 \002(\003\"?\n\024CloseS" +
+ "cannerResponse\022\021\n\texception\030\001 \001(\t\022\024\n\014has" +
+ "Exception\030\002 \001(\010\"o\n\"DeleteMultipleTransac" +
+ "tionalRequest\022\025\n\rtransactionId\030\001 \002(\003\022\022\n\n" +
+ "regionName\030\002 \002(\014\022\036\n\006delete\030\003 \003(\0132\016.Mutat" +
+ "ionProto\"g\n#DeleteMultipleTransactionalR" +
+ "esponse\022\027\n\006result\030\001 \001(\0132\007.Result\022\021\n\texce" +
+ "ption\030\002 \001(\t\022\024\n\014hasException\030\003 \001(\010\"g\n\032Del" +
+ "eteTransactionalRequest\022\025\n\rtransactionId" +
+ "\030\001 \002(\003\022\022\n\nregionName\030\002 \002(\014\022\036\n\006delete\030\003 \002",
+ "(\0132\016.MutationProto\"_\n\033DeleteTransactiona" +
+ "lResponse\022\027\n\006result\030\001 \001(\0132\007.Result\022\021\n\tex" +
+ "ception\030\002 \001(\t\022\024\n\014hasException\030\003 \001(\010\"W\n\027G" +
+ "etTransactionalRequest\022\025\n\rtransactionId\030" +
+ "\001 \002(\003\022\022\n\nregionName\030\002 \002(\014\022\021\n\003get\030\003 \002(\0132\004" +
+ ".Get\"\\\n\030GetTransactionalResponse\022\027\n\006resu" +
+ "lt\030\001 \001(\0132\007.Result\022\021\n\texception\030\002 \001(\t\022\024\n\014" +
+ "hasException\030\003 \001(\010\"T\n\022OpenScannerRequest" +
+ "\022\025\n\rtransactionId\030\001 \002(\003\022\022\n\nregionName\030\002 " +
+ "\002(\014\022\023\n\004scan\030\003 \002(\0132\005.Scan\"Q\n\023OpenScannerR",
+ "esponse\022\021\n\tscannerId\030\001 \002(\003\022\021\n\texception\030" +
+ "\002 \001(\t\022\024\n\014hasException\030\003 \001(\010\"\223\001\n\022PerformS" +
+ "canRequest\022\025\n\rtransactionId\030\001 \002(\003\022\022\n\nreg" +
+ "ionName\030\002 \002(\014\022\021\n\tscannerId\030\003 \002(\003\022\024\n\014numb" +
+ "erOfRows\030\004 \002(\005\022\024\n\014closeScanner\030\005 \002(\010\022\023\n\013" +
+ "nextCallSeq\030\006 \002(\003\"\214\001\n\023PerformScanRespons" +
+ "e\022\027\n\006result\030\001 \003(\0132\007.Result\022\r\n\005count\030\002 \002(" +
+ "\003\022\023\n\013nextCallSeq\030\003 \002(\003\022\017\n\007hasMore\030\004 \002(\010\022" +
+ "\021\n\texception\030\005 \001(\t\022\024\n\014hasException\030\006 \001(\010" +
+ "\"a\n\027PutTransactionalRequest\022\025\n\rtransacti",
+ "onId\030\001 \002(\003\022\022\n\nregionName\030\002 \002(\014\022\033\n\003put\030\003 " +
+ "\002(\0132\016.MutationProto\"\\\n\030PutTransactionalR" +
"esponse\022\027\n\006result\030\001 \001(\0132\007.Result\022\021\n\texce" +
- "ption\030\002 \001(\t\022\024\n\014hasException\030\003 \001(\010\"Q\n\026Rec" +
- "overyRequestRequest\022\025\n\rtransactionId\030\001 \002" +
- "(\003\022\022\n\nregionName\030\002 \002(\014\022\014\n\004tmId\030\003 \002(\005\"R\n\027" +
- "RecoveryRequestResponse\022\016\n\006result\030\001 \003(\003\022" +
- "\021\n\texception\030\002 \001(\t\022\024\n\014hasException\030\003 \001(\010" +
- "\"\243\001\n\035TransactionalAggregateRequest\022\022\n\nre",
- "gionName\030\001 \002(\014\022\025\n\rtransactionId\030\002 \002(\003\022\036\n" +
- "\026interpreter_class_name\030\003 \002(\t\022\023\n\004scan\030\004 " +
- "\002(\0132\005.Scan\022\"\n\032interpreter_specific_bytes" +
- "\030\005 \001(\014\"I\n\036TransactionalAggregateResponse" +
- "\022\022\n\nfirst_part\030\003 \003(\014\022\023\n\013second_part\030\004 \001(" +
- "\014\"c\n\022TransactionPersist\022\016\n\006txById\030\001 \003(\003\022" +
- "\024\n\014seqNoListSeq\030\002 \003(\003\022\024\n\014seqNoListTxn\030\003 " +
- "\003(\003\022\021\n\tnextSeqId\030\004 \002(\003\"\372\001\n\023TransactionSt" +
- "ateMsg\022\014\n\004txId\030\001 \002(\003\022\033\n\003put\030\002 \003(\0132\016.Muta" +
- "tionProto\022\036\n\006delete\030\003 \003(\0132\016.MutationProt",
- "o\022\020\n\010putOrDel\030\004 \003(\010\022\023\n\013txnsToCheck\030\005 \003(\003" +
- "\022\023\n\013startSeqNum\030\006 \002(\003\022\016\n\006seqNum\030\007 \002(\003\022\020\n" +
- "\010logSeqId\030\010 \002(\003\022\022\n\nreinstated\030\t \002(\010\022\016\n\006s" +
- "tatus\030\n \002(\005\022\026\n\016commitProgress\030\013 \002(\0052\311\016\n\020" +
- "TrxRegionService\022G\n\020abortTransaction\022\030.A" +
- "bortTransactionRequest\032\031.AbortTransactio" +
- "nResponse\022_\n\030abortTransactionMultiple\022 ." +
- "AbortTransactionMultipleRequest\032!.AbortT" +
- "ransactionMultipleResponse\022G\n\020beginTrans" +
- "action\022\030.BeginTransactionRequest\032\031.Begin",
- "TransactionResponse\022A\n\016checkAndDelete\022\026." +
- "CheckAndDeleteRequest\032\027.CheckAndDeleteRe" +
- "sponse\0228\n\013checkAndPut\022\023.CheckAndPutReque" +
- "st\032\024.CheckAndPutResponse\022;\n\014closeScanner" +
- "\022\024.CloseScannerRequest\032\025.CloseScannerRes" +
- "ponse\022)\n\006commit\022\016.CommitRequest\032\017.Commit" +
- "Response\022G\n\020commitIfPossible\022\030.CommitIfP" +
- "ossibleRequest\032\031.CommitIfPossibleRespons" +
- "e\022V\n\025commitRequestMultiple\022\035.CommitReque" +
- "stMultipleRequest\032\036.CommitRequestMultipl",
- "eResponse\022A\n\016commitMultiple\022\026.CommitMult" +
- "ipleRequest\032\027.CommitMultipleResponse\022>\n\r" +
- "commitRequest\022\025.CommitRequestRequest\032\026.C" +
- "ommitRequestResponse\022C\n\006delete\022\033.DeleteT" +
- "ransactionalRequest\032\034.DeleteTransactiona" +
- "lResponse\022[\n\016deleteMultiple\022#.DeleteMult" +
- "ipleTransactionalRequest\032$.DeleteMultipl" +
- "eTransactionalResponse\022:\n\003get\022\030.GetTrans" +
- "actionalRequest\032\031.GetTransactionalRespon" +
- "se\0228\n\013performScan\022\023.PerformScanRequest\032\024",
- ".PerformScanResponse\0228\n\013openScanner\022\023.Op" +
- "enScannerRequest\032\024.OpenScannerResponse\022:" +
- "\n\003put\022\030.PutTransactionalRequest\032\031.PutTra" +
- "nsactionalResponse\022R\n\013putMultiple\022 .PutM" +
- "ultipleTransactionalRequest\032!.PutMultipl" +
- "eTransactionalResponse\022D\n\017recoveryReques" +
- "t\022\027.RecoveryRequestRequest\032\030.RecoveryReq" +
- "uestResponse\022I\n\006GetMax\022\036.TransactionalAg" +
- "gregateRequest\032\037.TransactionalAggregateR" +
- "esponse\022I\n\006GetMin\022\036.TransactionalAggrega",
- "teRequest\032\037.TransactionalAggregateRespon" +
- "se\022I\n\006GetSum\022\036.TransactionalAggregateReq" +
- "uest\032\037.TransactionalAggregateResponse\022L\n" +
- "\tGetRowNum\022\036.TransactionalAggregateReque" +
- "st\032\037.TransactionalAggregateResponse\022I\n\006G" +
- "etAvg\022\036.TransactionalAggregateRequest\032\037." +
- "TransactionalAggregateResponse\022I\n\006GetStd" +
- "\022\036.TransactionalAggregateRequest\032\037.Trans" +
- "actionalAggregateResponse\022L\n\tGetMedian\022\036" +
- ".TransactionalAggregateRequest\032\037.Transac",
- "tionalAggregateResponseBS\n;org.apache.ha" +
- "doop.hbase.coprocessor.transactional.gen" +
- "eratedB\017TrxRegionProtosH\001\210\001\001"
+ "ption\030\002 \001(\t\022\024\n\014hasException\030\003 \001(\010\"i\n\037Put" +
+ "MultipleTransactionalRequest\022\025\n\rtransact" +
+ "ionId\030\001 \002(\003\022\022\n\nregionName\030\002 \002(\014\022\033\n\003put\030\003" +
+ " \003(\0132\016.MutationProto\"d\n PutMultipleTrans" +
+ "actionalResponse\022\027\n\006result\030\001 \001(\0132\007.Resul" +
+ "t\022\021\n\texception\030\002 \001(\t\022\024\n\014hasException\030\003 \001" +
+ "(\010\"Q\n\026RecoveryRequestRequest\022\025\n\rtransact",
+ "ionId\030\001 \002(\003\022\022\n\nregionName\030\002 \002(\014\022\014\n\004tmId\030" +
+ "\003 \002(\005\"R\n\027RecoveryRequestResponse\022\016\n\006resu" +
+ "lt\030\001 \003(\003\022\021\n\texception\030\002 \001(\t\022\024\n\014hasExcept" +
+ "ion\030\003 \001(\010\"\243\001\n\035TransactionalAggregateRequ" +
+ "est\022\022\n\nregionName\030\001 \002(\014\022\025\n\rtransactionId" +
+ "\030\002 \002(\003\022\036\n\026interpreter_class_name\030\003 \002(\t\022\023" +
+ "\n\004scan\030\004 \002(\0132\005.Scan\022\"\n\032interpreter_speci" +
+ "fic_bytes\030\005 \001(\014\"I\n\036TransactionalAggregat" +
+ "eResponse\022\022\n\nfirst_part\030\003 \003(\014\022\023\n\013second_" +
+ "part\030\004 \001(\014\"c\n\022TransactionPersist\022\016\n\006txBy",
+ "Id\030\001 \003(\003\022\024\n\014seqNoListSeq\030\002 \003(\003\022\024\n\014seqNoL" +
+ "istTxn\030\003 \003(\003\022\021\n\tnextSeqId\030\004 \002(\003\"\372\001\n\023Tran" +
+ "sactionStateMsg\022\014\n\004txId\030\001 \002(\003\022\033\n\003put\030\002 \003" +
+ "(\0132\016.MutationProto\022\036\n\006delete\030\003 \003(\0132\016.Mut" +
+ "ationProto\022\020\n\010putOrDel\030\004 \003(\010\022\023\n\013txnsToCh" +
+ "eck\030\005 \003(\003\022\023\n\013startSeqNum\030\006 \002(\003\022\016\n\006seqNum" +
+ "\030\007 \002(\003\022\020\n\010logSeqId\030\010 \002(\003\022\022\n\nreinstated\030\t" +
+ " \002(\010\022\016\n\006status\030\n \002(\005\022\026\n\016commitProgress\030\013" +
+ " \002(\0052\311\016\n\020TrxRegionService\022G\n\020abortTransa" +
+ "ction\022\030.AbortTransactionRequest\032\031.AbortT",
+ "ransactionResponse\022_\n\030abortTransactionMu" +
+ "ltiple\022 .AbortTransactionMultipleRequest" +
+ "\032!.AbortTransactionMultipleResponse\022G\n\020b" +
+ "eginTransaction\022\030.BeginTransactionReques" +
+ "t\032\031.BeginTransactionResponse\022A\n\016checkAnd" +
+ "Delete\022\026.CheckAndDeleteRequest\032\027.CheckAn" +
+ "dDeleteResponse\0228\n\013checkAndPut\022\023.CheckAn" +
+ "dPutRequest\032\024.CheckAndPutResponse\022;\n\014clo" +
+ "seScanner\022\024.CloseScannerRequest\032\025.CloseS" +
+ "cannerResponse\022)\n\006commit\022\016.CommitRequest",
+ "\032\017.CommitResponse\022G\n\020commitIfPossible\022\030." +
+ "CommitIfPossibleRequest\032\031.CommitIfPossib" +
+ "leResponse\022V\n\025commitRequestMultiple\022\035.Co" +
+ "mmitRequestMultipleRequest\032\036.CommitReque" +
+ "stMultipleResponse\022A\n\016commitMultiple\022\026.C" +
+ "ommitMultipleRequest\032\027.CommitMultipleRes" +
+ "ponse\022>\n\rcommitRequest\022\025.CommitRequestRe" +
+ "quest\032\026.CommitRequestResponse\022C\n\006delete\022" +
+ "\033.DeleteTransactionalRequest\032\034.DeleteTra" +
+ "nsactionalResponse\022[\n\016deleteMultiple\022#.D",
+ "eleteMultipleTransactionalRequest\032$.Dele" +
+ "teMultipleTransactionalResponse\022:\n\003get\022\030" +
+ ".GetTransactionalRequest\032\031.GetTransactio" +
+ "nalResponse\0228\n\013performScan\022\023.PerformScan" +
+ "Request\032\024.PerformScanResponse\0228\n\013openSca" +
+ "nner\022\023.OpenScannerRequest\032\024.OpenScannerR" +
+ "esponse\022:\n\003put\022\030.PutTransactionalRequest" +
+ "\032\031.PutTransactionalResponse\022R\n\013putMultip" +
+ "le\022 .PutMultipleTransactionalRequest\032!.P" +
+ "utMultipleTransactionalResponse\022D\n\017recov",
+ "eryRequest\022\027.RecoveryRequestRequest\032\030.Re" +
+ "coveryRequestResponse\022I\n\006GetMax\022\036.Transa" +
+ "ctionalAggregateRequest\032\037.TransactionalA" +
+ "ggregateResponse\022I\n\006GetMin\022\036.Transaction" +
+ "alAggregateRequest\032\037.TransactionalAggreg" +
+ "ateResponse\022I\n\006GetSum\022\036.TransactionalAgg" +
+ "regateRequest\032\037.TransactionalAggregateRe" +
+ "sponse\022L\n\tGetRowNum\022\036.TransactionalAggre" +
+ "gateRequest\032\037.TransactionalAggregateResp" +
+ "onse\022I\n\006GetAvg\022\036.TransactionalAggregateR",
+ "equest\032\037.TransactionalAggregateResponse\022" +
+ "I\n\006GetStd\022\036.TransactionalAggregateReques" +
+ "t\032\037.TransactionalAggregateResponse\022L\n\tGe" +
+ "tMedian\022\036.TransactionalAggregateRequest\032" +
+ "\037.TransactionalAggregateResponseBS\n;org." +
+ "apache.hadoop.hbase.coprocessor.transact" +
+ "ional.generatedB\017TrxRegionProtosH\001\210\001\001"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -32830,7 +33460,7 @@ public final class TrxRegionProtos {
internal_static_AbortTransactionRequest_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_AbortTransactionRequest_descriptor,
- new java.lang.String[] { "RegionName", "TransactionId", });
+ new java.lang.String[] { "RegionName", "TransactionId", "ParticipantNum", });
internal_static_AbortTransactionResponse_descriptor =
getDescriptor().getMessageTypes().get(1);
internal_static_AbortTransactionResponse_fieldAccessorTable = new
@@ -32842,7 +33472,7 @@ public final class TrxRegionProtos {
internal_static_AbortTransactionMultipleRequest_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_AbortTransactionMultipleRequest_descriptor,
- new java.lang.String[] { "RegionName", "TransactionId", });
+ new java.lang.String[] { "RegionName", "TransactionId", "ParticipantNum", });
internal_static_AbortTransactionMultipleResponse_descriptor =
getDescriptor().getMessageTypes().get(3);
internal_static_AbortTransactionMultipleResponse_fieldAccessorTable = new
@@ -32866,7 +33496,7 @@ public final class TrxRegionProtos {
internal_static_CommitRequest_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_CommitRequest_descriptor,
- new java.lang.String[] { "RegionName", "TransactionId", "IgnoreUnknownTransactionException", });
+ new java.lang.String[] { "RegionName", "TransactionId", "ParticipantNum", "IgnoreUnknownTransactionException", });
internal_static_CommitResponse_descriptor =
getDescriptor().getMessageTypes().get(7);
internal_static_CommitResponse_fieldAccessorTable = new
@@ -32878,7 +33508,7 @@ public final class TrxRegionProtos {
internal_static_CommitMultipleRequest_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_CommitMultipleRequest_descriptor,
- new java.lang.String[] { "RegionName", "TransactionId", "IgnoreUnknownTransactionException", });
+ new java.lang.String[] { "RegionName", "TransactionId", "ParticipantNum", "IgnoreUnknownTransactionException", });
internal_static_CommitMultipleResponse_descriptor =
getDescriptor().getMessageTypes().get(9);
internal_static_CommitMultipleResponse_fieldAccessorTable = new
@@ -32890,7 +33520,7 @@ public final class TrxRegionProtos {
internal_static_CommitRequestRequest_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_CommitRequestRequest_descriptor,
- new java.lang.String[] { "RegionName", "TransactionId", });
+ new java.lang.String[] { "RegionName", "TransactionId", "ParticipantNum", });
internal_static_CommitRequestResponse_descriptor =
getDescriptor().getMessageTypes().get(11);
internal_static_CommitRequestResponse_fieldAccessorTable = new
@@ -32902,7 +33532,7 @@ public final class TrxRegionProtos {
internal_static_CommitRequestMultipleRequest_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_CommitRequestMultipleRequest_descriptor,
- new java.lang.String[] { "RegionName", "TransactionId", });
+ new java.lang.String[] { "RegionName", "TransactionId", "ParticipantNum", });
internal_static_CommitRequestMultipleResponse_descriptor =
getDescriptor().getMessageTypes().get(13);
internal_static_CommitRequestMultipleResponse_fieldAccessorTable = new
@@ -32914,7 +33544,7 @@ public final class TrxRegionProtos {
internal_static_CommitIfPossibleRequest_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_CommitIfPossibleRequest_descriptor,
- new java.lang.String[] { "RegionName", "TransactionId", });
+ new java.lang.String[] { "RegionName", "TransactionId", "ParticipantNum", });
internal_static_CommitIfPossibleResponse_descriptor =
getDescriptor().getMessageTypes().get(15);
internal_static_CommitIfPossibleResponse_fieldAccessorTable = new
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/84af9603/core/sqf/src/seatrans/hbase-trx/src/main/protobuf/TrxRegion.proto
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/protobuf/TrxRegion.proto b/core/sqf/src/seatrans/hbase-trx/src/main/protobuf/TrxRegion.proto
index 1b17a9f..33e39fa 100755
--- a/core/sqf/src/seatrans/hbase-trx/src/main/protobuf/TrxRegion.proto
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/protobuf/TrxRegion.proto
@@ -35,6 +35,7 @@ import "Client.proto";
message AbortTransactionRequest{
required bytes regionName = 1;
required int64 transactionId = 2;
+ required int32 participantNum = 3;
}
message AbortTransactionResponse {
@@ -45,6 +46,7 @@ message AbortTransactionResponse {
message AbortTransactionMultipleRequest{
repeated bytes regionName = 1;
required int64 transactionId = 2;
+ required int32 participantNum = 3;
}
message AbortTransactionMultipleResponse {
@@ -65,7 +67,8 @@ message BeginTransactionResponse {
message CommitRequest{
required bytes regionName = 1;
required int64 transactionId = 2;
- optional bool ignoreUnknownTransactionException = 3;
+ required int32 participantNum = 3;
+ optional bool ignoreUnknownTransactionException = 4;
}
message CommitResponse {
@@ -76,7 +79,8 @@ message CommitResponse {
message CommitMultipleRequest{
repeated bytes regionName = 1;
required int64 transactionId = 2;
- optional bool ignoreUnknownTransactionException = 3;
+ required int32 participantNum = 3;
+ optional bool ignoreUnknownTransactionException = 4;
}
message CommitMultipleResponse {
@@ -87,6 +91,7 @@ message CommitMultipleResponse {
message CommitRequestRequest{
required bytes regionName = 1;
required int64 transactionId = 2;
+ required int32 participantNum = 3;
}
message CommitRequestResponse {
@@ -98,6 +103,7 @@ message CommitRequestResponse {
message CommitRequestMultipleRequest{
repeated bytes regionName = 1;
required int64 transactionId = 2;
+ required int32 participantNum = 3;
}
message CommitRequestMultipleResponse {
@@ -109,6 +115,7 @@ message CommitRequestMultipleResponse {
message CommitIfPossibleRequest{
required bytes regionName = 1;
required int64 transactionId = 2;
+ required int32 participantNum = 3;
}
message CommitIfPossibleResponse {
[3/3] incubator-trafodion git commit: Merge remote branch
'origin/pr/212/head' into mrg_88
Posted by su...@apache.org.
Merge remote branch 'origin/pr/212/head' into mrg_88
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/9ce3c07e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/9ce3c07e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/9ce3c07e
Branch: refs/heads/master
Commit: 9ce3c07e35de53580fb5d6276d1b798c2da04e00
Parents: 0b7112f 84af960
Author: Suresh Subbiah <su...@apache.org>
Authored: Tue Dec 8 16:01:34 2015 +0000
Committer: Suresh Subbiah <su...@apache.org>
Committed: Tue Dec 8 16:01:34 2015 +0000
----------------------------------------------------------------------
core/sqf/src/seatrans/hbase-trx/pom.xml.apache | 4 +
.../transactional/TransactionManager.java | 313 +++---
.../transactional/TrxRegionEndpoint.java | 70 +-
.../generated/SsccRegionProtos.java | 131 +--
.../generated/TrxRegionProtos.java | 1020 ++++++++++++++----
.../hbase-trx/src/main/protobuf/TrxRegion.proto | 11 +-
6 files changed, 1118 insertions(+), 431 deletions(-)
----------------------------------------------------------------------
[2/3] incubator-trafodion git commit: [TRAFODION-1663] Prepare, Commit,
and Abort requests from TransactionManager now carry a participant
number that helps track the specific requenst in the
RegionEndpointCoprocessor causing a problem when an UnknownTra
Posted by su...@apache.org.
[TRAFODION-1663]
Prepare, Commit, and Abort requests from TransactionManager now carry a participant number that helps
track the specific requenst in the RegionEndpointCoprocessor causing a problem when an
UnknownTransactionException is thrown.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/84af9603
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/84af9603
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/84af9603
Branch: refs/heads/master
Commit: 84af9603c6ddb5f935ba8e1a535ba4dc28d1988b
Parents: fbfab1e
Author: Sean Broeder <sb...@edev03.esgyn.local>
Authored: Mon Dec 7 17:03:32 2015 +0000
Committer: Sean Broeder <sb...@edev03.esgyn.local>
Committed: Mon Dec 7 17:03:32 2015 +0000
----------------------------------------------------------------------
core/sqf/src/seatrans/hbase-trx/pom.xml.apache | 4 +
.../transactional/TransactionManager.java | 313 +++---
.../transactional/TrxRegionEndpoint.java | 70 +-
.../generated/SsccRegionProtos.java | 131 +--
.../generated/TrxRegionProtos.java | 1020 ++++++++++++++----
.../hbase-trx/src/main/protobuf/TrxRegion.proto | 11 +-
6 files changed, 1118 insertions(+), 431 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/84af9603/core/sqf/src/seatrans/hbase-trx/pom.xml.apache
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/pom.xml.apache b/core/sqf/src/seatrans/hbase-trx/pom.xml.apache
index c717479..d98e561 100755
--- a/core/sqf/src/seatrans/hbase-trx/pom.xml.apache
+++ b/core/sqf/src/seatrans/hbase-trx/pom.xml.apache
@@ -63,6 +63,8 @@
<!--<hbase.version>0.98.3-hadoop2</hbase.version>-->
<!--<hbase.version>0.98.3-hadoop1</hbase.version>-->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <protobuf.version>2.5.0</protobuf.version>
+ <protocVersion>2.5.0</protocVersion>
<java.version>1.7</java.version>
<trx-suffix>apache</trx-suffix>
</properties>
@@ -338,6 +340,8 @@ if we can combine these profiles somehow -->
<goal>protoc</goal>
</goals>
<configuration>
+ <protobuf.version>2.5.0</protobuf.version>
+ <protocVersion>2.5.0</protocVersion>
<imports>
<param>${basedir}/src/main/protobuf</param>
<param>${basedir}/hbase-protocol/src/main/protobuf</param>
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/84af9603/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionManager.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionManager.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionManager.java
index f8f5eaf..b9832a1 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionManager.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/client/transactional/TransactionManager.java
@@ -223,7 +223,6 @@ public class TransactionManager {
return g_TransactionManager;
}
-
/* increment/deincrement for positive value */
/* This method copied from o.a.h.h.utils.Bytes */
public static byte [] binaryIncrementPos(byte [] value, long amount) {
@@ -257,7 +256,7 @@ public class TransactionManager {
hbadmin = new HBaseAdmin(config);
}
catch(Exception e) {
- System.out.println("ERROR: Unable to obtain HBase accessors, Exiting");
+ System.out.println("ERROR: Unable to obtain HBase accessors, Exiting " + e);
e.printStackTrace();
System.exit(1);
}
@@ -281,7 +280,7 @@ public class TransactionManager {
table = new HTable(location.getRegionInfo().getTable(), connection, cp_tpe);
} catch(IOException e) {
e.printStackTrace();
- LOG.error("Error obtaining HTable instance");
+ LOG.error("Error obtaining HTable instance " + e);
table = null;
}
startKey = location.getRegionInfo().getStartKey();
@@ -299,7 +298,11 @@ public class TransactionManager {
* Return : Always 0, can ignore
* Purpose : Call commit for a given regionserver
*/
- public Integer doCommitX(final byte[] regionName, final long transactionId, final long commitId, final boolean ignoreUnknownTransactionException) throws CommitUnsuccessfulException, IOException {
+ public Integer doCommitX(final byte[] regionName,
+ final long transactionId,
+ final long commitId,
+ final int participantNum,
+ final boolean ignoreUnknownTransaction) throws CommitUnsuccessfulException, IOException {
boolean retry = false;
boolean refresh = false;
@@ -310,8 +313,9 @@ public class TransactionManager {
do {
try {
- if (LOG.isTraceEnabled()) LOG.trace("doCommitX -- ENTRY txid: " + transactionId +
- " ignoreUnknownTransactionException: " + ignoreUnknownTransactionException);
+ if (LOG.isDebugEnabled()) LOG.debug("doCommitX -- ENTRY txid: " + transactionId
+ + " participantNum " + participantNum
+ + " ignoreUnknownTransaction: " + ignoreUnknownTransaction);
Batch.Call<TrxRegionService, CommitResponse> callable =
new Batch.Call<TrxRegionService, CommitResponse>() {
ServerRpcController controller = new ServerRpcController();
@@ -322,8 +326,9 @@ public class TransactionManager {
public CommitResponse call(TrxRegionService instance) throws IOException {
org.apache.hadoop.hbase.coprocessor.transactional.generated.TrxRegionProtos.CommitRequest.Builder builder = CommitRequest.newBuilder();
builder.setTransactionId(transactionId);
+ builder.setParticipantNum(participantNum);
builder.setRegionName(ByteString.copyFromUtf8(Bytes.toString(regionName))); //ByteString.copyFromUtf8(Bytes.toString(regionName)));
- builder.setIgnoreUnknownTransactionException(ignoreUnknownTransactionException);
+ builder.setIgnoreUnknownTransactionException(ignoreUnknownTransaction);
instance.commit(controller, builder.build(), rpcCallback);
return rpcCallback.get();
@@ -333,16 +338,18 @@ public class TransactionManager {
Map<byte[], CommitResponse> result = null;
try {
if (LOG.isTraceEnabled()) LOG.trace("doCommitX -- before coprocessorService txid: " + transactionId +
- " ignoreUnknownTransactionException: " + ignoreUnknownTransactionException + " table: " +
+ " ignoreUnknownTransaction: " + ignoreUnknownTransaction + " table: " +
table.toString() + " startKey: " + new String(startKey, "UTF-8") + " endKey: " + new String(endKey, "UTF-8"));
result = table.coprocessorService(TrxRegionService.class, startKey, endKey, callable);
} catch (Throwable e) {
- String msg = "ERROR occurred while calling doCommitX coprocessor service in doCommitX";
- LOG.error(msg + ":" + e);
+ String msg = new String ("ERROR occurred while calling doCommitX coprocessor service in doCommitX for transaction: "
+ + transactionId + " participantNum " + participantNum + " Exception: " + e);
+ LOG.error(msg);
throw new Exception(msg);
}
if(result.size() == 0) {
- LOG.error("doCommitX, received incorrect result size: " + result.size() + " txid: " + transactionId);
+ LOG.error("doCommitX, received incorrect result size: " + result.size() + " txid: "
+ + transactionId + " location: " + location.getRegionInfo().getRegionNameAsString());
refresh = true;
retry = true;
}
@@ -351,8 +358,9 @@ public class TransactionManager {
for (CommitResponse cresponse : result.values()){
if(cresponse.getHasException()) {
String exceptionString = new String (cresponse.getException().toString());
+ LOG.error("doCommitX - exceptionString: " + exceptionString);
if (exceptionString.contains("UnknownTransactionException")) {
- if (ignoreUnknownTransactionException == true) {
+ if (ignoreUnknownTransaction == true) {
if (LOG.isTraceEnabled()) LOG.trace("doCommitX, ignoring UnknownTransactionException in cresponse");
}
else {
@@ -372,8 +380,9 @@ public class TransactionManager {
for (CommitResponse cresponse : result.values()){
if(cresponse.getHasException()) {
String exceptionString = new String (cresponse.getException().toString());
+ LOG.error("doCommitX - exceptionString: " + exceptionString);
if (exceptionString.contains("UnknownTransactionException")) {
- if (ignoreUnknownTransactionException == true) {
+ if (ignoreUnknownTransaction == true) {
if (LOG.isTraceEnabled()) LOG.trace("doCommitX, ignoring UnknownTransactionException in cresponse");
}
else {
@@ -395,18 +404,20 @@ public class TransactionManager {
}
catch (UnknownTransactionException ute) {
- LOG.error("Got unknown exception in doCommitX for transaction: " + transactionId + " " + ute);
+ LOG.error("Got unknown exception in doCommitX by participant " + participantNum
+ + " for transaction: " + transactionId + " " + ute);
transactionState.requestPendingCountDec(true);
throw new UnknownTransactionException();
}
catch (Exception e) {
if(e.toString().contains("Asked to commit a non-pending transaction")) {
- if (LOG.isDebugEnabled()) LOG.debug("doCommitX will not retry: " + e);
+ LOG.error("doCommitX transaction: "
+ + transactionId + " will not retry: " + e);
refresh = false;
retry = false;
}
else {
- LOG.error("doCommitX retrying due to Exception: " + e);
+ LOG.error("doCommitX retrying transaction: " + transactionId + " due to Exception: " + e);
refresh = true;
retry = true;
}
@@ -415,8 +426,6 @@ public class TransactionManager {
HRegionLocation lv_hrl = table.getRegionLocation(startKey);
HRegionInfo lv_hri = lv_hrl.getRegionInfo();
- //String lv_node = lv_hrl.getHostname();
- //int lv_length = lv_node.indexOf('.');
if (LOG.isTraceEnabled()) LOG.trace("doCommitX -- location being refreshed : " + location.getRegionInfo().getRegionNameAsString() + " endKey: "
+ Hex.encodeHexString(location.getRegionInfo().getEndKey()) + " for transaction: " + transactionId);
@@ -429,14 +438,11 @@ public class TransactionManager {
throw new CommitUnsuccessfulException("Exceeded retry attempts (" + retryCount + ") in doCommitX for transaction: " + transactionId);
}
-// if ((location.getRegionInfo().getEncodedName().compareTo(lv_hri.getEncodedName()) != 0) || // Encoded name is different
-// (location.getHostname().regionMatches(0, lv_node, 0, lv_length) == false)) { // Node is different
- if (LOG.isWarnEnabled()) LOG.warn("doCommitX -- " + table.toString() + " location being refreshed");
- if (LOG.isWarnEnabled()) LOG.warn("doCommitX -- lv_hri: " + lv_hri);
- if (LOG.isWarnEnabled()) LOG.warn("doCommitX -- location.getRegionInfo(): " + location.getRegionInfo());
- table.getRegionLocation(startKey, true);
-// }
- if (LOG.isTraceEnabled()) LOG.trace("doCommitX -- setting retry, count: " + retryCount);
+ if (LOG.isWarnEnabled()) LOG.warn("doCommitX -- " + table.toString() + " location being refreshed");
+ if (LOG.isWarnEnabled()) LOG.warn("doCommitX -- lv_hri: " + lv_hri);
+ if (LOG.isWarnEnabled()) LOG.warn("doCommitX -- location.getRegionInfo(): " + location.getRegionInfo());
+ table.getRegionLocation(startKey, true);
+ if (LOG.isWarnEnabled()) LOG.warn("doCommitX -- setting retry, count: " + retryCount);
refresh = false;
}
@@ -460,7 +466,7 @@ public class TransactionManager {
try {
if (LOG.isTraceEnabled()) LOG.trace("doCommitX -- ENTRY txid: " + transactionId +
- " ignoreUnknownTransactionException: " + ignoreUnknownTransactionException);
+ " ignoreUnknownTransaction: " + ignoreUnknownTransaction);
Batch.Call<SsccRegionService, SsccCommitResponse> callable =
new Batch.Call<SsccRegionService, SsccCommitResponse>() {
ServerRpcController controller = new ServerRpcController();
@@ -473,7 +479,7 @@ public class TransactionManager {
builder.setTransactionId(transactionId);
builder.setRegionName(ByteString.copyFromUtf8(Bytes.toString(regionName))); //ByteString.copyFromUtf8(Bytes.toString(regionName)));
builder.setCommitId(commitId);
- builder.setIgnoreUnknownTransactionException(ignoreUnknownTransactionException);
+ builder.setIgnoreUnknownTransactionException(ignoreUnknownTransaction);
instance.commit(controller, builder.build(), rpcCallback);
return rpcCallback.get();
@@ -483,7 +489,7 @@ public class TransactionManager {
Map<byte[], SsccCommitResponse> result = null;
try {
if (LOG.isTraceEnabled()) LOG.trace("doCommitX -- before coprocessorService txid: " + transactionId +
- " ignoreUnknownTransactionException: " + ignoreUnknownTransactionException + " table: " +
+ " ignoreUnknownTransaction: " + ignoreUnknownTransaction + " table: " +
table.toString() + " startKey: " + new String(startKey, "UTF-8") + " endKey: " + new String(endKey, "UTF-8"));
result = table.coprocessorService(SsccRegionService.class, startKey, endKey, callable);
} catch (Throwable e) {
@@ -502,7 +508,7 @@ public class TransactionManager {
if(cresponse.getHasException()) {
String exceptionString = new String (cresponse.getException().toString());
if (exceptionString.contains("UnknownTransactionException")) {
- if (ignoreUnknownTransactionException == true) {
+ if (ignoreUnknownTransaction == true) {
if (LOG.isTraceEnabled()) LOG.trace("doCommitX, ignoring UnknownTransactionException in cresponse");
}
else {
@@ -520,12 +526,14 @@ public class TransactionManager {
}
}
catch (UnknownTransactionException ute) {
- LOG.error("Got unknown exception in doCommitX for transaction: " + transactionId + " " + ute);
+ LOG.error("Got unknown exception in doCommitX by participant " + participantNum
+ + " for transaction: " + transactionId + " " + ute);
transactionState.requestPendingCountDec(true);
throw new UnknownTransactionException();
}
catch (Exception e) {
- LOG.error("doCommitX retrying due to Exception: " + e);
+ LOG.error("doCommitX participant " + participantNum + " retrying transaction "
+ + transactionId + " due to Exception: " + e);
refresh = true;
retry = true;
}
@@ -590,7 +598,7 @@ public class TransactionManager {
* Return : Commit vote (yes, no, read only)
* Purpose : Call prepare for a given regionserver
*/
- public Integer doPrepareX(final byte[] regionName, final long transactionId, final TransactionRegionLocation location)
+ public Integer doPrepareX(final byte[] regionName, final long transactionId, final int participantNum, final TransactionRegionLocation location)
throws IOException, CommitUnsuccessfulException {
if (LOG.isTraceEnabled()) LOG.trace("doPrepareX -- ENTRY txid: " + transactionId );
int commitStatus = 0;
@@ -613,6 +621,7 @@ public class TransactionManager {
org.apache.hadoop.hbase.coprocessor.transactional.generated.TrxRegionProtos.CommitRequestRequest.Builder builder = CommitRequestRequest.newBuilder();
builder.setTransactionId(transactionId);
builder.setRegionName(ByteString.copyFromUtf8(Bytes.toString(regionName)));
+ builder.setParticipantNum(participantNum);
instance.commitRequest(controller, builder.build(), rpcCallback);
return rpcCallback.get();
@@ -708,11 +717,13 @@ public class TransactionManager {
}
}
catch(UnknownTransactionException ute) {
- LOG.warn("doPrepareX Exception: " + ute);
+ LOG.warn("doPrepareX participant " + participantNum + " transaction "
+ + transactionId + " unknown transaction : " + ute);
throw new UnknownTransactionException();
}
catch(Exception e) {
- LOG.error("doPrepareX retrying due to Exception: " + e);
+ LOG.error("doPrepareX participant " + participantNum + " retrying transaction "
+ + transactionId + " due to Exception: " + e);
refresh = true;
retry = true;
}
@@ -807,11 +818,13 @@ public class TransactionManager {
}
}
catch(UnknownTransactionException ute) {
- LOG.warn("doPrepareX Exception: " + ute);
+ LOG.warn("doPrepareX participant " + participantNum + " transaction "
+ + transactionId + " unknown transaction: " + ute);
throw new UnknownTransactionException();
}
catch(Exception e) {
- LOG.error("doPrepareX retrying due to Exception: " + e);
+ LOG.error("doPrepareX participant " + participantNum + " retrying transaction "
+ + transactionId + " due to Exception: " + e);
refresh = true;
retry = true;
}
@@ -907,10 +920,11 @@ public class TransactionManager {
* Return : Ignored
* Purpose : Call abort for a given regionserver
*/
- public Integer doAbortX(final byte[] regionName, final long transactionId) throws IOException{
- if(LOG.isTraceEnabled()) LOG.trace("doAbortX -- ENTRY txID: " + transactionId);
+ public Integer doAbortX(final byte[] regionName, final long transactionId, final int participantNum) throws IOException{
+ if(LOG.isDebugEnabled()) LOG.debug("doAbortX -- ENTRY txID: " + transactionId + " participantNum "
+ + participantNum + " region " + regionName.toString());
boolean retry = false;
- boolean refresh = false;
+ boolean refresh = false;
int retryCount = 0;
int retrySleep = TM_SLEEP;
@@ -928,8 +942,8 @@ public class TransactionManager {
public AbortTransactionResponse call(TrxRegionService instance) throws IOException {
org.apache.hadoop.hbase.coprocessor.transactional.generated.TrxRegionProtos.AbortTransactionRequest.Builder builder = AbortTransactionRequest.newBuilder();
builder.setTransactionId(transactionId);
+ builder.setParticipantNum(participantNum);
builder.setRegionName(ByteString.copyFromUtf8(Bytes.toString(regionName)));
-
instance.abortTransaction(controller, builder.build(), rpcCallback);
return rpcCallback.get();
}
@@ -937,9 +951,10 @@ public class TransactionManager {
Map<byte[], AbortTransactionResponse> result = null;
try {
- if (LOG.isTraceEnabled()) LOG.trace("doAbortX -- before coprocessorService txid: " + transactionId + " table: " +
- table.toString() + " startKey: " + new String(startKey, "UTF-8") + " endKey: " + new String(endKey, "UTF-8"));
- result = table.coprocessorService(TrxRegionService.class, startKey, endKey, callable);
+ if (LOG.isTraceEnabled()) LOG.trace("doAbortX -- before coprocessorService txid: "
+ + transactionId + " table: " + table.toString() + " startKey: "
+ + new String(startKey, "UTF-8") + " endKey: " + new String(endKey, "UTF-8"));
+ result = table.coprocessorService(TrxRegionService.class, startKey, endKey, callable);
} catch (Throwable e) {
String msg = "ERROR occurred while calling doAbortX coprocessor service";
LOG.error(msg + ":" + e);
@@ -947,15 +962,18 @@ public class TransactionManager {
}
if(result.size() == 0) {
- LOG.error("doAbortX, received 0 region results.");
- refresh = true;
- retry = true;
+ LOG.error("doAbortX, received 0 region results for transaction: " + transactionId
+ + " participantNum: " + participantNum + " region: " + Bytes.toString(regionName));
+ refresh = true;
+ retry = true;
}
else {
for (AbortTransactionResponse cresponse : result.values()) {
if(cresponse.getHasException()) {
String exceptionString = cresponse.getException().toString();
- LOG.error("Abort HasException true: " + exceptionString);
+ LOG.error("Abort of transaction: " + transactionId
+ + " participantNum: " + participantNum + " region: " + Bytes.toString(regionName)
+ + " threw Exception: " + exceptionString);
if(exceptionString.contains("UnknownTransactionException")) {
throw new UnknownTransactionException();
}
@@ -966,16 +984,18 @@ public class TransactionManager {
}
}
catch (UnknownTransactionException ute) {
- LOG.debug("UnknownTransactionException in doAbortX for transaction: " + transactionId + "(ignoring): " + ute);
- }
+ LOG.error("UnknownTransactionException in doAbortX for transaction: " + transactionId
+ + " participantNum: " + participantNum + " region: "
+ + Bytes.toString(regionName) + "(ignoring): " + ute ); }
catch (Exception e) {
- if(e.toString().contains("Asked to commit a non-pending transaction")) {
- LOG.error("doCommitX will not retry: " + e);
+ if(e.toString().contains("Asked to commit a non-pending transaction ")) {
+ LOG.error(" doCommitX will not retry transaction: " + transactionId + " : " + e);
refresh = false;
retry = false;
}
else {
- LOG.error("doAbortX retrying due to Exception: " + e );
+ LOG.error("doAbortX retrying transaction: " + transactionId + " participantNum: "
+ + participantNum + " region: " + Bytes.toString(regionName) + " due to Exception: " + e );
refresh = true;
retry = true;
}
@@ -1058,7 +1078,7 @@ public class TransactionManager {
for (SsccAbortTransactionResponse cresponse : result.values()) {
if(cresponse.getHasException()) {
String exceptionString = cresponse.getException().toString();
- LOG.error("Abort HasException true: " + exceptionString);
+ LOG.error("Abort of transaction: " + transactionId + " threw Exception: " + exceptionString);
if(exceptionString.contains("UnknownTransactionException")) {
throw new UnknownTransactionException();
}
@@ -1069,10 +1089,12 @@ public class TransactionManager {
}
}
catch (UnknownTransactionException ute) {
- LOG.debug("UnknownTransactionException in doAbortX for transaction: " + transactionId + "(ignoring): " + ute);
+ LOG.debug("UnknownTransactionException in doAbortX by participant " + participantNum +
+ " for transaction: " + transactionId + "(ignoring): " + ute);
}
catch (Exception e) {
- LOG.error("doAbortX retrying due to Exception: " + e );
+ LOG.error("doAbortX participant " + participantNum + " retrying transaction "
+ + transactionId + " due to Exception: " + e);
refresh = true;
retry = true;
}
@@ -1124,7 +1146,8 @@ public class TransactionManager {
return 0;
}
- public Integer doCommitX(final List<TransactionRegionLocation> locations, final long transactionId, final long commitId, final boolean ignoreUnknownTransactionException) throws CommitUnsuccessfulException, IOException {
+ public Integer doCommitX(final List<TransactionRegionLocation> locations, final long transactionId,
+ final long commitId, final int participantNum, final boolean ignoreUnknownTransaction) throws CommitUnsuccessfulException, IOException {
boolean retry = false;
boolean refresh = false;
@@ -1132,15 +1155,16 @@ public class TransactionManager {
do {
try {
- if (LOG.isTraceEnabled()) LOG.trace("doCommitX - Batch -- ENTRY txid: " + transactionId +
- " ignoreUnknownTransactionException: " + ignoreUnknownTransactionException);
+ if (LOG.isTraceEnabled()) LOG.trace("doCommitX - Batch -- ENTRY txid: " + transactionId
+ + " participant " + participantNum + " ignoreUnknownTransaction: " + ignoreUnknownTransaction);
TrxRegionProtos.CommitMultipleRequest.Builder builder = CommitMultipleRequest.newBuilder();
builder.setTransactionId(transactionId);
+ builder.setParticipantNum(participantNum);
for(TransactionRegionLocation location : locations) {
builder.addRegionName(ByteString.copyFrom(location.getRegionInfo().getRegionName()));
}
- builder.setIgnoreUnknownTransactionException(ignoreUnknownTransactionException);
+ builder.setIgnoreUnknownTransactionException(ignoreUnknownTransaction);
CommitMultipleRequest commitMultipleRequest = builder.build();
CommitMultipleResponse commitMultipleResponse = null;
@@ -1170,7 +1194,7 @@ public class TransactionManager {
throw new UnknownTransactionException(errMsg);
}
catch (Exception e) {
- LOG.error("doCommitX retrying due to Exception: " + e);
+ LOG.error("doCommitX retrying transaction " + transactionId + " due to Exception: " + e);
refresh = true;
retry = true;
}
@@ -1206,9 +1230,10 @@ public class TransactionManager {
return 0;
}
- public Integer doPrepareX(final List<TransactionRegionLocation> locations, final long transactionId)
+ public Integer doPrepareX(final List<TransactionRegionLocation> locations, final long transactionId, final int participantNum)
throws IOException, CommitUnsuccessfulException {
- if (LOG.isTraceEnabled()) LOG.trace("doPrepareX - Batch -- ENTRY txid: " + transactionId );
+ if (LOG.isTraceEnabled()) LOG.trace("doPrepareX - Batch -- ENTRY txid: " + transactionId
+ + " participant " + participantNum );
boolean refresh = false;
boolean retry = false;
@@ -1219,6 +1244,7 @@ public class TransactionManager {
TrxRegionProtos.CommitRequestMultipleRequest.Builder builder = CommitRequestMultipleRequest.newBuilder();
builder.setTransactionId(transactionId);
+ builder.setParticipantNum(participantNum);
for(TransactionRegionLocation location : locations) {
builder.addRegionName(ByteString.copyFrom(location.getRegionInfo().getRegionName()));
}
@@ -1245,12 +1271,14 @@ public class TransactionManager {
}
}
catch(UnknownTransactionException ute) {
- String warnMsg = "doPrepareX Exception: " + ute;
+ String warnMsg = new String("UnknownTransaction in doPrepareX - Batch - by participant "
+ + participantNum + " for transaction " + transactionId + " " + ute);
LOG.warn(warnMsg);
throw new UnknownTransactionException(warnMsg);
}
catch(Exception e) {
- LOG.error("doPrepareX retrying due to Exception: " + e);
+ LOG.error("doPrepareX - Batch - retrying for participant "
+ + participantNum + " transaction " + transactionId + " due to Exception: " + e);
refresh = true;
retry = true;
}
@@ -1258,7 +1286,7 @@ public class TransactionManager {
HRegionLocation lv_hrl = table.getRegionLocation(startKey);
HRegionInfo lv_hri = lv_hrl.getRegionInfo();
- if (LOG.isTraceEnabled()) LOG.trace("doPrepareX -- location being refreshed : " + location.getRegionInfo().getRegionNameAsString() + "endKey: "
+ if (LOG.isTraceEnabled()) LOG.trace("doPrepareX -Batch- location being refreshed : " + location.getRegionInfo().getRegionNameAsString() + "endKey: "
+ Hex.encodeHexString(location.getRegionInfo().getEndKey()) + " for transaction: " + transactionId);
if(retryCount == RETRY_ATTEMPTS){
LOG.error("Exceeded retry attempts in doPrepareX: " + retryCount);
@@ -1269,14 +1297,14 @@ public class TransactionManager {
throw new CommitUnsuccessfulException("Exceeded retry attempts in doPrepareX: " + retryCount);
}
if (LOG.isWarnEnabled()) {
- LOG.warn("doPrepareX -- " + table.toString() + " location being refreshed");
- LOG.warn("doPrepareX -- lv_hri: " + lv_hri);
- LOG.warn("doPrepareX -- location.getRegionInfo(): " + location.getRegionInfo());
+ LOG.warn("doPrepareX -Batch- " + table.toString() + " location being refreshed");
+ LOG.warn("doPrepareX -Batch- lv_hri: " + lv_hri);
+ LOG.warn("doPrepareX -Batch- location.getRegionInfo(): " + location.getRegionInfo());
}
table.getRegionLocation(startKey, true);
- if (LOG.isDebugEnabled()) LOG.debug("doPrepareX retry count: " + retryCount);
- if (LOG.isTraceEnabled()) LOG.trace("doPrepareX -- setting retry, count: " + retryCount);
+ if (LOG.isDebugEnabled()) LOG.debug("doPrepareX -Batch- retry count: " + retryCount);
+ if (LOG.isTraceEnabled()) LOG.trace("doPrepareX --Batch-- setting retry, count: " + retryCount);
refresh = false;
retryCount++;
}
@@ -1342,7 +1370,7 @@ public class TransactionManager {
return TM_COMMIT_TRUE;
}
- public Integer doAbortX(final List<TransactionRegionLocation> locations, final long transactionId) throws IOException{
+ public Integer doAbortX(final List<TransactionRegionLocation> locations, final long transactionId, final int participantNum) throws IOException{
if(LOG.isTraceEnabled()) LOG.trace("doAbortX - Batch -- ENTRY txID: " + transactionId);
boolean retry = false;
boolean refresh = false;
@@ -1351,6 +1379,7 @@ public class TransactionManager {
try {
TrxRegionProtos.AbortTransactionMultipleRequest.Builder builder = AbortTransactionMultipleRequest.newBuilder();
builder.setTransactionId(transactionId);
+ builder.setParticipantNum(participantNum);
for(TransactionRegionLocation location : locations) {
builder.addRegionName(ByteString.copyFrom(location.getRegionInfo().getRegionName()));
}
@@ -1362,7 +1391,7 @@ public class TransactionManager {
abortTransactionMultipleResponse = trxService.abortTransactionMultiple(null, abortTransactionMultipleRequest);
retry = false;
} catch (Throwable e) {
- LOG.error("doAbortX coprocessor error for " + Bytes.toString(locations.iterator().next().getRegionInfo().getRegionName()) + " txid: " + transactionId + ":" + e);
+ LOG.error("doAbortX - Batch - coprocessor error for " + Bytes.toString(locations.iterator().next().getRegionInfo().getRegionName()) + " txid: " + transactionId + ":" + e);
refresh = true;
retry = true;
}
@@ -1375,10 +1404,12 @@ public class TransactionManager {
}
}
catch (UnknownTransactionException ute) {
- LOG.debug("UnknownTransactionException in doAbortX for transaction: " + transactionId + "(ignoring): " + ute);
+ LOG.debug("UnknownTransactionException in doAbortX - Batch - by participant " + participantNum
+ + " for transaction: " + transactionId + "(ignoring): " + ute);
}
catch (Exception e) {
- LOG.error("doAbortX retrying due to Exception: " + e );
+ LOG.error("doAbortX - Batch - participant " + participantNum + " retrying transaction "
+ + transactionId + " due to Exception: " + e);
refresh = true;
retry = true;
}
@@ -1386,20 +1417,22 @@ public class TransactionManager {
HRegionLocation lv_hrl = table.getRegionLocation(startKey);
HRegionInfo lv_hri = lv_hrl.getRegionInfo();
- if (LOG.isTraceEnabled()) LOG.trace("doAbortX -- location being refreshed : " + location.getRegionInfo().getRegionNameAsString() + "endKey: "
- + Hex.encodeHexString(location.getRegionInfo().getEndKey()) + " for transaction: " + transactionId);
+ if (LOG.isTraceEnabled()) LOG.trace("doAbortX - Batch - participant " + participantNum
+ + "-- location being refreshed : " + location.getRegionInfo().getRegionNameAsString()
+ + " endKey: " + Hex.encodeHexString(location.getRegionInfo().getEndKey())
+ + " for transaction: " + transactionId);
if(retryCount == RETRY_ATTEMPTS){
LOG.error("Exceeded retry attempts in doAbortX: " + retryCount + " (ingoring)");
}
if (LOG.isWarnEnabled()) {
- LOG.warn("doAbortX -- " + table.toString() + " location being refreshed");
- LOG.warn("doAbortX -- lv_hri: " + lv_hri);
- LOG.warn("doAbortX -- location.getRegionInfo(): " + location.getRegionInfo());
+ LOG.warn("doAbortX - Batch - -- " + table.toString() + " location being refreshed");
+ LOG.warn("doAbortX - Batch - -- lv_hri: " + lv_hri);
+ LOG.warn("doAbortX - Batch - -- location.getRegionInfo(): " + location.getRegionInfo());
}
table.getRegionLocation(startKey, true);
- if (LOG.isTraceEnabled()) LOG.trace("doAbortX -- setting retry, count: " + retryCount);
+ if (LOG.isTraceEnabled()) LOG.trace("doAbortX - Batch - -- setting retry, count: " + retryCount);
refresh = false;
retryCount++;
}
@@ -1601,9 +1634,10 @@ public class TransactionManager {
for(final Map.Entry<ServerName, List<TransactionRegionLocation>> entry : locations.entrySet()) {
loopCount++;
+ final int lv_participant = loopCount;
compPool.submit(new TransactionManagerCallable(transactionState, entry.getValue().iterator().next(), connection) {
public Integer call() throws CommitUnsuccessfulException, IOException {
- return doPrepareX(entry.getValue(), transactionState.getTransactionId());
+ return doPrepareX(entry.getValue(), transactionState.getTransactionId(), lv_participant);
}
});
}
@@ -1639,11 +1673,12 @@ public class TransactionManager {
if(transactionState.getRegionsRetryCount() > 0) {
for (TransactionRegionLocation location : transactionState.getRetryRegions()) {
loopCount++;
+ final int lvParticipantNum = loopCount;
compPool.submit(new TransactionManagerCallable(transactionState, location, connection) {
public Integer call() throws CommitUnsuccessfulException, IOException {
return doPrepareX(location.getRegionInfo().getRegionName(),
- transactionState.getTransactionId(),
+ transactionState.getTransactionId(), lvParticipantNum,
location);
}
});
@@ -1716,10 +1751,11 @@ public class TransactionManager {
loopCount++;
final TransactionRegionLocation myLocation = location;
final byte[] regionName = location.getRegionInfo().getRegionName();
+ final int lvParticipantNum = loopCount;
compPool.submit(new TransactionManagerCallable(transactionState, location, connection) {
public Integer call() throws IOException, CommitUnsuccessfulException {
- return doPrepareX(regionName, transactionState.getTransactionId(), myLocation);
+ return doPrepareX(regionName, transactionState.getTransactionId(), lvParticipantNum, myLocation);
}
});
}
@@ -1749,7 +1785,8 @@ public class TransactionManager {
}
} catch (Exception e) {
- LOG.error("exception in prepareCommit (during submit to pool): " + e);
+ LOG.error("exception in prepareCommit for transaction: "
+ + transactionState.getTransactionId() + " (during submit to pool): " + e);
throw new CommitUnsuccessfulException(e);
}
@@ -1778,8 +1815,9 @@ public class TransactionManager {
}
}
}catch (Exception e) {
- LOG.error("exception in prepareCommit (during completion processing): " + e);
- throw new CommitUnsuccessfulException(e);
+ LOG.error("exception in prepareCommit for transaction: "
+ + transactionState.getTransactionId() + " (during completion processing): " + e);
+ throw new CommitUnsuccessfulException(e);
}
if(commitError != 0)
return commitError;
@@ -1871,19 +1909,26 @@ public class TransactionManager {
+ ((EnvironmentEdgeManager.currentTimeMillis() - startTime)) + "]ms");
}
- public void retryCommit(final TransactionState transactionState, final boolean ignoreUnknownTransactionException) {
+ public void retryCommit(final TransactionState transactionState, final boolean ignoreUnknownTransaction) {
if(LOG.isTraceEnabled()) LOG.trace("retryCommit -- ENTRY -- txid: " + transactionState.getTransactionId());
synchronized(transactionState.getRetryRegions()) {
List<TransactionRegionLocation> completedList = new ArrayList<TransactionRegionLocation>();
final long commitIdVal = (TRANSACTION_ALGORITHM == AlgorithmType.SSCC) ? transactionState.getCommitId() : -1;
+ int loopCount = 0;
for (TransactionRegionLocation location : transactionState.getRetryRegions()) {
- if(LOG.isTraceEnabled()) LOG.trace("retryAbort retrying abort for: " + location.getRegionInfo().getRegionNameAsString());
+ loopCount++;
+ final int participantNum = loopCount;
+ if(LOG.isTraceEnabled()) LOG.trace("retryCommit retrying commit for transaction: "
+ + transactionState.getTransactionId() + ", participant: " + participantNum + ", region "
+ + location.getRegionInfo().getRegionNameAsString());
threadPool.submit(new TransactionManagerCallable(transactionState, location, connection) {
public Integer call() throws CommitUnsuccessfulException, IOException {
return doCommitX(location.getRegionInfo().getRegionName(),
- transactionState.getTransactionId(), commitIdVal,
- ignoreUnknownTransactionException);
+ transactionState.getTransactionId(),
+ commitIdVal,
+ participantNum,
+ ignoreUnknownTransaction);
}
});
completedList.add(location);
@@ -1897,13 +1942,18 @@ public class TransactionManager {
if(LOG.isTraceEnabled()) LOG.trace("retryAbort -- ENTRY -- txid: " + transactionState.getTransactionId());
synchronized(transactionState.getRetryRegions()) {
List<TransactionRegionLocation> completedList = new ArrayList<TransactionRegionLocation>();
+ int loopCount = 0;
for (TransactionRegionLocation location : transactionState.getRetryRegions()) {
- if(LOG.isTraceEnabled()) LOG.trace("retryAbort retrying abort for: " + location.getRegionInfo().getRegionNameAsString());
+ loopCount++;
+ final int participantNum = loopCount;
+ if(LOG.isTraceEnabled()) LOG.trace("retryAbort retrying abort for transaction: "
+ + transactionState.getTransactionId() + ", participant: "
+ + participantNum + ", region: " + location.getRegionInfo().getRegionNameAsString());
threadPool.submit(new TransactionManagerCallable(transactionState, location, connection) {
public Integer call() throws CommitUnsuccessfulException, IOException {
return doAbortX(location.getRegionInfo().getRegionName(),
- transactionState.getTransactionId());
+ transactionState.getTransactionId(), participantNum);
}
});
completedList.add(location);
@@ -1921,7 +1971,7 @@ public class TransactionManager {
public void doCommit(final TransactionState transactionState)
throws CommitUnsuccessfulException, UnsuccessfulDDLException {
if (LOG.isTraceEnabled()) LOG.trace("doCommit [" + transactionState.getTransactionId() +
- "] ignoreUnknownTransactionException not supplied");
+ "] ignoreUnknownTransaction not supplied");
doCommit(transactionState, false);
}
@@ -1929,16 +1979,16 @@ public class TransactionManager {
* Do the commit. This is the 2nd phase of the 2-phase protocol.
*
* @param transactionState
- * @param ignoreUnknownTransactionException
+ * @param ignoreUnknownTransaction
* @throws CommitUnsuccessfulException
*/
- public void doCommit(final TransactionState transactionState, final boolean ignoreUnknownTransactionException)
+ public void doCommit(final TransactionState transactionState, final boolean ignoreUnknownTransaction)
throws CommitUnsuccessfulException, UnsuccessfulDDLException {
int loopCount = 0;
if (batchRegionServer && (TRANSACTION_ALGORITHM == AlgorithmType.MVCC)) {
try {
- if (LOG.isTraceEnabled()) LOG.trace("Committing [" + transactionState.getTransactionId() +
- "] ignoreUnknownTransactionException: " + ignoreUnknownTransactionException);
+ if (LOG.isTraceEnabled()) LOG.trace("Committing [" + transactionState.getTransactionId() +
+ "] ignoreUnknownTransaction: " + ignoreUnknownTransaction);
// Set the commitId
transactionState.setCommitId(-1); // Dummy for MVCC
@@ -1957,24 +2007,24 @@ public class TransactionManager {
}
else {
regionList = locations.get(servername);
- }
+ }
regionList.add(location);
- }
+ }
for(final Map.Entry<ServerName, List<TransactionRegionLocation>> entry : locations.entrySet()) {
if (LOG.isTraceEnabled()) LOG.trace("sending commits ... [" + transactionState.getTransactionId() + "]");
loopCount++;
+ final int lv_participant = loopCount;
threadPool.submit(new TransactionManagerCallable(transactionState, entry.getValue().iterator().next(), connection) {
public Integer call() throws CommitUnsuccessfulException, IOException {
if (LOG.isTraceEnabled()) LOG.trace("before doCommit() [" + transactionState.getTransactionId() + "]" +
- " ignoreUnknownTransactionException: " + ignoreUnknownTransactionException);
+ " ignoreUnknownTransaction: " + ignoreUnknownTransaction);
return doCommitX(entry.getValue(), transactionState.getTransactionId(),
- transactionState.getCommitId(), ignoreUnknownTransactionException);
+ transactionState.getCommitId(), lv_participant, ignoreUnknownTransaction);
}
});
}
-
} catch (Exception e) {
LOG.error("exception in doCommit for transaction: " + transactionState.getTransactionId() + " " + e);
// This happens on a NSRE that is triggered by a split
@@ -2000,7 +2050,7 @@ public class TransactionManager {
// non batch-rs
if (LOG.isTraceEnabled()) LOG.trace("Committing [" + transactionState.getTransactionId() +
- "] ignoreUnknownTransactionException: " + ignoreUnknownTransactionException);
+ "] ignoreUnknownTransactionn: " + ignoreUnknownTransaction);
if (LOG.isTraceEnabled()) LOG.trace("sending commits for ts: " + transactionState);
try {
@@ -2015,28 +2065,26 @@ public class TransactionManager {
loopCount++;
final byte[] regionName = location.getRegionInfo().getRegionName();
-
+ final int participantNum = loopCount;
//TransactionalRegionInterface transactionalRegionServer = (TransactionalRegionInterface) connection
// .getHRegionConnection(location.getServerName());
threadPool.submit(new TransactionManagerCallable(transactionState, location, connection) {
public Integer call() throws CommitUnsuccessfulException, IOException {
- if (LOG.isTraceEnabled()) LOG.trace("before doCommit() [" + transactionState.getTransactionId() + "]" +
- " ignoreUnknownTransactionException: " + ignoreUnknownTransactionException);
- return doCommitX(regionName, transactionState.getTransactionId(), transactionState.getCommitId(), ignoreUnknownTransactionException);
+ if (LOG.isDebugEnabled()) LOG.debug("before doCommit() [" + transactionState.getTransactionId()
+ + "] participantNum " + participantNum + " ignoreUnknownTransaction: " + ignoreUnknownTransaction);
+ return doCommitX(regionName,
+ transactionState.getTransactionId(),
+ transactionState.getCommitId(),
+ participantNum,
+ ignoreUnknownTransaction);
}
});
}
} catch (Exception e) {
- LOG.error("exception in doCommit for transaction: " + transactionState.getTransactionId() + " " + e);
+ LOG.error("exception in doCommit for transaction: "
+ + transactionState.getTransactionId() + " " + e);
// This happens on a NSRE that is triggered by a split
-/* try {
- abort(transactionState);
- } catch (Exception abortException) {
-
- LOG.warn("Exeption during abort", abortException);
- }
-*/
throw new CommitUnsuccessfulException(e);
}
@@ -2212,12 +2260,6 @@ public class TransactionManager {
public void abort(final TransactionState transactionState) throws IOException, UnsuccessfulDDLException {
if(LOG.isTraceEnabled()) LOG.trace("Abort -- ENTRY txID: " + transactionState.getTransactionId());
int loopCount = 0;
- /*
- if(transactionState.getStatus().equals("ABORTED")) {
- if(LOG.isTraceEnabled()) LOG.trace("Abort --EXIT already called, ignoring");
- return;
- }
- */
transactionState.setStatus(TransState.STATE_ABORTED);
// (Asynchronously send aborts
@@ -2243,44 +2285,35 @@ public class TransactionManager {
}
for(final Map.Entry<ServerName, List<TransactionRegionLocation>> entry : locations.entrySet()) {
loopCount++;
+ final int participantNum = loopCount;
+
threadPool.submit(new TransactionManagerCallable(transactionState, entry.getValue().iterator().next(), connection) {
public Integer call() throws IOException {
if (LOG.isTraceEnabled()) LOG.trace("before abort() [" + transactionState.getTransactionId() + "]");
- return doAbortX(entry.getValue(), transactionState.getTransactionId());
+ return doAbortX(entry.getValue(), transactionState.getTransactionId(), participantNum);
}
});
}
transactionState.completeSendInvoke(loopCount);
- /*
- if(transactionState.getRegionsRetryCount() > 0) {
- for (TransactionRegionLocation location : transactionState.getRetryRegions()) {
- loopCount++;
- threadPool.submit(new TransactionManagerCallable(transactionState, location, connection) {
- public Integer call() throws CommitUnsuccessfulException, IOException {
-
- return doAbortX(location.getRegionInfo().getRegionName(),
- transactionState.getTransactionId());
- }
- });
- }
- }
- transactionState.clearRetryRegions();
- */
}
else {
-
+ loopCount = 0;
for (TransactionRegionLocation location : transactionState.getParticipatingRegions()) {
if (transactionState.getRegionsToIgnore().contains(location)) {
continue;
}
try {
loopCount++;
+ final int participantNum = loopCount;
final byte[] regionName = location.getRegionInfo().getRegionName();
+ if(LOG.isTraceEnabled()) LOG.trace("Submitting abort for transaction: "
+ + transactionState.getTransactionId() + ", participant: "
+ + participantNum + ", region: " + location.getRegionInfo().getRegionNameAsString());
threadPool.submit(new TransactionManagerCallable(transactionState, location, connection) {
public Integer call() throws IOException {
- return doAbortX(regionName, transactionState.getTransactionId());
+ return doAbortX(regionName, transactionState.getTransactionId(), participantNum);
}
});
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/84af9603/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionEndpoint.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionEndpoint.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionEndpoint.java
index 16153c3..9dd3b5a 100755
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionEndpoint.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionEndpoint.java
@@ -451,8 +451,12 @@ CoprocessorService, Coprocessor {
try {
abortTransaction(transactionId);
} catch (UnknownTransactionException u) {
- if (LOG.isDebugEnabled()) LOG.debug("TrxRegionEndpoint coprocessor:abort - txId " + transactionId + ", Caught UnknownTransactionException after internal abortTransaction call - " + u.getMessage() + " " + stackTraceToString(u));
- ute = u;
+ if (LOG.isDebugEnabled()) LOG.debug("TrxRegionEndpoint coprocessor:abort - txId "
+ + transactionId
+ + ", Caught UnknownTransactionException after internal abortTransaction call - "
+ + u.getMessage() + " "
+ + stackTraceToString(u));
+ ute = u;
} catch (IOException e) {
if (LOG.isDebugEnabled()) LOG.debug("TrxRegionEndpoint coprocessor:abort - txId " + transactionId + ", Caught IOException after internal abortTransaction call - " + e.getMessage() + " " + stackTraceToString(e));
ioe = e;
@@ -657,8 +661,10 @@ CoprocessorService, Coprocessor {
Throwable t = null;
WrongRegionException wre = null;
long transactionId = request.getTransactionId();
+ final int participantNum = request.getParticipantNum();
- if (LOG.isTraceEnabled()) LOG.trace("TrxRegionEndpoint coprocessor: commit - txId " + transactionId + ", regionName " + regionInfo.getRegionNameAsString());
+ if (LOG.isDebugEnabled()) LOG.debug("TrxRegionEndpoint coprocessor: commit - txId "
+ + transactionId + ", participantNum " + participantNum + ", regionName " + regionInfo.getRegionNameAsString());
/* commenting out for the time being
java.lang.String name = ((com.google.protobuf.ByteString) request.getRegionName()).toStringUtf8();
@@ -676,7 +682,7 @@ CoprocessorService, Coprocessor {
{
// Process local memory
try {
- commit(transactionId, request.getIgnoreUnknownTransactionException());
+ commit(transactionId, participantNum, request.getIgnoreUnknownTransactionException());
} catch (Throwable e) {
LOG.error("TrxRegionEndpoint coprocessor: commit - txId " + transactionId + ", Caught exception after internal commit call "
+ e.getMessage() + " " + stackTraceToString(e));
@@ -737,7 +743,7 @@ CoprocessorService, Coprocessor {
commitMultipleResponseBuilder.setException(i, BatchException.EXCEPTION_REGIONNOTFOUND_ERR.toString());
}
else {
- regionEPCP.commit(transactionId, request.getIgnoreUnknownTransactionException());
+ regionEPCP.commit(transactionId, i, request.getIgnoreUnknownTransactionException());
}
if (LOG.isTraceEnabled()) LOG.trace("TrxRegionEndpoint commitMultiple ends");
//commit(transactionId, request.getIgnoreUnknownTransactionException());
@@ -776,6 +782,7 @@ CoprocessorService, Coprocessor {
boolean reply = false;
long transactionId = request.getTransactionId();
+ final int participantNum = request.getParticipantNum();
Throwable t = null;
WrongRegionException wre = null;
@@ -795,8 +802,8 @@ CoprocessorService, Coprocessor {
{
// Process local memory
try {
- if (LOG.isTraceEnabled()) LOG.trace("TrxRegionEndpoint coprocessor: commitIfPossible - txId " + transactionId + ", regionName, " + regionInfo.getRegionNameAsString() + "calling internal commitIfPossible");
- reply = commitIfPossible(transactionId);
+ if (LOG.isDebugEnabled()) LOG.debug("TrxRegionEndpoint coprocessor: commitIfPossible - txId " + transactionId + ", regionName, " + regionInfo.getRegionNameAsString() + "calling internal commitIfPossible");
+ reply = commitIfPossible(transactionId, participantNum);
} catch (Throwable e) {
if (LOG.isTraceEnabled()) LOG.trace("TrxRegionEndpoint coprocessor: commitIfPossible - txId " + transactionId + ", Caught exception after internal commitIfPossible call "
+ e.getMessage() + " " + stackTraceToString(e));
@@ -837,8 +844,10 @@ CoprocessorService, Coprocessor {
Throwable t = null;
WrongRegionException wre = null;
long transactionId = request.getTransactionId();
+ int participantNum = request.getParticipantNum();
- if (LOG.isTraceEnabled()) LOG.trace("TrxRegionEndpoint coprocessor: commitRequest - txId " + transactionId + ", regionName " + regionInfo.getRegionNameAsString());
+ if (LOG.isTraceEnabled()) LOG.trace("TrxRegionEndpoint coprocessor: commitRequest - txId "
+ + transactionId + ", participantNum " + participantNum + ", regionName " + regionInfo.getRegionNameAsString());
/* commenting out for the time being
java.lang.String name = ((com.google.protobuf.ByteString) request.getRegionName()).toStringUtf8();
@@ -856,7 +865,7 @@ CoprocessorService, Coprocessor {
{
// Process local memory
try {
- status = commitRequest(transactionId);
+ status = commitRequest(transactionId, participantNum);
} catch (UnknownTransactionException u) {
if (LOG.isTraceEnabled()) LOG.trace("TrxRegionEndpoint coprocessor: commitRequest - txId " + transactionId + ", Caught UnknownTransactionException after internal commitRequest call - " + u.toString());
ute = u;
@@ -957,8 +966,8 @@ CoprocessorService, Coprocessor {
commitRequestMultipleResponseBuilder.setException(i, BatchException.EXCEPTION_REGIONNOTFOUND_ERR.toString());
}
else {
- if (i == (numOfRegion - 1)) {status = regionEPCP.commitRequest(transactionId, true);} // only the last region flush
- else {status = regionEPCP.commitRequest(transactionId, false);}
+ if (i == (numOfRegion - 1)) {status = regionEPCP.commitRequest(transactionId, i, true);} // only the last region flush
+ else {status = regionEPCP.commitRequest(transactionId, i, false);}
}
if (LOG.isTraceEnabled()) LOG.trace("TrxRegionEndpoint commitRequestMultiple ends");
//status = commitRequest(transactionId);
@@ -4225,8 +4234,8 @@ CoprocessorService, Coprocessor {
* @param long TransactionId
* @throws IOException
*/
- public void commit(final long transactionId) throws IOException {
- commit(transactionId, false /* IgnoreUnknownTransactionException */);
+ public void commit(final long transactionId, final int participantNum) throws IOException {
+ commit(transactionId, participantNum, false /* IgnoreUnknownTransactionException */);
}
/**
@@ -4235,9 +4244,9 @@ CoprocessorService, Coprocessor {
* @param boolean ignoreUnknownTransactionException
* @throws IOException
*/
- public void commit(final long transactionId, final boolean ignoreUnknownTransactionException) throws IOException {
+ public void commit(final long transactionId, final int participantNum, final boolean ignoreUnknownTransactionException) throws IOException {
if (LOG.isTraceEnabled()) LOG.trace("TrxRegionEndpoint coprocessor: commit(txId) -- ENTRY txId: " + transactionId +
- " ignoreUnknownTransactionException: " + ignoreUnknownTransactionException);
+ " ignoreUnknownTransaction: " + ignoreUnknownTransactionException);
CommitProgress commitStatus = CommitProgress.NONE;
TrxTransactionState state;
try {
@@ -4249,10 +4258,11 @@ CoprocessorService, Coprocessor {
+ m_Region.getRegionInfo().getRegionNameAsString());
return;
}
- LOG.fatal("TrxRegionEndpoint coprocessor: Asked to commit unknown transaction: " + transactionId
- + " in region "
- + m_Region.getRegionInfo().getRegionNameAsString());
- throw new IOException("UnknownTransactionException, transId: " + transactionId);
+ LOG.fatal("TrxRegionEndpoint coprocessor: Participant " + participantNum
+ + " Asked to commit unknown transaction: " + transactionId
+ + " in region " + m_Region.getRegionInfo().getRegionNameAsString());
+ throw new IOException("UnknownTransactionException, Participant "
+ + participantNum + " transId: " + transactionId);
}
if (!state.getStatus().equals(Status.COMMIT_PENDING)) {
@@ -4296,13 +4306,15 @@ CoprocessorService, Coprocessor {
* @return TransactionRegionInterface commit code
* @throws IOException
*/
- public int commitRequest(final long transactionId) throws IOException {
- return commitRequest(transactionId, true);
+ public int commitRequest(final long transactionId, final int participantNum) throws IOException {
+ return commitRequest(transactionId, participantNum, true);
}
- public int commitRequest(final long transactionId, boolean flushHLOG) throws IOException {
+ public int commitRequest(final long transactionId, final int participantNum, boolean flushHLOG) throws IOException,
+ UnknownTransactionException {
long txid = 0;
- if (LOG.isTraceEnabled()) LOG.trace("TrxRegionEndpoint coprocessor: commitRequest -- ENTRY txId: " + transactionId);
+ if (LOG.isDebugEnabled()) LOG.debug("TrxRegionEndpoint coprocessor: commitRequest -- ENTRY txId: "
+ + transactionId + " participantNum " + participantNum);
TrxTransactionState state;
int lv_totalCommits = 0;
@@ -4326,10 +4338,10 @@ CoprocessorService, Coprocessor {
try {
state = getTransactionState(transactionId);
} catch (UnknownTransactionException e) {
- if (LOG.isDebugEnabled()) LOG.debug("TrxRegionEndpoint coprocessor: commitRequest Unknown transaction [" + transactionId
- + "] in region ["
+ if (LOG.isDebugEnabled()) LOG.debug("TrxRegionEndpoint coprocessor: commitRequest Unknown transaction ["
+ + transactionId + "] in region ["
+ m_Region.getRegionInfo().getRegionNameAsString()
- + "], ignoring");
+ + "], participantNum " + participantNum + " ignoring");
state = null;
}
// may change to indicate a NOTFOUND case then depends on the TM ts state, if reinstated tx, ignore the exception
@@ -4693,18 +4705,18 @@ CoprocessorService, Coprocessor {
* @return boolean
* @throws IOException
*/
- public boolean commitIfPossible(final long transactionId)
+ public boolean commitIfPossible(final long transactionId, final int participantNum)
throws IOException {
if (LOG.isTraceEnabled()) LOG.trace("TrxRegionEndpoint coprocessor: commitIfPossible -- ENTRY txId: "
+ transactionId);
- int status = commitRequest(transactionId);
+ int status = commitRequest(transactionId, participantNum);
if (status == COMMIT_OK) {
// Process local memory
try {
- commit(transactionId);
+ commit(transactionId, participantNum);
if (LOG.isTraceEnabled()) LOG.trace("TrxRegionEndpoint coprocessor: commitIfPossible -- ENTRY txId: " + transactionId + " COMMIT_OK");
return true;
} catch (Throwable e) {
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/84af9603/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/generated/SsccRegionProtos.java
----------------------------------------------------------------------
diff --git a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/generated/SsccRegionProtos.java b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/generated/SsccRegionProtos.java
index 8b40e88..71a8a49 100644
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/generated/SsccRegionProtos.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/generated/SsccRegionProtos.java
@@ -1516,15 +1516,15 @@ public final class SsccRegionProtos {
public final boolean isInitialized() {
if (!hasTransactionId()) {
-
+
return false;
}
if (!hasStartId()) {
-
+
return false;
}
if (!hasRegionName()) {
-
+
return false;
}
return true;
@@ -2701,15 +2701,15 @@ public final class SsccRegionProtos {
public final boolean isInitialized() {
if (!hasRegionName()) {
-
+
return false;
}
if (!hasTransactionId()) {
-
+
return false;
}
if (!hasCommitId()) {
-
+
return false;
}
return true;
@@ -6428,23 +6428,23 @@ public final class SsccRegionProtos {
public final boolean isInitialized() {
if (!hasTransactionId()) {
-
+
return false;
}
if (!hasStartId()) {
-
+
return false;
}
if (!hasRegionName()) {
-
+
return false;
}
if (!hasRow()) {
-
+
return false;
}
if (!hasFamily()) {
-
+
return false;
}
if (!hasQualifier()) {
@@ -8230,39 +8230,39 @@ public final class SsccRegionProtos {
public final boolean isInitialized() {
if (!hasTransactionId()) {
-
+
return false;
}
if (!hasStartId()) {
-
+
return false;
}
if (!hasRegionName()) {
-
+
return false;
}
if (!hasRow()) {
-
+
return false;
}
if (!hasFamily()) {
-
- return false;
+
+ return false;
}
if (!hasQualifier()) {
-
+
return false;
}
if (!hasValue()) {
-
+
return false;
}
if (!hasPut()) {
-
+
return false;
}
if (!getPut().isInitialized()) {
-
+
return false;
}
return true;
@@ -11006,20 +11006,20 @@ public final class SsccRegionProtos {
public final boolean isInitialized() {
if (!hasTransactionId()) {
-
+
return false;
}
if (!hasStartId()) {
-
+
return false;
}
if (!hasRegionName()) {
-
+
return false;
}
for (int i = 0; i < getDeleteCount(); i++) {
if (!getDelete(i).isInitialized()) {
-
+
return false;
}
}
@@ -12745,22 +12745,23 @@ public final class SsccRegionProtos {
public final boolean isInitialized() {
if (!hasTransactionId()) {
-
+
return false;
}
if (!hasStartId()) {
-
+
return false;
}
if (!hasRegionName()) {
-
+
return false;
}
if (!hasDelete()) {
-
+
return false;
}
if (!getDelete().isInitialized()) {
+
return false;
}
return true;
@@ -14362,23 +14363,23 @@ public final class SsccRegionProtos {
public final boolean isInitialized() {
if (!hasTransactionId()) {
-
+
return false;
}
if (!hasStartId()) {
-
+
return false;
}
if (!hasRegionName()) {
-
+
return false;
}
if (!hasGet()) {
-
+
return false;
}
if (!getGet().isInitialized()) {
-
+
return false;
}
return true;
@@ -15899,23 +15900,23 @@ public final class SsccRegionProtos {
public final boolean isInitialized() {
if (!hasTransactionId()) {
-
+
return false;
}
if (!hasStartId()) {
-
+
return false;
}
if (!hasRegionName()) {
-
+
return false;
}
if (!hasScan()) {
-
+
return false;
}
if (!getScan().isInitialized()) {
-
+
return false;
}
return true;
@@ -17458,31 +17459,31 @@ public final class SsccRegionProtos {
public final boolean isInitialized() {
if (!hasTransactionId()) {
-
+
return false;
}
if (!hasStartId()) {
-
+
return false;
}
if (!hasRegionName()) {
-
+
return false;
}
if (!hasScannerId()) {
-
+
return false;
}
if (!hasNumberOfRows()) {
-
+
return false;
}
if (!hasCloseScanner()) {
-
+
return false;
}
if (!hasNextCallSeq()) {
-
+
return false;
}
return true;
@@ -19503,23 +19504,23 @@ public final class SsccRegionProtos {
public final boolean isInitialized() {
if (!hasTransactionId()) {
-
+
return false;
}
if (!hasStartId()) {
-
+
return false;
}
if (!hasRegionName()) {
-
+
return false;
}
if (!hasPut()) {
-
+
return false;
}
if (!getPut().isInitialized()) {
-
+
return false;
}
return true;
@@ -21247,20 +21248,20 @@ public final class SsccRegionProtos {
public final boolean isInitialized() {
if (!hasTransactionId()) {
-
+
return false;
}
if (!hasStartId()) {
-
+
return false;
}
if (!hasRegionName()) {
-
+
return false;
}
for (int i = 0; i < getPutCount(); i++) {
if (!getPut(i).isInitialized()) {
-
+
return false;
}
}
@@ -22988,19 +22989,19 @@ public final class SsccRegionProtos {
public final boolean isInitialized() {
if (!hasTransactionId()) {
-
+
return false;
}
if (!hasStartId()) {
-
+
return false;
}
if (!hasRegionName()) {
-
+
return false;
}
if (!hasTmId()) {
-
+
return false;
}
return true;
@@ -24568,27 +24569,27 @@ public final class SsccRegionProtos {
public final boolean isInitialized() {
if (!hasRegionName()) {
-
+
return false;
}
if (!hasTransactionId()) {
-
+
return false;
}
if (!hasStartId()) {
-
+
return false;
}
if (!hasInterpreterClassName()) {
-
+
return false;
}
if (!hasScan()) {
-
+
return false;
}
if (!getScan().isInitialized()) {
-
+
return false;
}
return true;