commit cfef3ba21046c566b7dda51ee9ac0749e51e18b3
author zheilbron <zheilbron@eaa15691-b419-025a-1212-ee371bd00084> Fri Mar 15 22:29:43 2013 +0000
committer zheilbron <zheilbron@eaa15691-b419-025a-1212-ee371bd00084> Fri Mar 15 22:29:43 2013 +0000
tree eb242cbe070560d2c8fa102b96c96acdcb28f982
parent 81b3b497d880ec2f2a1279b100f83b58fd41cae4

fixed a bug that could cause an LSM index to never flush after an abort

git-svn-id: https://asterixdb.googlecode.com/svn/branches/asterix_lsm_stabilization@1334 eaa15691-b419-025a-1212-ee371bd00084

asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/opcallbacks/IndexOperationTracker.java

diff --git a/asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/opcallbacks/IndexOperationTracker.java b/asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/opcallbacks/IndexOperationTracker.java
index 5121f84..d0071e7 100644
--- a/asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/opcallbacks/IndexOperationTracker.java
+++ b/asterix-transactions/src/main/java/edu/uci/ics/asterix/transaction/management/opcallbacks/IndexOperationTracker.java
@@ -53,12 +53,14 @@
     @Override
     public void beforeOperation(LSMOperationType opType, ISearchOperationCallback searchCallback,
             IModificationOperationCallback modificationCallback) throws HyracksDataException {
-        numActiveOperations++;
+        if (opType != LSMOperationType.FORCE_MODIFICATION) {
+            numActiveOperations++;
 
-        // Increment transactor-local active operations count.
-        AbstractOperationCallback opCallback = getOperationCallback(searchCallback, modificationCallback);
-        if (opCallback != null) {
-            opCallback.incrementLocalNumActiveOperations();
+            // Increment transactor-local active operations count.
+            AbstractOperationCallback opCallback = getOperationCallback(searchCallback, modificationCallback);
+            if (opCallback != null) {
+                opCallback.incrementLocalNumActiveOperations();
+            }
         }
     }