You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by mk...@apache.org on 2022/11/11 13:10:00 UTC

[jackrabbit-oak] branch trunk updated: OAK-9978: Test failure: PurgeOldIndexVersionTest. noDeleteIfInvalidIndexOperationVersion (#749)

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

mkataria pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 808f02b527 OAK-9978: Test failure: PurgeOldIndexVersionTest. noDeleteIfInvalidIndexOperationVersion (#749)
808f02b527 is described below

commit 808f02b527af1a7064a68c3048195986fad61817
Author: Mohit Kataria <mk...@apache.org>
AuthorDate: Fri Nov 11 18:39:55 2022 +0530

    OAK-9978: Test failure: PurgeOldIndexVersionTest. noDeleteIfInvalidIndexOperationVersion (#749)
---
 .../jackrabbit/oak/indexversion/IndexVersionOperation.java     | 10 ++++++++++
 .../jackrabbit/oak/indexversion/PurgeOldIndexVersionTest.java  |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/indexversion/IndexVersionOperation.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/indexversion/IndexVersionOperation.java
index 14c6aa4a22..5917cc0d6a 100644
--- a/oak-run/src/main/java/org/apache/jackrabbit/oak/indexversion/IndexVersionOperation.java
+++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/indexversion/IndexVersionOperation.java
@@ -112,6 +112,10 @@ public class IndexVersionOperation {
             if (activeIndexNameObject == null) {
                 LOG.warn("Cannot find any active index from the list: {}", reverseSortedIndexNameList);
             } else {
+                if (!isSameProductVersionBaseIndexPresent(reverseSortedIndexNameList, activeIndexNameObject)) {
+                    LOG.warn("Repository don't have base index:{} with product version same as active index:{}",
+                            activeIndexNameObject.getBaseName() + "-" + activeIndexNameObject.getProductVersion(), activeIndexNameObject.toString());
+                }
                 NodeState activeIndexNode = indexDefParentNode.getChildNode(PathUtils.getName(activeIndexNameObject.getNodeName()));
                 boolean isActiveIndexOldEnough = isActiveIndexOldEnough(activeIndexNameObject, activeIndexNode, purgeThresholdMillis);
                 int activeProductVersion = activeIndexNameObject.getProductVersion();
@@ -158,6 +162,12 @@ public class IndexVersionOperation {
         return indexVersionOperationList;
     }
 
+    private static boolean isSameProductVersionBaseIndexPresent(List<IndexName> reverseSortedIndexNameList, IndexName activeIndexNameObject) {
+        return reverseSortedIndexNameList.stream().filter(n -> (n.getBaseName().equals(activeIndexNameObject.getBaseName())
+                && n.getProductVersion() == activeIndexNameObject.getProductVersion()
+                && n.getCustomerVersion() == 0)).findFirst().isPresent();
+    }
+
     // iterate all indexes from high version to lower version to find the active index, then remove it from the reverseSortedIndexNameList
     private static IndexName getActiveIndex(List<IndexName> reverseSortedIndexNameList, String parentPath, NodeState rootNode) {
         for (int i = 0; i < reverseSortedIndexNameList.size(); i++) {
diff --git a/oak-run/src/test/java/org/apache/jackrabbit/oak/indexversion/PurgeOldIndexVersionTest.java b/oak-run/src/test/java/org/apache/jackrabbit/oak/indexversion/PurgeOldIndexVersionTest.java
index f461733bbb..c24851de51 100644
--- a/oak-run/src/test/java/org/apache/jackrabbit/oak/indexversion/PurgeOldIndexVersionTest.java
+++ b/oak-run/src/test/java/org/apache/jackrabbit/oak/indexversion/PurgeOldIndexVersionTest.java
@@ -238,7 +238,7 @@ public class PurgeOldIndexVersionTest extends AbstractIndexCommandTest {
 
             List<String> logs = custom.getLogs();
             assertThat("custom fooIndex don't have product version ", logs.toString(),
-                    containsString("IndexVersionOperation List is not valid for index"));
+                    containsString("Repository don't have base index:"));
         } finally {
             custom.finished();
         }