[3/4] phoenix git commit: PHOENIX-3997 UngroupedAggregateRegionObserver.commitBatchWithHTable() should not check the memstore size and wait for flush.

2017-07-24 Thread apurtell 
PHOENIX-3997 UngroupedAggregateRegionObserver.commitBatchWithHTable() should 
not check the memstore size and wait for flush.

Signed-off-by: Andrew Purtell 


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

Branch: refs/heads/4.x-HBase-1.1
Commit: e9498bf4704d438969e67557c7d45b3a76c65458
Parents: bd11d86
Author: Geoffrey Jacoby 
Authored: Thu Jul 13 13:34:54 2017 -0700
Committer: Andrew Purtell 
Committed: Mon Jul 24 15:42:20 2017 -0700

--
 .../UngroupedAggregateRegionObserver.java   | 127 ++-
 1 file changed, 67 insertions(+), 60 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/e9498bf4/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
index a949058..a07b5d0 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
@@ -200,24 +200,12 @@ public class UngroupedAggregateRegionObserver extends 
BaseScannerRegionObserver
 InterRegionServerIndexRpcControllerFactory.class, 
RpcControllerFactory.class);
 }
 
-private void commitBatch(Region region, List mutations, byte[] 
indexUUID, long blockingMemstoreSize,
-byte[] indexMaintainersPtr, byte[] txState, boolean useIndexProto) 
throws IOException {
+private void commitBatch(Region region, List mutations, long 
blockingMemstoreSize) throws IOException {
   if (mutations.isEmpty()) {
- return;
+  return;
   }
-  for (Mutation m : mutations) {
- if (indexMaintainersPtr != null) {
- m.setAttribute(useIndexProto ? PhoenixIndexCodec.INDEX_PROTO_MD : 
PhoenixIndexCodec.INDEX_MD, indexMaintainersPtr);
- }
- if (indexUUID != null) {
-m.setAttribute(PhoenixIndexCodec.INDEX_UUID, indexUUID);
- }
- if (txState != null) {
- m.setAttribute(BaseScannerRegionObserver.TX_STATE, txState);
- }
-  }
-  
-  Mutation[] mutationArray = new Mutation[mutations.size()];
+
+Mutation[] mutationArray = new Mutation[mutations.size()];
   // When memstore size reaches blockingMemstoreSize we are waiting 3 
seconds for the
   // flush happen which decrease the memstore size and then writes allowed 
on the region.
   for (int i = 0; region.getMemstoreSize() > blockingMemstoreSize && i < 
30; i++) {
@@ -233,34 +221,26 @@ public class UngroupedAggregateRegionObserver extends 
BaseScannerRegionObserver
   logger.debug("Committing bactch of " + mutations.size() + " mutations 
for " + region.getRegionInfo().getTable().getNameAsString());
   region.batchMutate(mutations.toArray(mutationArray), 
HConstants.NO_NONCE, HConstants.NO_NONCE);
 }
-
-private void commitBatchWithHTable(HTable table, Region region, 
List mutations, byte[] indexUUID,
-long blockingMemstoreSize, byte[] indexMaintainersPtr, byte[] 
txState, boolean useIndexProto) throws IOException {
-   if (mutations.isEmpty()) {
- return;
-   }
+
+private void setIndexAndTransactionProperties(List mutations, 
byte[] indexUUID, byte[] indexMaintainersPtr, byte[] txState, boolean 
useIndexProto) {
 for (Mutation m : mutations) {
-if (indexMaintainersPtr != null) {
-m.setAttribute(useIndexProto ? 
PhoenixIndexCodec.INDEX_PROTO_MD : PhoenixIndexCodec.INDEX_MD, 
indexMaintainersPtr);
-}
-if (txState != null) {
-m.setAttribute(BaseScannerRegionObserver.TX_STATE, txState);
-}
-if (indexUUID != null) {
-   m.setAttribute(PhoenixIndexCodec.INDEX_UUID, indexUUID);
-}
-}
-// When memstore size reaches blockingMemstoreSize we are waiting 3 
seconds for the
-// flush happen which decrease the memstore size and then writes 
allowed on the region.
-for (int i = 0; region.getMemstoreSize() > blockingMemstoreSize && i < 
30; i++) {
-try {
-checkForRegionClosing();
-Thread.sleep(100);
-} catch (InterruptedException e) {
-Thread.currentThread().interrupt();
-

[4/4] phoenix git commit: PHOENIX-3997 UngroupedAggregateRegionObserver.commitBatchWithHTable() should not check the memstore size and wait for flush.

2017-07-24 Thread apurtell 
PHOENIX-3997 UngroupedAggregateRegionObserver.commitBatchWithHTable() should 
not check the memstore size and wait for flush.

Signed-off-by: Andrew Purtell 


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/318dd230
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/318dd230
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/318dd230

Branch: refs/heads/4.x-HBase-0.98
Commit: 318dd23031382200d92781fb11913464c9d442a6
Parents: e18c393
Author: Geoffrey Jacoby 
Authored: Thu Jul 13 13:34:54 2017 -0700
Committer: Andrew Purtell 
Committed: Mon Jul 24 15:56:33 2017 -0700

--
 .../UngroupedAggregateRegionObserver.java   | 101 ++-
 1 file changed, 54 insertions(+), 47 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/318dd230/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
index 70ed5e5..1571822 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
@@ -200,21 +200,9 @@ public class UngroupedAggregateRegionObserver extends 
BaseScannerRegionObserver
 InterRegionServerIndexRpcControllerFactory.class, 
RpcControllerFactory.class);
 }
 
-private void commitBatch(HRegion region, List mutations, byte[] 
indexUUID, long blockingMemstoreSize,
-byte[] indexMaintainersPtr, byte[] txState, boolean useIndexProto) 
throws IOException {
+private void commitBatch(HRegion region, List mutations, long 
blockingMemstoreSize) throws IOException {
   if (mutations.isEmpty()) {
- return;
-  }
-  for (Mutation m : mutations) {
- if (indexMaintainersPtr != null) {
- m.setAttribute(useIndexProto ? PhoenixIndexCodec.INDEX_PROTO_MD : 
PhoenixIndexCodec.INDEX_MD, indexMaintainersPtr);
- }
- if (indexUUID != null) {
-m.setAttribute(PhoenixIndexCodec.INDEX_UUID, indexUUID);
- }
- if (txState != null) {
- m.setAttribute(BaseScannerRegionObserver.TX_STATE, txState);
- }
+  return;
   }
   Mutation[] mutationArray = new Mutation[mutations.size()];
   // When memstore size reaches blockingMemstoreSize we are waiting 3 
seconds for the
@@ -233,11 +221,7 @@ public class UngroupedAggregateRegionObserver extends 
BaseScannerRegionObserver
   region.batchMutate(mutations.toArray(mutationArray), 
HConstants.NO_NONCE, HConstants.NO_NONCE);
 }
 
-private void commitBatchWithHTable(HTable table, HRegion region, 
List mutations, byte[] indexUUID,
-long blockingMemstoreSize, byte[] indexMaintainersPtr, byte[] 
txState, boolean useIndexProto) throws IOException {
-   if (mutations.isEmpty()) {
- return;
-   }
+private void setIndexAndTransactionProperties(List mutations, 
byte[] indexUUID, byte[] indexMaintainersPtr, byte[] txState, boolean 
useIndexProto) {
 for (Mutation m : mutations) {
 if (indexMaintainersPtr != null) {
 m.setAttribute(useIndexProto ? 
PhoenixIndexCodec.INDEX_PROTO_MD : PhoenixIndexCodec.INDEX_MD, 
indexMaintainersPtr);
@@ -246,19 +230,14 @@ public class UngroupedAggregateRegionObserver extends 
BaseScannerRegionObserver
 m.setAttribute(BaseScannerRegionObserver.TX_STATE, txState);
 }
 if (indexUUID != null) {
-   m.setAttribute(PhoenixIndexCodec.INDEX_UUID, indexUUID);
+m.setAttribute(PhoenixIndexCodec.INDEX_UUID, indexUUID);
 }
 }
-// When memstore size reaches blockingMemstoreSize we are waiting 3 
seconds for the
-// flush happen which decrease the memstore size and then writes 
allowed on the region.
-for (int i = 0; region.getMemstoreSize().get() > blockingMemstoreSize 
&& i < 30; i++) {
-try {
-checkForRegionClosing();
-Thread.sleep(100);
-} catch (InterruptedException e) {
-Thread.currentThread().interrupt();
-throw new IOException(e);
-}
+}
+
+private void commitBatchWithHTable(HTable table, List mutations) 
throws IOException {
+if (mutations.isEmpty()) {
+return;
 }
 logger.debug("Committing batch of " +

[2/4] phoenix git commit: PHOENIX-3997 UngroupedAggregateRegionObserver.commitBatchWithHTable() should not check the memstore size and wait for flush.

2017-07-24 Thread apurtell 
PHOENIX-3997 UngroupedAggregateRegionObserver.commitBatchWithHTable() should 
not check the memstore size and wait for flush.

Signed-off-by: Andrew Purtell 


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/54c28d19
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/54c28d19
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/54c28d19

Branch: refs/heads/4.x-HBase-1.2
Commit: 54c28d19698b18d2e5d86d61e37a104391ff3392
Parents: 2913e10
Author: Geoffrey Jacoby 
Authored: Thu Jul 13 13:34:54 2017 -0700
Committer: Andrew Purtell 
Committed: Mon Jul 24 15:41:42 2017 -0700

--
 .../UngroupedAggregateRegionObserver.java   | 129 ++-
 1 file changed, 68 insertions(+), 61 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/54c28d19/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
index dc2ae3f..a07b5d0 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
@@ -200,24 +200,12 @@ public class UngroupedAggregateRegionObserver extends 
BaseScannerRegionObserver
 InterRegionServerIndexRpcControllerFactory.class, 
RpcControllerFactory.class);
 }
 
-private void commitBatch(Region region, List mutations, byte[] 
indexUUID, long blockingMemstoreSize,
-byte[] indexMaintainersPtr, byte[] txState, boolean useIndexProto) 
throws IOException {
+private void commitBatch(Region region, List mutations, long 
blockingMemstoreSize) throws IOException {
   if (mutations.isEmpty()) {
- return;
+  return;
   }
-  for (Mutation m : mutations) {
- if (indexMaintainersPtr != null) {
- m.setAttribute(useIndexProto ? PhoenixIndexCodec.INDEX_PROTO_MD : 
PhoenixIndexCodec.INDEX_MD, indexMaintainersPtr);
- }
- if (indexUUID != null) {
-m.setAttribute(PhoenixIndexCodec.INDEX_UUID, indexUUID);
- }
- if (txState != null) {
- m.setAttribute(BaseScannerRegionObserver.TX_STATE, txState);
- }
-  }
-  
-  Mutation[] mutationArray = new Mutation[mutations.size()];
+
+Mutation[] mutationArray = new Mutation[mutations.size()];
   // When memstore size reaches blockingMemstoreSize we are waiting 3 
seconds for the
   // flush happen which decrease the memstore size and then writes allowed 
on the region.
   for (int i = 0; region.getMemstoreSize() > blockingMemstoreSize && i < 
30; i++) {
@@ -233,34 +221,26 @@ public class UngroupedAggregateRegionObserver extends 
BaseScannerRegionObserver
   logger.debug("Committing bactch of " + mutations.size() + " mutations 
for " + region.getRegionInfo().getTable().getNameAsString());
   region.batchMutate(mutations.toArray(mutationArray), 
HConstants.NO_NONCE, HConstants.NO_NONCE);
 }
-
-private void commitBatchWithHTable(HTable table, Region region, 
List mutations, byte[] indexUUID,
-long blockingMemstoreSize, byte[] indexMaintainersPtr, byte[] 
txState, boolean useIndexProto) throws IOException {
-   if (mutations.isEmpty()) {
- return;
-   }
+
+private void setIndexAndTransactionProperties(List mutations, 
byte[] indexUUID, byte[] indexMaintainersPtr, byte[] txState, boolean 
useIndexProto) {
 for (Mutation m : mutations) {
-if (indexMaintainersPtr != null) {
-m.setAttribute(useIndexProto ? 
PhoenixIndexCodec.INDEX_PROTO_MD : PhoenixIndexCodec.INDEX_MD, 
indexMaintainersPtr);
-}
-if (txState != null) {
-m.setAttribute(BaseScannerRegionObserver.TX_STATE, txState);
-}
-if (indexUUID != null) {
-   m.setAttribute(PhoenixIndexCodec.INDEX_UUID, indexUUID);
-}
-}
-// When memstore size reaches blockingMemstoreSize we are waiting 3 
seconds for the
-// flush happen which decrease the memstore size and then writes 
allowed on the region.
-for (int i = 0; region.getMemstoreSize() > blockingMemstoreSize && i < 
30; i++) {
-try {
-checkForRegionClosing();
-Thread.sleep(100);
-} catch (InterruptedException e) {
-Thread.currentThread().interrupt();
-

[3/4] phoenix git commit: Amend PHOENIX-4039 Increase default number of RPC retries for our index rebuild task

2017-07-24 Thread apurtell 
Amend PHOENIX-4039 Increase default number of RPC retries for our index rebuild 
task

Signed-off-by: Andrew Purtell 


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

Branch: refs/heads/4.x-HBase-1.1
Commit: bd11d86e382e6853cb54b2b7fc2a330a0aaa22e0
Parents: ce71efc
Author: Vincent 
Authored: Thu Jul 20 14:13:24 2017 -0700
Committer: Andrew Purtell 
Committed: Mon Jul 24 11:45:02 2017 -0700

--
 .../java/org/apache/phoenix/query/QueryServicesOptions.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/bd11d86e/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java 
b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
index 8ffb0af..c6593da 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
@@ -183,10 +183,11 @@ public class QueryServicesOptions {
 public static final boolean DEFAULT_INDEX_FAILURE_THROW_EXCEPTION = true; 
 public static final long DEFAULT_INDEX_FAILURE_HANDLING_REBUILD_INTERVAL = 
6; // 60 secs
 public static final long 
DEFAULT_INDEX_FAILURE_HANDLING_REBUILD_OVERLAP_TIME = 1; // 1 ms
-public static final long DEFAULT_INDEX_REBUILD_QUERY_TIMEOUT = 3 * 60; 
// 30 mins
+// 30 min rpc timeout * 5 tries, with 2100ms total pause time between 
retries
+public static final long DEFAULT_INDEX_REBUILD_QUERY_TIMEOUT = (5 * 3 
* 60) + 2100;
 public static final long DEFAULT_INDEX_REBUILD_RPC_TIMEOUT = 3 * 60; 
// 30 mins
 public static final long DEFAULT_INDEX_REBUILD_CLIENT_SCANNER_TIMEOUT = 
3 * 60; // 30 mins
-public static final int DEFAULT_INDEX_REBUILD_RPC_RETRIES_COUNTER = 1; // 
1 retry at rpc level
+public static final int DEFAULT_INDEX_REBUILD_RPC_RETRIES_COUNTER = 5; // 
5 total tries at rpc level
 public static final int DEFAULT_INDEX_REBUILD_DISABLE_TIMESTAMP_THRESHOLD 
= 3 * 60; // 30 mins
 
 /**

[1/4] phoenix git commit: Amend PHOENIX-4039 Increase default number of RPC retries for our index rebuild task

2017-07-24 Thread apurtell 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 771f766eb -> e18c39341
  refs/heads/4.x-HBase-1.1 ce71efc9f -> bd11d86e3
  refs/heads/4.x-HBase-1.2 6b6bb7751 -> 2913e108f
  refs/heads/master 87976eb6f -> adda7f10b


Amend PHOENIX-4039 Increase default number of RPC retries for our index rebuild 
task

Signed-off-by: Andrew Purtell 


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

Branch: refs/heads/master
Commit: adda7f10b648fa1d739a1ee739780fa1643faa81
Parents: 87976eb
Author: Vincent 
Authored: Thu Jul 20 14:13:24 2017 -0700
Committer: Andrew Purtell 
Committed: Mon Jul 24 11:44:46 2017 -0700

--
 .../java/org/apache/phoenix/query/QueryServicesOptions.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/adda7f10/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java 
b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
index 8ffb0af..c6593da 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
@@ -183,10 +183,11 @@ public class QueryServicesOptions {
 public static final boolean DEFAULT_INDEX_FAILURE_THROW_EXCEPTION = true; 
 public static final long DEFAULT_INDEX_FAILURE_HANDLING_REBUILD_INTERVAL = 
6; // 60 secs
 public static final long 
DEFAULT_INDEX_FAILURE_HANDLING_REBUILD_OVERLAP_TIME = 1; // 1 ms
-public static final long DEFAULT_INDEX_REBUILD_QUERY_TIMEOUT = 3 * 60; 
// 30 mins
+// 30 min rpc timeout * 5 tries, with 2100ms total pause time between 
retries
+public static final long DEFAULT_INDEX_REBUILD_QUERY_TIMEOUT = (5 * 3 
* 60) + 2100;
 public static final long DEFAULT_INDEX_REBUILD_RPC_TIMEOUT = 3 * 60; 
// 30 mins
 public static final long DEFAULT_INDEX_REBUILD_CLIENT_SCANNER_TIMEOUT = 
3 * 60; // 30 mins
-public static final int DEFAULT_INDEX_REBUILD_RPC_RETRIES_COUNTER = 1; // 
1 retry at rpc level
+public static final int DEFAULT_INDEX_REBUILD_RPC_RETRIES_COUNTER = 5; // 
5 total tries at rpc level
 public static final int DEFAULT_INDEX_REBUILD_DISABLE_TIMESTAMP_THRESHOLD 
= 3 * 60; // 30 mins
 
 /**

[4/4] phoenix git commit: Amend PHOENIX-4039 Increase default number of RPC retries for our index rebuild task

2017-07-24 Thread apurtell 
Amend PHOENIX-4039 Increase default number of RPC retries for our index rebuild 
task

Signed-off-by: Andrew Purtell 


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

Branch: refs/heads/4.x-HBase-0.98
Commit: e18c393412a40f38bead619a417120634190
Parents: 771f766
Author: Vincent 
Authored: Thu Jul 20 14:13:24 2017 -0700
Committer: Andrew Purtell 
Committed: Mon Jul 24 11:45:08 2017 -0700

--
 .../java/org/apache/phoenix/query/QueryServicesOptions.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/e18c3934/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java 
b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
index 80d01d7..55cbc91 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
@@ -173,10 +173,11 @@ public class QueryServicesOptions {
 public static final boolean DEFAULT_INDEX_FAILURE_THROW_EXCEPTION = true; 
 public static final long DEFAULT_INDEX_FAILURE_HANDLING_REBUILD_INTERVAL = 
6; // 60 secs
 public static final long 
DEFAULT_INDEX_FAILURE_HANDLING_REBUILD_OVERLAP_TIME = 1; // 1 ms
-public static final long DEFAULT_INDEX_REBUILD_QUERY_TIMEOUT = 3 * 60; 
// 30 mins
+// 30 min rpc timeout * 5 tries, with 2100ms total pause time between 
retries
+public static final long DEFAULT_INDEX_REBUILD_QUERY_TIMEOUT = (5 * 3 
* 60) + 2100;
 public static final long DEFAULT_INDEX_REBUILD_RPC_TIMEOUT = 3 * 60; 
// 30 mins
 public static final long DEFAULT_INDEX_REBUILD_CLIENT_SCANNER_TIMEOUT = 
3 * 60; // 30 mins
-public static final int DEFAULT_INDEX_REBUILD_RPC_RETRIES_COUNTER = 1; // 
1 retry at rpc level
+public static final int DEFAULT_INDEX_REBUILD_RPC_RETRIES_COUNTER = 5; // 
5 total tries at rpc level
 public static final int DEFAULT_INDEX_REBUILD_DISABLE_TIMESTAMP_THRESHOLD 
= 3 * 60; // 30 mins
 
 /**

[2/4] phoenix git commit: Amend PHOENIX-4039 Increase default number of RPC retries for our index rebuild task

2017-07-24 Thread apurtell 
Amend PHOENIX-4039 Increase default number of RPC retries for our index rebuild 
task

Signed-off-by: Andrew Purtell 


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/2913e108
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/2913e108
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/2913e108

Branch: refs/heads/4.x-HBase-1.2
Commit: 2913e108f9d8371c8963d6235cddcea404883a82
Parents: 6b6bb77
Author: Vincent 
Authored: Thu Jul 20 14:13:24 2017 -0700
Committer: Andrew Purtell 
Committed: Mon Jul 24 11:44:55 2017 -0700

--
 .../java/org/apache/phoenix/query/QueryServicesOptions.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/2913e108/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java 
b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
index 8ffb0af..c6593da 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
@@ -183,10 +183,11 @@ public class QueryServicesOptions {
 public static final boolean DEFAULT_INDEX_FAILURE_THROW_EXCEPTION = true; 
 public static final long DEFAULT_INDEX_FAILURE_HANDLING_REBUILD_INTERVAL = 
6; // 60 secs
 public static final long 
DEFAULT_INDEX_FAILURE_HANDLING_REBUILD_OVERLAP_TIME = 1; // 1 ms
-public static final long DEFAULT_INDEX_REBUILD_QUERY_TIMEOUT = 3 * 60; 
// 30 mins
+// 30 min rpc timeout * 5 tries, with 2100ms total pause time between 
retries
+public static final long DEFAULT_INDEX_REBUILD_QUERY_TIMEOUT = (5 * 3 
* 60) + 2100;
 public static final long DEFAULT_INDEX_REBUILD_RPC_TIMEOUT = 3 * 60; 
// 30 mins
 public static final long DEFAULT_INDEX_REBUILD_CLIENT_SCANNER_TIMEOUT = 
3 * 60; // 30 mins
-public static final int DEFAULT_INDEX_REBUILD_RPC_RETRIES_COUNTER = 1; // 
1 retry at rpc level
+public static final int DEFAULT_INDEX_REBUILD_RPC_RETRIES_COUNTER = 5; // 
5 total tries at rpc level
 public static final int DEFAULT_INDEX_REBUILD_DISABLE_TIMESTAMP_THRESHOLD 
= 3 * 60; // 30 mins
 
 /**

Build failed in Jenkins: Phoenix Compile Compatibility with HBase #359

2017-07-24 Thread Apache Jenkins Server 
See 


--
Started by timer
[EnvInject] - Loading node environment variables.
Building remotely on H25 (couchdbtest ubuntu xenial) in workspace 

[Phoenix_Compile_Compat_wHBase] $ /bin/bash /tmp/jenkins716549616229796203.sh
core file size  (blocks, -c) 0
data seg size   (kbytes, -d) unlimited
scheduling priority (-e) 0
file size   (blocks, -f) unlimited
pending signals (-i) 386417
max locked memory   (kbytes, -l) 64
max memory size (kbytes, -m) unlimited
open files  (-n) 6
pipe size(512 bytes, -p) 8
POSIX message queues (bytes, -q) 819200
real-time priority  (-r) 0
stack size  (kbytes, -s) 8192
cpu time   (seconds, -t) unlimited
max user processes  (-u) 10240
virtual memory  (kbytes, -v) unlimited
file locks  (-x) unlimited
core id : 0
core id : 1
core id : 2
core id : 3
core id : 4
core id : 5
physical id : 0
physical id : 1
MemTotal:   98958120 kB
MemFree:20811400 kB
Filesystem  Size  Used Avail Use% Mounted on
udev 48G 0   48G   0% /dev
tmpfs   9.5G  954M  8.6G  10% /run
/dev/sda1   364G  113G  233G  33% /
tmpfs48G  516K   48G   1% /dev/shm
tmpfs   5.0M 0  5.0M   0% /run/lock
tmpfs48G 0   48G   0% /sys/fs/cgroup
tmpfs   9.5G 0  9.5G   0% /run/user/10025
apache-maven-2.2.1
apache-maven-3.0.4
apache-maven-3.0.5
apache-maven-3.2.1
apache-maven-3.2.5
apache-maven-3.3.3
apache-maven-3.3.9
apache-maven-3.5.0
latest
latest2
latest3


===
Verifying compile level compatibility with HBase 0.98 with Phoenix 
4.x-HBase-0.98
===

Cloning into 'hbase'...
Switched to a new branch '0.98'
Branch 0.98 set up to track remote branch 0.98 from origin.

main:
 [exec] 
~/jenkins-slave/workspace/Phoenix_Compile_Compat_wHBase/hbase/hbase-common 
~/jenkins-slave/workspace/Phoenix_Compile_Compat_wHBase/hbase/hbase-common
 [exec] 
~/jenkins-slave/workspace/Phoenix_Compile_Compat_wHBase/hbase/hbase-common

main:
[mkdir] Created dir: 

 [exec] tar: hadoop-snappy-nativelibs.tar: Cannot open: No such file or 
directory
 [exec] tar: Error is not recoverable: exiting now
 [exec] Result: 2

main:
[mkdir] Created dir: 

 [copy] Copying 20 files to 

[mkdir] Created dir: 

[mkdir] Created dir: 


main:
[mkdir] Created dir: 

 [copy] Copying 17 files to 

[mkdir] Created dir: 


main:
[mkdir] Created dir: 

 [copy] Copying 1 file to 

[mkdir] Created dir: 


HBase pom.xml:

Got HBase version as 0.98.25-SNAPSHOT
Cloning into 'phoenix'...
Switched to a new branch '4.x-HBase-0.98'
Branch 4.x-HBase-0.98 set up to track remote branch 4.x-HBase-0.98 from origin.
ANTLR Parser Generator  Version 3.5.2
Output file 

 does not exist: must build 

PhoenixSQL.g


===
Verifying compile level compatibility with HBase branch-1.3 with Phoenix master