[phoenix] branch 4.x updated: PHOENIX-5870: IndexRegionObserver should retry before mappers in case of rebuild (#770)

[skadam]

This is an automated email from the ASF dual-hosted git repository.

skadam pushed a commit to branch 4.x
in repository https://gitbox.apache.org/repos/asf/phoenix.git


The following commit(s) were added to refs/heads/4.x by this push:
     new 7107b2b  PHOENIX-5870: IndexRegionObserver should retry before mappers 
in case of rebuild (#770)
7107b2b is described below

commit 7107b2bb9d62fa0e103c29f9f0d6ebe1d236c95f
Author: Swaroopa Kadam <swaroopa.kada...@gmail.com>
AuthorDate: Mon May 11 18:07:52 2020 -0700

    PHOENIX-5870: IndexRegionObserver should retry before mappers in case of 
rebuild (#770)
    
    Co-authored-by: s.kadam <s.ka...@apache.org>
---
 .../java/org/apache/phoenix/hbase/index/IndexRegionObserver.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/IndexRegionObserver.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/IndexRegionObserver.java
index 40fc883..602aba2 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/IndexRegionObserver.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/IndexRegionObserver.java
@@ -1058,7 +1058,11 @@ public class IndexRegionObserver extends 
BaseRegionObserver {
           // postBatchMutateIndispensably() is called
           removePendingRows(context);
           context.rowLocks.clear();
-          rethrowIndexingException(e);
+          if (context.rebuild) {
+              throw new IOException(String.format("%s for rebuild", 
e.getMessage()));
+          } else {
+              rethrowIndexingException(e);
+          }
       }
       throw new RuntimeException(
               "Somehow didn't complete the index update, but didn't return 
succesfully either!");