svn commit: r1837679 - /jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBeanImpl.java

[catholicon]

Author: catholicon
Date: Wed Aug  8 23:03:39 2018
New Revision: 1837679

URL: http://svn.apache.org/viewvc?rev=1837679&view=rev
Log:
OAK-7699: Active blob deletion fails on composite setups (follow up of OAK-7610)

Revert r1835198 which implemented a work-around in OAK-7610

Modified:
    
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBeanImpl.java

Modified: 
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBeanImpl.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBeanImpl.java?rev=1837679&r1=1837678&r2=1837679&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBeanImpl.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBeanImpl.java
 Wed Aug  8 23:03:39 2018
@@ -42,7 +42,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.management.openmbean.CompositeData;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Callable;
@@ -53,7 +52,6 @@ import java.util.stream.StreamSupport;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.collect.Iterables.transform;
-import static com.google.common.collect.Iterators.any;
 import static org.apache.jackrabbit.oak.api.Type.STRING;
 import static org.apache.jackrabbit.oak.api.jmx.IndexStatsMBean.STATUS_RUNNING;
 import static 
org.apache.jackrabbit.oak.commons.jmx.ManagementOperation.Status.failed;
@@ -321,26 +319,14 @@ public class ActiveDeletedBlobCollectorM
 
         try {
             List<CheckpointMBean> services = tracker.getServices();
-            if (services.isEmpty()) {
+            if (services.size() == 1) {
+                return services.get(0).getOldestCheckpointCreationTimestamp();
+            } else if (services.isEmpty()) {
                 LOG.warn("Unable to get checkpoint mbean. No service of 
required type found.");
                 return -1;
             } else {
-                // OAK-7610: Composite node store setups have 2 instances of 
CheckpointMBean:
-                // 1. registered via CompositeNodeStore
-                // 2. registered via global node store
-                // While it is still to be decided whether it's reasonable to 
have multiple instances
-                // of checkpoint bean - we are going to iterate over the beans 
and return oldest
-                // timestamp iff each of the bean reports the same oldest 
timestamp value. The reason
-                // it'd work, at least as of now, is that CompositeNodeStore 
implementation of checkpoint
-                // bean simply delegates to global store's implementation
-                Iterator<CheckpointMBean> beans = services.iterator();
-                long ret = beans.next().getOldestCheckpointCreationTimestamp();
-                if (any(beans, bean -> ret != 
bean.getOldestCheckpointCreationTimestamp())) {
-                    LOG.warn("Unable to get checkpoint mbean. Multiple 
services of required type found and not" +
-                            " all of them returned same value of oldest 
timestamp ({})", ret);
-                    return -1;
-                }
-                return ret;
+                LOG.warn("Unable to get checkpoint mbean. Multiple services of 
required type found.");
+                return -1;
             }
         } finally {
             tracker.stop();