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 2016/02/01 17:21:53 UTC
svn commit: r1727965 - in /jackrabbit/oak/trunk:
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/
oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/
oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/
Author: stefanegli
Date: Mon Feb 1 16:21:53 2016
New Revision: 1727965
URL: http://svn.apache.org/viewvc?rev=1727965&view=rev
Log:
OAK-3672 : discovery-lite no longer sets id for both tarmk and mongomk - instead upper layers need to be flexible enough to handle the case where the id is not set
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterView.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterViewTest.java
jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentDiscoveryLiteService.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterView.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterView.java?rev=1727965&r1=1727964&r2=1727965&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterView.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/ClusterView.java Mon Feb 1 16:21:53 2016
@@ -180,7 +180,7 @@ class ClusterView {
builder.object();
builder.key("seq").value(viewSeqNum);
builder.key("final").value(viewFinal);
- builder.key("id").value(clusterViewId);
+// builder.key("id").value(clusterViewId);
builder.key("me").value(localId);
builder.key("active").array();
for (Iterator<Integer> it = activeIds.iterator(); it.hasNext();) {
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterViewTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterViewTest.java?rev=1727965&r1=1727964&r2=1727965&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterViewTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/ClusterViewTest.java Mon Feb 1 16:21:53 2016
@@ -120,7 +120,7 @@ public class ClusterViewTest {
JsonObject o = asJsonObject(view);
Map<String, String> props = o.getProperties();
assertEquals("10", props.get("seq"));
- assertEquals(clusterViewId, unwrapString(props.get("id")));
+// assertEquals(clusterViewId, unwrapString(props.get("id")));
assertEquals("21", props.get("me"));
assertEquals(asJsonArray(21), props.get("active"));
assertEquals(asJsonArray(), props.get("deactivating"));
@@ -137,7 +137,7 @@ public class ClusterViewTest {
JsonObject o = asJsonObject(view);
Map<String, String> props = o.getProperties();
assertEquals("10", props.get("seq"));
- assertEquals(clusterViewId, unwrapString(props.get("id")));
+// assertEquals(clusterViewId, unwrapString(props.get("id")));
assertEquals("2", props.get("me"));
assertEquals(asJsonArray(2), props.get("active"));
assertEquals(asJsonArray(), props.get("deactivating"));
@@ -155,7 +155,7 @@ public class ClusterViewTest {
Map<String, String> props = o.getProperties();
assertEquals("10", props.get("seq"));
assertEquals("true", props.get("final"));
- assertEquals(clusterViewId, unwrapString(props.get("id")));
+// assertEquals(clusterViewId, unwrapString(props.get("id")));
assertEquals("2", props.get("me"));
assertEquals(asJsonArray(2, 5, 6), props.get("active"));
assertEquals(asJsonArray(), props.get("deactivating"));
@@ -173,7 +173,7 @@ public class ClusterViewTest {
Map<String, String> props = o.getProperties();
assertEquals("10", props.get("seq"));
assertEquals("true", props.get("final"));
- assertEquals(clusterViewId, unwrapString(props.get("id")));
+// assertEquals(clusterViewId, unwrapString(props.get("id")));
assertEquals("2", props.get("me"));
assertEquals(asJsonArray(2), props.get("active"));
assertEquals(asJsonArray(), props.get("deactivating"));
@@ -190,7 +190,7 @@ public class ClusterViewTest {
Map<String, String> props = o.getProperties();
assertEquals("10", props.get("seq"));
assertEquals("true", props.get("final"));
- assertEquals(clusterViewId, unwrapString(props.get("id")));
+// assertEquals(clusterViewId, unwrapString(props.get("id")));
assertEquals("2", props.get("me"));
assertEquals(asJsonArray(2, 3), props.get("active"));
assertEquals(asJsonArray(4), props.get("deactivating"));
@@ -206,7 +206,7 @@ public class ClusterViewTest {
JsonObject o = asJsonObject(view);
Map<String, String> props = o.getProperties();
assertEquals("10", props.get("seq"));
- assertEquals(clusterViewId, unwrapString(props.get("id")));
+// assertEquals(clusterViewId, unwrapString(props.get("id")));
assertEquals("2", props.get("me"));
assertEquals("false", props.get("final"));
assertEquals(asJsonArray(2, 3), props.get("active"));
Modified: jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentDiscoveryLiteService.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentDiscoveryLiteService.java?rev=1727965&r1=1727964&r2=1727965&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentDiscoveryLiteService.java (original)
+++ jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/SegmentDiscoveryLiteService.java Mon Feb 1 16:21:53 2016
@@ -122,8 +122,13 @@ public class SegmentDiscoveryLiteService
private String getClusterViewAsDescriptorValue() {
// since currently segment node store is not running in a cluster
// we can hard-code a single-vm descriptor here:
- // {"seq":4,"final":true,"id":"d8cb272f-28d8-4c2b-bacd-e8f20feec6db","me":1,"active":[1],"deactivating":[],"inactive":[2]}
- return "{\"seq\":1,\"final\":true,\"id\":\""+runtimeClusterId+"\",\"me\":1,\"active\":[1],\"deactivating\":[],\"inactive\":[]}";
+ // {"seq":4,"final":true,"me":1,"active":[1],"deactivating":[],"inactive":[2]}
+ // OAK-3672 : 'id' is now allowed to be null (supported by upper layers),
+ // and for tarMk we're doing exactly that (id==null) - indicating
+ // to upper layers that we're not really in a cluster and that
+ // this low level descriptor doesn't manage the 'cluster id'
+ // in such a case.
+ return "{\"seq\":1,\"final\":true,\"me\":1,\"active\":[1],\"deactivating\":[],\"inactive\":[]}";
}
/**