[phoenix] branch 4.x-HBase-1.4 updated: PHOENIX-5515 Able to write indexed value to data table without writing to index table (addendum)

[ka...@apache.org]

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

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


The following commit(s) were added to refs/heads/4.x-HBase-1.4 by this push:
     new 1dd7707  PHOENIX-5515 Able to write indexed value to data table without writing to index table (addendum)
1dd7707 is described below

commit 1dd77072567722390ab9a6d0a76a492ea05d7540
Author: Kadir <ko...@salesforce.com>
AuthorDate: Mon Oct 14 18:06:20 2019 -0700

    PHOENIX-5515 Able to write indexed value to data table without writing to index table (addendum)
---
 .../java/org/apache/phoenix/hbase/index/IndexRegionObserver.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 d6a643c..1996d9a 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
@@ -777,9 +777,6 @@ public class IndexRegionObserver extends BaseRegionObserver {
 
       try {
           if (failPreIndexUpdatesForTesting) {
-              // Remove all locks as they are already unlocked. There is no need to unlock them again later when
-              // postBatchMutateIndispensably() is called
-              context.rowLocks.clear();
               throw new DoNotRetryIOException("Simulating the first (i.e., pre) index table write failure");
           }
           doIndexWritesWithExceptions(context, false);
@@ -788,6 +785,9 @@ public class IndexRegionObserver extends BaseRegionObserver {
       } catch (Throwable e) {
           metricSource.updatePreIndexUpdateFailureTime(EnvironmentEdgeManager.currentTimeMillis() - start);
           metricSource.incrementPreIndexUpdateFailures();
+          // Remove all locks as they are already unlocked. There is no need to unlock them again later when
+          // postBatchMutateIndispensably() is called
+          context.rowLocks.clear();
           removePendingRows(context);
           rethrowIndexingException(e);
       }