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 st...@apache.org on 2015/10/08 14:00:32 UTC
svn commit: r1707508 - in
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document:
ClusterNodeInfo.java DocumentDiscoveryLiteService.java
Author: stefanegli
Date: Thu Oct 8 12:00:32 2015
New Revision: 1707508
URL: http://svn.apache.org/viewvc?rev=1707508&view=rev
Log:
OAK-3492 : added a version-check to reduce number of warns
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentDiscoveryLiteService.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java?rev=1707508&r1=1707507&r2=1707508&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterNodeInfo.java Thu Oct 8 12:00:32 2015
@@ -57,7 +57,7 @@ public class ClusterNodeInfo {
/**
* The Oak version.
*/
- private static final String OAK_VERSION_KEY = "oakVersion";
+ static final String OAK_VERSION_KEY = "oakVersion";
/**
* The unique instance id within this machine (the current working directory
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentDiscoveryLiteService.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentDiscoveryLiteService.java?rev=1707508&r1=1707507&r2=1707508&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentDiscoveryLiteService.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentDiscoveryLiteService.java Thu Oct 8 12:00:32 2015
@@ -43,6 +43,7 @@ import org.apache.jackrabbit.oak.spi.com
import org.apache.jackrabbit.oak.spi.commit.Observer;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.osgi.framework.Version;
import org.osgi.service.component.ComponentContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -505,7 +506,25 @@ public class DocumentDiscoveryLiteServic
// interfere with normal (jcr) nodes at all).
String lastWrittenRootRevStr = clusterNode.getLastWrittenRootRev();
if (lastWrittenRootRevStr == null) {
- logger.warn("hasBacklog: node has lastWrittenRootRev=null");
+ boolean warn = false;
+ Object oakVersion = clusterNode.get(ClusterNodeInfo.OAK_VERSION_KEY);
+ if (oakVersion!=null && (oakVersion instanceof String)) {
+ try{
+ Version actual = Version.parseVersion((String) oakVersion);
+ Version introduced = Version.parseVersion("1.3.5");
+ if (actual.compareTo(introduced)>=0) {
+ warn = true;
+ }
+ } catch(Exception e) {
+ logger.debug("hasBacklog: couldn't parse version "+oakVersion+" : "+e);
+ warn = true;
+ }
+ }
+ if (warn) {
+ logger.warn("hasBacklog: node has lastWrittenRootRev=null");
+ } else {
+ logger.debug("hasBacklog: node has lastWrittenRootRev=null");
+ }
return false;
}
Revision lastWrittenRootRev = Revision.fromString(lastWrittenRootRevStr);