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 al...@apache.org on 2014/10/22 13:20:06 UTC
svn commit: r1633598 [1/2] - in /jackrabbit/oak/trunk:
oak-run/src/main/java/org/apache/jackrabbit/oak/run/ oak-tarmk-standby/
oak-tarmk-standby/osgi-conf/primary/ oak-tarmk-standby/osgi-conf/standby/
oak-tarmk-standby/src/main/java/org/apache/jackrabb...
Author: alexparvulescu
Date: Wed Oct 22 11:20:05 2014
New Revision: 1633598
URL: http://svn.apache.org/r1633598
Log:
OAK-1915 TarMK Cold Standby
- hopefully last round of renames for today
Added:
jackrabbit/oak/trunk/oak-tarmk-standby/osgi-conf/primary/org.apache.jackrabbit.oak.plugins.segment.standby.store.StandbyStoreService.config
- copied, changed from r1633596, jackrabbit/oak/trunk/oak-tarmk-standby/osgi-conf/primary/org.apache.jackrabbit.oak.plugins.segment.failover.store.FailoverStoreService.config
jackrabbit/oak/trunk/oak-tarmk-standby/osgi-conf/standby/org.apache.jackrabbit.oak.plugins.segment.standby.store.StandbyStoreService.config
- copied, changed from r1633571, jackrabbit/oak/trunk/oak-tarmk-standby/osgi-conf/standby/org.apache.jackrabbit.oak.plugins.segment.failover.store.FailoverStoreService.config
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/
- copied from r1633562, jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/client/
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClient.java
- copied, changed from r1633571, jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/client/FailoverClient.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClientHandler.java
- copied, changed from r1633562, jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/client/FailoverClientHandler.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/codec/
- copied from r1633562, jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/codec/
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/jmx/
- copied from r1633562, jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/jmx/
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/jmx/ClientStandbyStatusMBean.java
- copied, changed from r1633562, jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/jmx/ClientFailoverStatusMBean.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/jmx/StandbyStatusMBean.java
- copied, changed from r1633571, jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/jmx/FailoverStatusMBean.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/server/
- copied from r1633562, jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/server/
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/server/StandbyServer.java
- copied, changed from r1633562, jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/server/FailoverServer.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/server/StandbyServerHandler.java
- copied, changed from r1633562, jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/server/FailoverServerHandler.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/store/
- copied from r1633562, jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/store/
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/store/CommunicationObserver.java
- copied, changed from r1633562, jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/CommunicationObserver.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/store/StandbyStore.java
- copied, changed from r1633562, jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/store/FailoverStore.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/store/StandbyStoreService.java
- copied, changed from r1633562, jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/store/FailoverStoreService.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/
- copied from r1633562, jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/failover/
Removed:
jackrabbit/oak/trunk/oak-tarmk-standby/README.md
jackrabbit/oak/trunk/oak-tarmk-standby/osgi-conf/primary/org.apache.jackrabbit.oak.plugins.segment.failover.store.FailoverStoreService.config
jackrabbit/oak/trunk/oak-tarmk-standby/osgi-conf/standby/org.apache.jackrabbit.oak.plugins.segment.failover.store.FailoverStoreService.config
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/FailoverClient.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/FailoverClientHandler.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/jmx/ClientFailoverStatusMBean.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/jmx/FailoverStatusMBean.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/server/FailoverServer.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/server/FailoverServerHandler.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/store/FailoverStore.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/store/FailoverStoreService.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/failover/
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java
jackrabbit/oak/trunk/oak-tarmk-standby/pom.xml
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/FailedRequestListener.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/SegmentLoaderHandler.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/SegmentPreLoaderHandler.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/codec/Messages.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/codec/RecordIdDecoder.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/codec/RecordIdEncoder.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/codec/SegmentDecoder.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/codec/SegmentEncoder.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/codec/SegmentReply.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/jmx/ObservablePartnerMBean.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/store/RemoteSegmentLoader.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/main/resources/OSGI-INF/metatype/metatype.properties
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BrokenNetworkTest.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BulkTest.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverIPRangeTest.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverMultipleClientsTest.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverSslTest.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverTest.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/MBeanTest.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/RecoverTest.java
jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java
Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java?rev=1633598&r1=1633597&r2=1633598&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java Wed Oct 22 11:20:05 2014
@@ -89,9 +89,9 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.segment.SegmentId;
import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeState;
import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
-import org.apache.jackrabbit.oak.plugins.segment.failover.client.FailoverClient;
-import org.apache.jackrabbit.oak.plugins.segment.failover.server.FailoverServer;
import org.apache.jackrabbit.oak.plugins.segment.file.FileStore;
+import org.apache.jackrabbit.oak.plugins.segment.standby.client.StandbyClient;
+import org.apache.jackrabbit.oak.plugins.segment.standby.server.StandbyServer;
import org.apache.jackrabbit.oak.scalability.ScalabilityRunner;
import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
@@ -248,10 +248,10 @@ public class Main {
//TODO react to state changes of FailoverClient (triggered via JMX), once the state model of FailoverClient is complete.
private static class ScheduledSyncService extends AbstractScheduledService {
- private final FailoverClient failoverClient;
+ private final StandbyClient failoverClient;
private final int interval;
- public ScheduledSyncService(FailoverClient failoverClient, int interval) {
+ public ScheduledSyncService(StandbyClient failoverClient, int interval) {
this.failoverClient = failoverClient;
this.interval = interval;
}
@@ -295,10 +295,10 @@ public class Main {
}
FileStore store = null;
- FailoverClient failoverClient = null;
+ StandbyClient failoverClient = null;
try {
store = new FileStore(new File(nonOptions.get(0)), 256);
- failoverClient = new FailoverClient(
+ failoverClient = new StandbyClient(
options.has(host)? options.valueOf(host) : defaultHost,
options.has(port)? options.valueOf(port) : defaultPort,
store,
@@ -348,10 +348,10 @@ public class Main {
List<String> admissibleSlaves = options.has(admissible) ? options.valuesOf(admissible) : Collections.EMPTY_LIST;
FileStore store = null;
- FailoverServer failoverServer = null;
+ StandbyServer failoverServer = null;
try {
store = new FileStore(new File(nonOptions.get(0)), 256);
- failoverServer = new FailoverServer(
+ failoverServer = new StandbyServer(
options.has(port)? options.valueOf(port) : defaultPort,
store,
admissibleSlaves.toArray(new String[0]),
Copied: jackrabbit/oak/trunk/oak-tarmk-standby/osgi-conf/primary/org.apache.jackrabbit.oak.plugins.segment.standby.store.StandbyStoreService.config (from r1633596, jackrabbit/oak/trunk/oak-tarmk-standby/osgi-conf/primary/org.apache.jackrabbit.oak.plugins.segment.failover.store.FailoverStoreService.config)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/osgi-conf/primary/org.apache.jackrabbit.oak.plugins.segment.standby.store.StandbyStoreService.config?p2=jackrabbit/oak/trunk/oak-tarmk-standby/osgi-conf/primary/org.apache.jackrabbit.oak.plugins.segment.standby.store.StandbyStoreService.config&p1=jackrabbit/oak/trunk/oak-tarmk-standby/osgi-conf/primary/org.apache.jackrabbit.oak.plugins.segment.failover.store.FailoverStoreService.config&r1=1633596&r2=1633598&rev=1633598&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/osgi-conf/primary/org.apache.jackrabbit.oak.plugins.segment.failover.store.FailoverStoreService.config (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/osgi-conf/primary/org.apache.jackrabbit.oak.plugins.segment.standby.store.StandbyStoreService.config Wed Oct 22 11:20:05 2014
@@ -1,5 +1,5 @@
org.apache.sling.installer.configuration.persist=B"false"
-mode="master"
+mode="primary"
port=I"8023"
-master.allowed-client-ip-ranges=["0.0.0.0-255.255.255.255"]
+primary.allowed-client-ip-ranges=["0.0.0.0-255.255.255.255"]
secure=B"false"
\ No newline at end of file
Copied: jackrabbit/oak/trunk/oak-tarmk-standby/osgi-conf/standby/org.apache.jackrabbit.oak.plugins.segment.standby.store.StandbyStoreService.config (from r1633571, jackrabbit/oak/trunk/oak-tarmk-standby/osgi-conf/standby/org.apache.jackrabbit.oak.plugins.segment.failover.store.FailoverStoreService.config)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/osgi-conf/standby/org.apache.jackrabbit.oak.plugins.segment.standby.store.StandbyStoreService.config?p2=jackrabbit/oak/trunk/oak-tarmk-standby/osgi-conf/standby/org.apache.jackrabbit.oak.plugins.segment.standby.store.StandbyStoreService.config&p1=jackrabbit/oak/trunk/oak-tarmk-standby/osgi-conf/standby/org.apache.jackrabbit.oak.plugins.segment.failover.store.FailoverStoreService.config&r1=1633571&r2=1633598&rev=1633598&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/osgi-conf/standby/org.apache.jackrabbit.oak.plugins.segment.failover.store.FailoverStoreService.config (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/osgi-conf/standby/org.apache.jackrabbit.oak.plugins.segment.standby.store.StandbyStoreService.config Wed Oct 22 11:20:05 2014
@@ -1,6 +1,6 @@
org.apache.sling.installer.configuration.persist=B"false"
-mode="slave"
-master.host="127.0.0.1"
+mode="standby"
+primary.host="127.0.0.1"
port=I"8023"
secure=B"false"
interval=I"5"
\ No newline at end of file
Modified: jackrabbit/oak/trunk/oak-tarmk-standby/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/pom.xml?rev=1633598&r1=1633597&r2=1633598&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/pom.xml Wed Oct 22 11:20:05 2014
@@ -52,6 +52,7 @@
*
</Import-Package>
<Embed-Dependency>netty-*;inline=true</Embed-Dependency>
+ <Export-Package>!org.apache.jackrabbit.oak.plugins.segment.standby.*</Export-Package>
</instructions>
</configuration>
</plugin>
@@ -101,8 +102,8 @@
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludes>
- <exclude>osgi-conf/primary/org.apache.jackrabbit.oak.plugins.segment.failover.store.FailoverStoreService.config</exclude>
- <exclude>osgi-conf/standby/org.apache.jackrabbit.oak.plugins.segment.failover.store.FailoverStoreService.config</exclude>
+ <exclude>osgi-conf/primary/org.apache.jackrabbit.oak.plugins.segment.standby.store.StandbyStoreService.config</exclude>
+ <exclude>osgi-conf/standby/org.apache.jackrabbit.oak.plugins.segment.standby.store.StandbyStoreService.config</exclude>
<exclude>osgi-conf/standby/org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService.config</exclude>
</excludes>
</configuration>
Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/FailedRequestListener.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/FailedRequestListener.java?rev=1633598&r1=1633562&r2=1633598&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/FailedRequestListener.java (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/FailedRequestListener.java Wed Oct 22 11:20:05 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.plugins.segment.failover.client;
+package org.apache.jackrabbit.oak.plugins.segment.standby.client;
import io.netty.channel.ChannelFuture;
import io.netty.channel.ChannelFutureListener;
Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/SegmentLoaderHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/SegmentLoaderHandler.java?rev=1633598&r1=1633562&r2=1633598&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/SegmentLoaderHandler.java (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/SegmentLoaderHandler.java Wed Oct 22 11:20:05 2014
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.plugins.segment.failover.client;
+package org.apache.jackrabbit.oak.plugins.segment.standby.client;
-import static org.apache.jackrabbit.oak.plugins.segment.failover.codec.Messages.newGetSegmentReq;
+import static org.apache.jackrabbit.oak.plugins.segment.standby.codec.Messages.newGetSegmentReq;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter;
import io.netty.util.concurrent.EventExecutorGroup;
@@ -34,9 +34,9 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeBuilder;
import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeState;
import org.apache.jackrabbit.oak.plugins.segment.SegmentNotFoundException;
-import org.apache.jackrabbit.oak.plugins.segment.failover.codec.SegmentReply;
-import org.apache.jackrabbit.oak.plugins.segment.failover.store.FailoverStore;
-import org.apache.jackrabbit.oak.plugins.segment.failover.store.RemoteSegmentLoader;
+import org.apache.jackrabbit.oak.plugins.segment.standby.codec.SegmentReply;
+import org.apache.jackrabbit.oak.plugins.segment.standby.store.StandbyStore;
+import org.apache.jackrabbit.oak.plugins.segment.standby.store.RemoteSegmentLoader;
import org.apache.jackrabbit.oak.spi.state.ApplyDiff;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -47,7 +47,7 @@ public class SegmentLoaderHandler extend
private static final Logger log = LoggerFactory
.getLogger(SegmentLoaderHandler.class);
- private final FailoverStore store;
+ private final StandbyStore store;
private final String clientID;
private final RecordId head;
private final EventExecutorGroup preloaderExecutor;
@@ -59,7 +59,7 @@ public class SegmentLoaderHandler extend
final BlockingQueue<Segment> segment = new LinkedBlockingQueue<Segment>();
- public SegmentLoaderHandler(final FailoverStore store, RecordId head,
+ public SegmentLoaderHandler(final StandbyStore store, RecordId head,
EventExecutorGroup preloaderExecutor,
EventExecutorGroup loaderExecutor,
String clientID) {
@@ -102,11 +102,11 @@ public class SegmentLoaderHandler extend
}
catch (SegmentNotFoundException e) {
// the segment is locally damaged or not present anymore
- // lets try to read this from the master again
+ // lets try to read this from the primary again
String id = e.getSegmentId();
Segment s = readSegment(e.getSegmentId());
if (s == null) {
- log.warn("can't read locally corrupt segment " + id + " from master");
+ log.warn("can't read locally corrupt segment " + id + " from primary");
throw e;
}
Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/SegmentPreLoaderHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/SegmentPreLoaderHandler.java?rev=1633598&r1=1633562&r2=1633598&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/SegmentPreLoaderHandler.java (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/SegmentPreLoaderHandler.java Wed Oct 22 11:20:05 2014
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.plugins.segment.failover.client;
+package org.apache.jackrabbit.oak.plugins.segment.standby.client;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.SimpleChannelInboundHandler;
import org.apache.jackrabbit.oak.plugins.segment.Segment;
-import org.apache.jackrabbit.oak.plugins.segment.failover.codec.SegmentReply;
+import org.apache.jackrabbit.oak.plugins.segment.standby.codec.SegmentReply;
public class SegmentPreLoaderHandler extends
SimpleChannelInboundHandler<Segment> {
Copied: jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClient.java (from r1633571, jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/client/FailoverClient.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClient.java?p2=jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClient.java&p1=jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/client/FailoverClient.java&r1=1633571&r2=1633598&rev=1633598&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/client/FailoverClient.java (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClient.java Wed Oct 22 11:20:05 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.plugins.segment.failover.client;
+package org.apache.jackrabbit.oak.plugins.segment.standby.client;
import io.netty.bootstrap.Bootstrap;
import io.netty.channel.ChannelFuture;
@@ -42,11 +42,11 @@ import java.util.UUID;
import java.util.concurrent.TimeUnit;
import org.apache.jackrabbit.oak.plugins.segment.SegmentStore;
-import org.apache.jackrabbit.oak.plugins.segment.failover.CommunicationObserver;
-import org.apache.jackrabbit.oak.plugins.segment.failover.jmx.ClientFailoverStatusMBean;
-import org.apache.jackrabbit.oak.plugins.segment.failover.jmx.FailoverStatusMBean;
-import org.apache.jackrabbit.oak.plugins.segment.failover.codec.RecordIdDecoder;
-import org.apache.jackrabbit.oak.plugins.segment.failover.store.FailoverStore;
+import org.apache.jackrabbit.oak.plugins.segment.standby.codec.RecordIdDecoder;
+import org.apache.jackrabbit.oak.plugins.segment.standby.jmx.ClientStandbyStatusMBean;
+import org.apache.jackrabbit.oak.plugins.segment.standby.jmx.StandbyStatusMBean;
+import org.apache.jackrabbit.oak.plugins.segment.standby.store.CommunicationObserver;
+import org.apache.jackrabbit.oak.plugins.segment.standby.store.StandbyStore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -55,19 +55,19 @@ import javax.management.ObjectName;
import javax.management.StandardMBean;
import javax.net.ssl.SSLException;
-public final class FailoverClient implements ClientFailoverStatusMBean, Runnable, Closeable {
+public final class StandbyClient implements ClientStandbyStatusMBean, Runnable, Closeable {
public static final String CLIENT_ID_PROPERTY_NAME = "standbyID";
private static final Logger log = LoggerFactory
- .getLogger(FailoverClient.class);
+ .getLogger(StandbyClient.class);
private final String host;
private final int port;
private int readTimeoutMs = 10000;
- private final FailoverStore store;
+ private final StandbyStore store;
private final CommunicationObserver observer;
- private FailoverClientHandler handler;
+ private StandbyClientHandler handler;
private EventLoopGroup group;
private EventExecutorGroup executor;
private SslContext sslContext;
@@ -78,11 +78,11 @@ public final class FailoverClient implem
private volatile String state;
private final Object sync = new Object();
- public FailoverClient(String host, int port, SegmentStore store) throws SSLException {
+ public StandbyClient(String host, int port, SegmentStore store) throws SSLException {
this(host, port, store, false);
}
- public FailoverClient(String host, int port, SegmentStore store, boolean secure) throws SSLException {
+ public StandbyClient(String host, int port, SegmentStore store, boolean secure) throws SSLException {
this.state = STATUS_INITIALIZING;
this.lastSuccessfulRequest = -1;
this.failedRequests = 0;
@@ -91,21 +91,21 @@ public final class FailoverClient implem
if (secure) {
this.sslContext = SslContext.newClientContext(InsecureTrustManagerFactory.INSTANCE);
}
- this.store = new FailoverStore(store);
+ this.store = new StandbyStore(store);
String s = System.getProperty(CLIENT_ID_PROPERTY_NAME);
this.observer = new CommunicationObserver((s == null || s.length() == 0) ? UUID.randomUUID().toString() : s);
final MBeanServer jmxServer = ManagementFactory.getPlatformMBeanServer();
try {
- jmxServer.registerMBean(new StandardMBean(this, ClientFailoverStatusMBean.class), new ObjectName(this.getMBeanName()));
+ jmxServer.registerMBean(new StandardMBean(this, ClientStandbyStatusMBean.class), new ObjectName(this.getMBeanName()));
}
catch (Exception e) {
- log.error("can register failover status mbean", e);
+ log.error("can register standby status mbean", e);
}
}
public String getMBeanName() {
- return FailoverStatusMBean.JMX_NAME + ",id=\"" + this.observer.getID() + "\"";
+ return StandbyStatusMBean.JMX_NAME + ",id=\"" + this.observer.getID() + "\"";
}
public void close() {
@@ -116,7 +116,7 @@ public final class FailoverClient implem
jmxServer.unregisterMBean(new ObjectName(this.getMBeanName()));
}
catch (Exception e) {
- log.error("can unregister failover status mbean", e);
+ log.error("can unregister standby status mbean", e);
}
observer.unregister();
shutdownNetty();
@@ -132,7 +132,7 @@ public final class FailoverClient implem
}
state = STATUS_STARTING;
executor = new DefaultEventExecutorGroup(4);
- handler = new FailoverClientHandler(this.store, executor, this.observer);
+ handler = new StandbyClientHandler(this.store, executor, this.observer);
group = new NioEventLoopGroup();
b = new Bootstrap();
Copied: jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClientHandler.java (from r1633562, jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/client/FailoverClientHandler.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClientHandler.java?p2=jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClientHandler.java&p1=jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/client/FailoverClientHandler.java&r1=1633562&r2=1633598&rev=1633598&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/client/FailoverClientHandler.java (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/client/StandbyClientHandler.java Wed Oct 22 11:20:05 2014
@@ -16,10 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.plugins.segment.failover.client;
-
-import static org.apache.jackrabbit.oak.plugins.segment.failover.codec.Messages.newGetHeadReq;
+package org.apache.jackrabbit.oak.plugins.segment.standby.client;
+import static org.apache.jackrabbit.oak.plugins.segment.standby.codec.Messages.newGetHeadReq;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.SimpleChannelInboundHandler;
import io.netty.util.concurrent.DefaultEventExecutorGroup;
@@ -29,20 +28,20 @@ import java.io.Closeable;
import java.util.concurrent.TimeUnit;
import org.apache.jackrabbit.oak.plugins.segment.RecordId;
-import org.apache.jackrabbit.oak.plugins.segment.failover.CommunicationObserver;
-import org.apache.jackrabbit.oak.plugins.segment.failover.codec.RecordIdDecoder;
-import org.apache.jackrabbit.oak.plugins.segment.failover.codec.SegmentDecoder;
-import org.apache.jackrabbit.oak.plugins.segment.failover.store.FailoverStore;
+import org.apache.jackrabbit.oak.plugins.segment.standby.codec.RecordIdDecoder;
+import org.apache.jackrabbit.oak.plugins.segment.standby.codec.SegmentDecoder;
+import org.apache.jackrabbit.oak.plugins.segment.standby.store.CommunicationObserver;
+import org.apache.jackrabbit.oak.plugins.segment.standby.store.StandbyStore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class FailoverClientHandler extends
+public class StandbyClientHandler extends
SimpleChannelInboundHandler<RecordId> implements Closeable {
private static final Logger log = LoggerFactory
- .getLogger(FailoverClientHandler.class);
+ .getLogger(StandbyClientHandler.class);
- private final FailoverStore store;
+ private final StandbyStore store;
private final EventExecutorGroup executor;
private final CommunicationObserver observer;
private EventExecutorGroup preloaderExecutor;
@@ -50,7 +49,7 @@ public class FailoverClientHandler exten
private ChannelHandlerContext ctx;
- public FailoverClientHandler(final FailoverStore store,
+ public StandbyClientHandler(final StandbyStore store,
EventExecutorGroup executor, CommunicationObserver observer) {
this.store = store;
this.executor = executor;
Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/codec/Messages.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/codec/Messages.java?rev=1633598&r1=1633562&r2=1633598&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/codec/Messages.java (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/codec/Messages.java Wed Oct 22 11:20:05 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.plugins.segment.failover.codec;
+package org.apache.jackrabbit.oak.plugins.segment.standby.codec;
public class Messages {
@@ -26,7 +26,7 @@ public class Messages {
public static final String GET_HEAD = "h";
public static final String GET_SEGMENT = "s.";
- private static final String MAGIC = "FailOver-CMD@";
+ private static final String MAGIC = "Standby-CMD@";
private static final String SEPARATOR = ":";
private static String newRequest(String clientID, String body) {
Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/codec/RecordIdDecoder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/codec/RecordIdDecoder.java?rev=1633598&r1=1633562&r2=1633598&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/codec/RecordIdDecoder.java (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/codec/RecordIdDecoder.java Wed Oct 22 11:20:05 2014
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.jackrabbit.oak.plugins.segment.failover.codec;
+package org.apache.jackrabbit.oak.plugins.segment.standby.codec;
import java.io.IOException;
Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/codec/RecordIdEncoder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/codec/RecordIdEncoder.java?rev=1633598&r1=1633562&r2=1633598&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/codec/RecordIdEncoder.java (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/codec/RecordIdEncoder.java Wed Oct 22 11:20:05 2014
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.jackrabbit.oak.plugins.segment.failover.codec;
+package org.apache.jackrabbit.oak.plugins.segment.standby.codec;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/codec/SegmentDecoder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/codec/SegmentDecoder.java?rev=1633598&r1=1633562&r2=1633598&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/codec/SegmentDecoder.java (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/codec/SegmentDecoder.java Wed Oct 22 11:20:05 2014
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.jackrabbit.oak.plugins.segment.failover.codec;
+package org.apache.jackrabbit.oak.plugins.segment.standby.codec;
-import static org.apache.jackrabbit.oak.plugins.segment.failover.codec.SegmentEncoder.EXTRA_HEADERS_LEN;
+import static org.apache.jackrabbit.oak.plugins.segment.standby.codec.SegmentEncoder.EXTRA_HEADERS_LEN;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/codec/SegmentEncoder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/codec/SegmentEncoder.java?rev=1633598&r1=1633562&r2=1633598&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/codec/SegmentEncoder.java (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/codec/SegmentEncoder.java Wed Oct 22 11:20:05 2014
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.jackrabbit.oak.plugins.segment.failover.codec;
+package org.apache.jackrabbit.oak.plugins.segment.standby.codec;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/codec/SegmentReply.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/codec/SegmentReply.java?rev=1633598&r1=1633562&r2=1633598&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/codec/SegmentReply.java (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/codec/SegmentReply.java Wed Oct 22 11:20:05 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.segment.failover.codec;
+package org.apache.jackrabbit.oak.plugins.segment.standby.codec;
import org.apache.jackrabbit.oak.plugins.segment.Segment;
Copied: jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/jmx/ClientStandbyStatusMBean.java (from r1633562, jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/jmx/ClientFailoverStatusMBean.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/jmx/ClientStandbyStatusMBean.java?p2=jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/jmx/ClientStandbyStatusMBean.java&p1=jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/jmx/ClientFailoverStatusMBean.java&r1=1633562&r2=1633598&rev=1633598&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/jmx/ClientFailoverStatusMBean.java (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/jmx/ClientStandbyStatusMBean.java Wed Oct 22 11:20:05 2014
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.segment.failover.jmx;
+package org.apache.jackrabbit.oak.plugins.segment.standby.jmx;
import org.apache.jackrabbit.oak.commons.jmx.Description;
-public interface ClientFailoverStatusMBean extends FailoverStatusMBean {
+public interface ClientStandbyStatusMBean extends StandbyStatusMBean {
@Description("number of consecutive failed requests")
int getFailedRequests();
Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/jmx/ObservablePartnerMBean.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/jmx/ObservablePartnerMBean.java?rev=1633598&r1=1633562&r2=1633598&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/jmx/ObservablePartnerMBean.java (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/jmx/ObservablePartnerMBean.java Wed Oct 22 11:20:05 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.segment.failover.jmx;
+package org.apache.jackrabbit.oak.plugins.segment.standby.jmx;
import org.apache.jackrabbit.oak.commons.jmx.Description;
Copied: jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/jmx/StandbyStatusMBean.java (from r1633571, jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/jmx/FailoverStatusMBean.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/jmx/StandbyStatusMBean.java?p2=jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/jmx/StandbyStatusMBean.java&p1=jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/jmx/FailoverStatusMBean.java&r1=1633571&r2=1633598&rev=1633598&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/jmx/FailoverStatusMBean.java (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/jmx/StandbyStatusMBean.java Wed Oct 22 11:20:05 2014
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.segment.failover.jmx;
+package org.apache.jackrabbit.oak.plugins.segment.standby.jmx;
import org.apache.jackrabbit.oak.commons.jmx.Description;
import javax.annotation.Nonnull;
-public interface FailoverStatusMBean {
+public interface StandbyStatusMBean {
public static final String JMX_NAME = "org.apache.jackrabbit.oak:name=Status,type=\"Standby\"";
public static final String STATUS_INITIALIZING = "initializing";
public static final String STATUS_STOPPED = "stopped";
@@ -30,7 +30,7 @@ public interface FailoverStatusMBean {
public static final String STATUS_CLOSED = "closed";
@Nonnull
- @Description("master or client")
+ @Description("primary or standby")
String getMode();
@Description("current status of the service")
@@ -39,9 +39,9 @@ public interface FailoverStatusMBean {
@Description("instance is running")
boolean isRunning();
- @Description("stop the failover communication")
+ @Description("stop the communication")
void stop();
- @Description("start the failover communication")
+ @Description("start the communication")
void start();
}
Copied: jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/server/StandbyServer.java (from r1633562, jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/server/FailoverServer.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/server/StandbyServer.java?p2=jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/server/StandbyServer.java&p1=jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/server/FailoverServer.java&r1=1633562&r2=1633598&rev=1633598&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/server/FailoverServer.java (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/server/StandbyServer.java Wed Oct 22 11:20:05 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.plugins.segment.failover.server;
+package org.apache.jackrabbit.oak.plugins.segment.standby.server;
import io.netty.bootstrap.ServerBootstrap;
import io.netty.channel.ChannelFuture;
@@ -40,11 +40,12 @@ import java.security.cert.CertificateExc
import java.util.concurrent.TimeUnit;
import io.netty.util.concurrent.Future;
+
import org.apache.jackrabbit.oak.plugins.segment.SegmentStore;
-import org.apache.jackrabbit.oak.plugins.segment.failover.CommunicationObserver;
-import org.apache.jackrabbit.oak.plugins.segment.failover.jmx.FailoverStatusMBean;
-import org.apache.jackrabbit.oak.plugins.segment.failover.codec.RecordIdEncoder;
-import org.apache.jackrabbit.oak.plugins.segment.failover.codec.SegmentEncoder;
+import org.apache.jackrabbit.oak.plugins.segment.standby.codec.RecordIdEncoder;
+import org.apache.jackrabbit.oak.plugins.segment.standby.codec.SegmentEncoder;
+import org.apache.jackrabbit.oak.plugins.segment.standby.jmx.StandbyStatusMBean;
+import org.apache.jackrabbit.oak.plugins.segment.standby.store.CommunicationObserver;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -53,10 +54,10 @@ import javax.management.ObjectName;
import javax.management.StandardMBean;
import javax.net.ssl.SSLException;
-public class FailoverServer implements FailoverStatusMBean, Closeable {
+public class StandbyServer implements StandbyStatusMBean, Closeable {
private static final Logger log = LoggerFactory
- .getLogger(FailoverServer.class);
+ .getLogger(StandbyServer.class);
private final int port;
@@ -64,27 +65,27 @@ public class FailoverServer implements F
private final EventLoopGroup workerGroup;
private final ServerBootstrap b;
private final CommunicationObserver observer;
- private final FailoverServerHandler handler;
+ private final StandbyServerHandler handler;
private SslContext sslContext;
private ChannelFuture channelFuture;
private boolean running;
- public FailoverServer(int port, final SegmentStore store)
+ public StandbyServer(int port, final SegmentStore store)
throws CertificateException, SSLException {
this(port, store, null, false);
}
- public FailoverServer(int port, final SegmentStore store, boolean secure)
+ public StandbyServer(int port, final SegmentStore store, boolean secure)
throws CertificateException, SSLException {
this(port, store, null, secure);
}
- public FailoverServer(int port, final SegmentStore store, String[] allowedClientIPRanges)
+ public StandbyServer(int port, final SegmentStore store, String[] allowedClientIPRanges)
throws CertificateException, SSLException {
this(port, store, allowedClientIPRanges, false);
}
- public FailoverServer(int port, final SegmentStore store, String[] allowedClientIPRanges, boolean secure)
+ public StandbyServer(int port, final SegmentStore store, String[] allowedClientIPRanges, boolean secure)
throws CertificateException, SSLException {
this.port = port;
@@ -93,17 +94,17 @@ public class FailoverServer implements F
sslContext = SslContext.newServerContext(ssc.certificate(), ssc.privateKey());
}
- observer = new CommunicationObserver("master");
- handler = new FailoverServerHandler(store, observer, allowedClientIPRanges);
+ observer = new CommunicationObserver("primary");
+ handler = new StandbyServerHandler(store, observer, allowedClientIPRanges);
bossGroup = new NioEventLoopGroup(1);
workerGroup = new NioEventLoopGroup();
final MBeanServer jmxServer = ManagementFactory.getPlatformMBeanServer();
try {
- jmxServer.registerMBean(new StandardMBean(this, FailoverStatusMBean.class), new ObjectName(this.getMBeanName()));
+ jmxServer.registerMBean(new StandardMBean(this, StandbyStatusMBean.class), new ObjectName(this.getMBeanName()));
}
catch (Exception e) {
- log.error("can't register failover status mbean", e);
+ log.error("can't register standby status mbean", e);
}
b = new ServerBootstrap();
@@ -134,7 +135,7 @@ public class FailoverServer implements F
}
public String getMBeanName() {
- return FailoverStatusMBean.JMX_NAME + ",id=" + this.port;
+ return StandbyStatusMBean.JMX_NAME + ",id=" + this.port;
}
public void close() {
@@ -146,7 +147,7 @@ public class FailoverServer implements F
jmxServer.unregisterMBean(new ObjectName(this.getMBeanName()));
}
catch (Exception e) {
- log.error("can unregister failover status mbean", e);
+ log.error("can unregister standby status mbean", e);
}
if (bossGroup != null && !bossGroup.isShuttingDown()) {
bossGroup.shutdownGracefully(1, 2, TimeUnit.SECONDS).syncUninterruptibly();
@@ -170,7 +171,7 @@ public class FailoverServer implements F
running = true;
channelFuture.sync().channel().closeFuture().sync();
} catch (InterruptedException e) {
- FailoverServer.this.stop();
+ StandbyServer.this.stop();
}
}
};
@@ -187,7 +188,7 @@ public class FailoverServer implements F
}
});
if (!startup.awaitUninterruptibly(10000)) {
- log.error("FailoverServer failed to start within 10 seconds and will be canceled");
+ log.error("Server failed to start within 10 seconds and will be canceled");
startup.cancel(true);
} else if (wait) {
try {
@@ -207,7 +208,7 @@ public class FailoverServer implements F
@Override
public String getMode() {
- return "master";
+ return "primary";
}
@Override
Copied: jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/server/StandbyServerHandler.java (from r1633562, jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/server/FailoverServerHandler.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/server/StandbyServerHandler.java?p2=jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/server/StandbyServerHandler.java&p1=jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/server/FailoverServerHandler.java&r1=1633562&r2=1633598&rev=1633598&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/server/FailoverServerHandler.java (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/server/StandbyServerHandler.java Wed Oct 22 11:20:05 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.plugins.segment.failover.server;
+package org.apache.jackrabbit.oak.plugins.segment.standby.server;
import java.net.InetAddress;
import java.net.InetSocketAddress;
@@ -33,23 +33,23 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.segment.Segment;
import org.apache.jackrabbit.oak.plugins.segment.SegmentId;
import org.apache.jackrabbit.oak.plugins.segment.SegmentStore;
-import org.apache.jackrabbit.oak.plugins.segment.failover.CommunicationObserver;
-import org.apache.jackrabbit.oak.plugins.segment.failover.codec.Messages;
+import org.apache.jackrabbit.oak.plugins.segment.standby.codec.Messages;
+import org.apache.jackrabbit.oak.plugins.segment.standby.store.CommunicationObserver;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Sharable
-public class FailoverServerHandler extends SimpleChannelInboundHandler<String> {
+public class StandbyServerHandler extends SimpleChannelInboundHandler<String> {
private static final Logger log = LoggerFactory
- .getLogger(FailoverServerHandler.class);
+ .getLogger(StandbyServerHandler.class);
private final SegmentStore store;
private final CommunicationObserver observer;
private final String[] allowedIPRanges;
public String state;
- public FailoverServerHandler(SegmentStore store, CommunicationObserver observer, String[] allowedIPRanges) {
+ public StandbyServerHandler(SegmentStore store, CommunicationObserver observer, String[] allowedIPRanges) {
this.store = store;
this.observer = observer;
this.allowedIPRanges = allowedIPRanges;
Copied: jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/store/CommunicationObserver.java (from r1633562, jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/CommunicationObserver.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/store/CommunicationObserver.java?p2=jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/store/CommunicationObserver.java&p1=jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/CommunicationObserver.java&r1=1633562&r2=1633598&rev=1633598&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/CommunicationObserver.java (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/store/CommunicationObserver.java Wed Oct 22 11:20:05 2014
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.plugins.segment.failover;
+package org.apache.jackrabbit.oak.plugins.segment.standby.store;
-import org.apache.jackrabbit.oak.plugins.segment.failover.jmx.FailoverStatusMBean;
-import org.apache.jackrabbit.oak.plugins.segment.failover.jmx.ObservablePartnerMBean;
+import org.apache.jackrabbit.oak.plugins.segment.standby.jmx.StandbyStatusMBean;
+import org.apache.jackrabbit.oak.plugins.segment.standby.jmx.ObservablePartnerMBean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -31,7 +31,6 @@ import javax.management.StandardMBean;
import java.lang.management.ManagementFactory;
import java.net.InetSocketAddress;
-
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -51,7 +50,7 @@ public class CommunicationObserver {
public CommunicationPartnerMBean(String clientName) throws MalformedObjectNameException {
this.clientName = clientName;
- this.mbeanName = new ObjectName(FailoverStatusMBean.JMX_NAME + ",id=\"Client " + clientName + "\"");
+ this.mbeanName = new ObjectName(StandbyStatusMBean.JMX_NAME + ",id=\"Client " + clientName + "\"");
}
public ObjectName getMBeanName() {
Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/store/RemoteSegmentLoader.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/store/RemoteSegmentLoader.java?rev=1633598&r1=1633562&r2=1633598&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/store/RemoteSegmentLoader.java (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/store/RemoteSegmentLoader.java Wed Oct 22 11:20:05 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.segment.failover.store;
+package org.apache.jackrabbit.oak.plugins.segment.standby.store;
import org.apache.jackrabbit.oak.plugins.segment.Segment;
Copied: jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/store/StandbyStore.java (from r1633562, jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/store/FailoverStore.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/store/StandbyStore.java?p2=jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/store/StandbyStore.java&p1=jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/store/FailoverStore.java&r1=1633562&r2=1633598&rev=1633598&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/store/FailoverStore.java (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/store/StandbyStore.java Wed Oct 22 11:20:05 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.segment.failover.store;
+package org.apache.jackrabbit.oak.plugins.segment.standby.store;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -33,8 +33,8 @@ import org.apache.jackrabbit.oak.spi.blo
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class FailoverStore implements SegmentStore {
- private static final Logger log = LoggerFactory.getLogger(FailoverStore.class);
+public class StandbyStore implements SegmentStore {
+ private static final Logger log = LoggerFactory.getLogger(StandbyStore.class);
private final SegmentTracker tracker = new SegmentTracker(this);
@@ -42,7 +42,7 @@ public class FailoverStore implements Se
private RemoteSegmentLoader loader;
- public FailoverStore(SegmentStore delegate) {
+ public StandbyStore(SegmentStore delegate) {
this.delegate = delegate;
}
Copied: jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/store/StandbyStoreService.java (from r1633562, jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/store/FailoverStoreService.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/store/StandbyStoreService.java?p2=jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/store/StandbyStoreService.java&p1=jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/store/FailoverStoreService.java&r1=1633562&r2=1633598&rev=1633598&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/failover/store/FailoverStoreService.java (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/main/java/org/apache/jackrabbit/oak/plugins/segment/standby/store/StandbyStoreService.java Wed Oct 22 11:20:05 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.plugins.segment.failover.store;
+package org.apache.jackrabbit.oak.plugins.segment.standby.store;
import static java.lang.String.valueOf;
import static org.apache.felix.scr.annotations.ReferencePolicy.STATIC;
@@ -37,27 +37,26 @@ import org.apache.felix.scr.annotations.
import org.apache.jackrabbit.oak.commons.PropertiesUtil;
import org.apache.jackrabbit.oak.plugins.segment.SegmentStoreProvider;
import org.apache.jackrabbit.oak.plugins.segment.SegmentStore;
-import org.apache.jackrabbit.oak.plugins.segment.failover.client.FailoverClient;
-import org.apache.jackrabbit.oak.plugins.segment.failover.server.FailoverServer;
+import org.apache.jackrabbit.oak.plugins.segment.standby.client.StandbyClient;
+import org.apache.jackrabbit.oak.plugins.segment.standby.server.StandbyServer;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.component.ComponentContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
@Property(name = "org.apache.sling.installer.configuration.persist", label="Persist configuration", description = "Must be always disabled to avoid storing the configuration in the repository", boolValue = false)
@Component(metatype = true, policy = ConfigurationPolicy.REQUIRE)
-public class FailoverStoreService {
+public class StandbyStoreService {
private final Logger log = LoggerFactory.getLogger(getClass());
- private static final String MODE_MASTER = "master";
- private static final String MODE_SLAVE = "slave";
+ private static final String MODE_PRIMARY = "primary";
+ private static final String MODE_STANDBY = "standby";
- public static final String MODE_DEFAULT = MODE_MASTER;
+ public static final String MODE_DEFAULT = MODE_PRIMARY;
@Property(options = {
- @PropertyOption(name = MODE_MASTER, value = MODE_MASTER),
- @PropertyOption(name = MODE_SLAVE, value = MODE_SLAVE) },
+ @PropertyOption(name = MODE_PRIMARY, value = MODE_PRIMARY),
+ @PropertyOption(name = MODE_STANDBY, value = MODE_STANDBY) },
value = MODE_DEFAULT)
public static final String MODE = "mode";
@@ -65,9 +64,9 @@ public class FailoverStoreService {
@Property(intValue = PORT_DEFAULT)
public static final String PORT = "port";
- public static final String MASTER_HOST_DEFAULT = "127.0.0.1";
- @Property(value = MASTER_HOST_DEFAULT)
- public static final String MASTER_HOST = "master.host";
+ public static final String PRIMARY_HOST_DEFAULT = "127.0.0.1";
+ @Property(value = PRIMARY_HOST_DEFAULT)
+ public static final String PRIMARY_HOST = "primary.host";
public static final int INTERVAL_DEFAULT = 5;
@Property(intValue = INTERVAL_DEFAULT)
@@ -75,7 +74,7 @@ public class FailoverStoreService {
public static final String[] ALLOWED_CLIENT_IP_RANGES_DEFAULT = new String[] {};
@Property(cardinality = Integer.MAX_VALUE)
- public static final String ALLOWED_CLIENT_IP_RANGES = "master.allowed-client-ip-ranges";
+ public static final String ALLOWED_CLIENT_IP_RANGES = "primary.allowed-client-ip-ranges";
public static final boolean SECURE_DEFAULT = false;
@Property(boolValue = SECURE_DEFAULT)
@@ -86,8 +85,8 @@ public class FailoverStoreService {
private SegmentStore segmentStore;
- private FailoverServer master = null;
- private FailoverClient sync = null;
+ private StandbyServer primary = null;
+ private StandbyClient sync = null;
private ServiceRegistration syncReg = null;
@@ -100,21 +99,21 @@ public class FailoverStoreService {
"Missing SegmentStoreProvider service");
}
String mode = valueOf(context.getProperties().get(MODE));
- if (MODE_MASTER.equals(mode)) {
+ if (MODE_PRIMARY.equals(mode)) {
bootstrapMaster(context);
- } else if (MODE_SLAVE.equals(mode)) {
+ } else if (MODE_STANDBY.equals(mode)) {
bootstrapSlave(context);
} else {
throw new IllegalArgumentException(
- "Unexpected 'mode' param, expecting 'master' or 'slave' got "
+ "Unexpected 'mode' param, expecting 'primary' or 'standby' got "
+ mode);
}
}
@Deactivate
public synchronized void deactivate() {
- if (master != null) {
- master.close();
+ if (primary != null) {
+ primary.close();
}
if (sync != null) {
sync.close();
@@ -129,19 +128,19 @@ public class FailoverStoreService {
int port = PropertiesUtil.toInteger(props.get(PORT), PORT_DEFAULT);
String[] ranges = PropertiesUtil.toStringArray(props.get(ALLOWED_CLIENT_IP_RANGES), ALLOWED_CLIENT_IP_RANGES_DEFAULT);
boolean secure = PropertiesUtil.toBoolean(props.get(SECURE), SECURE_DEFAULT);
- master = new FailoverServer(port, segmentStore, ranges, secure);
- master.start();
- log.info("started failover master on port {} with allowed ip ranges {}.", port, ranges);
+ primary = new StandbyServer(port, segmentStore, ranges, secure);
+ primary.start();
+ log.info("started primary on port {} with allowed ip ranges {}.", port, ranges);
}
private void bootstrapSlave(ComponentContext context) throws SSLException {
Dictionary<?, ?> props = context.getProperties();
int port = PropertiesUtil.toInteger(props.get(PORT), PORT_DEFAULT);
long interval = PropertiesUtil.toInteger(props.get(INTERVAL), INTERVAL_DEFAULT);
- String host = PropertiesUtil.toString(props.get(MASTER_HOST), MASTER_HOST_DEFAULT);
+ String host = PropertiesUtil.toString(props.get(PRIMARY_HOST), PRIMARY_HOST_DEFAULT);
boolean secure = PropertiesUtil.toBoolean(props.get(SECURE), SECURE_DEFAULT);
- sync = new FailoverClient(host, port, segmentStore, secure);
+ sync = new StandbyClient(host, port, segmentStore, secure);
Dictionary<Object, Object> dictionary = new Hashtable<Object, Object>();
dictionary.put("scheduler.period", interval);
dictionary.put("scheduler.concurrent", false);
@@ -149,7 +148,7 @@ public class FailoverStoreService {
syncReg = context.getBundleContext().registerService(
Runnable.class.getName(), sync, dictionary);
- log.info("started failover slave sync with {}:{} at {} sec.", host,
+ log.info("started standby sync with {}:{} at {} sec.", host,
port, interval);
}
}
Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/main/resources/OSGI-INF/metatype/metatype.properties
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=1633598&r1=1633597&r2=1633598&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/src/main/resources/OSGI-INF/metatype/metatype.properties (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/main/resources/OSGI-INF/metatype/metatype.properties Wed Oct 22 11:20:05 2014
@@ -19,23 +19,23 @@
# suppress inspection "UnusedProperty" for whole file
-org.apache.jackrabbit.oak.plugins.segment.failover.store.FailoverStoreService.name = TarMK cold backup service
-org.apache.jackrabbit.oak.plugins.segment.failover.store.FailoverStoreService.description = Provides continuous backups of TarMK based reporitories
+org.apache.jackrabbit.oak.plugins.segment.standby.store.StandbyStoreService.name = TarMK Cold Standby service
+org.apache.jackrabbit.oak.plugins.segment.standby.store.StandbyStoreService.description = Provides continuous backups of TarMK based repositories
mode.name = Mode
-mode.description = TarMK Cold Standby mode (master or slave)
+mode.description = TarMK Cold Standby mode (primary or standby)
port.name = Port
port.description = TCP/IP port to use
-master.host.name = Master Host
-master.host.description = Master host (slave mode only)
+primary.host.name = Primary Host
+primary.host.description = Primary host (standby mode only)
interval.name = Sync interval (seconds)
-interval.description = Sync interval in seconds (slave mode only)
+interval.description = Sync interval in seconds (standby mode only)
-master.allowed-client-ip-ranges.name = Allowed IP-Ranges
-master.allowed-client-ip-ranges.description = Accept incoming requests for these host names and IP-ranges only (master mode only)
+primary.allowed-client-ip-ranges.name = Allowed IP-Ranges
+primary.allowed-client-ip-ranges.description = Accept incoming requests for these host names and IP-ranges only (primary mode only)
secure.name = Secure
secure.description = Use secure connections
Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BrokenNetworkTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BrokenNetworkTest.java?rev=1633598&r1=1633562&r2=1633598&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BrokenNetworkTest.java (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BrokenNetworkTest.java Wed Oct 22 11:20:05 2014
@@ -16,14 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.plugins.segment.failover;
+package org.apache.jackrabbit.oak.plugins.segment.standby;
import org.apache.jackrabbit.oak.plugins.segment.NetworkErrorProxy;
import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
-import org.apache.jackrabbit.oak.plugins.segment.failover.client.FailoverClient;
-import org.apache.jackrabbit.oak.plugins.segment.failover.server.FailoverServer;
+import org.apache.jackrabbit.oak.plugins.segment.standby.client.StandbyClient;
+import org.apache.jackrabbit.oak.plugins.segment.standby.server.StandbyServer;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
-
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -122,12 +121,12 @@ public class BrokenNetworkTest extends T
p.run();
NodeStore store = new SegmentNodeStore(storeS);
- final FailoverServer server = new FailoverServer(port, storeS, ssl);
+ final StandbyServer server = new StandbyServer(port, storeS, ssl);
server.start();
addTestContent(store, "server");
storeS.flush(); // this speeds up the test a little bit...
- FailoverClient cl = new FailoverClient(LOCALHOST, PROXY_PORT, storeC, ssl);
+ StandbyClient cl = new StandbyClient(LOCALHOST, PROXY_PORT, storeC, ssl);
cl.run();
try {
Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BulkTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BulkTest.java?rev=1633598&r1=1633562&r2=1633598&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BulkTest.java (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/BulkTest.java Wed Oct 22 11:20:05 2014
@@ -16,23 +16,23 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.plugins.segment.failover;
+package org.apache.jackrabbit.oak.plugins.segment.standby;
import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
-import org.apache.jackrabbit.oak.plugins.segment.failover.client.FailoverClient;
-import org.apache.jackrabbit.oak.plugins.segment.failover.jmx.FailoverStatusMBean;
-import org.apache.jackrabbit.oak.plugins.segment.failover.server.FailoverServer;
+import org.apache.jackrabbit.oak.plugins.segment.standby.client.StandbyClient;
+import org.apache.jackrabbit.oak.plugins.segment.standby.jmx.StandbyStatusMBean;
+import org.apache.jackrabbit.oak.plugins.segment.standby.server.StandbyServer;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
-
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import javax.management.MBeanServer;
import javax.management.ObjectName;
+
import java.lang.management.ManagementFactory;
import java.util.Set;
@@ -109,14 +109,14 @@ public class BulkTest extends TestBase {
store.merge(rootbuilder, EmptyHook.INSTANCE, CommitInfo.EMPTY);
storeS.flush();
- final FailoverServer server = new FailoverServer(port, storeS, useSSL);
+ final StandbyServer server = new StandbyServer(port, storeS, useSSL);
server.start();
- System.setProperty(FailoverClient.CLIENT_ID_PROPERTY_NAME, "Bar");
- FailoverClient cl = new FailoverClient("127.0.0.1", port, storeC, useSSL);
+ System.setProperty(StandbyClient.CLIENT_ID_PROPERTY_NAME, "Bar");
+ StandbyClient cl = new StandbyClient("127.0.0.1", port, storeC, useSSL);
final MBeanServer jmxServer = ManagementFactory.getPlatformMBeanServer();
- ObjectName status = new ObjectName(FailoverStatusMBean.JMX_NAME + ",id=*");
+ ObjectName status = new ObjectName(StandbyStatusMBean.JMX_NAME + ",id=*");
ObjectName clientStatus = new ObjectName(cl.getMBeanName());
ObjectName serverStatus = new ObjectName(server.getMBeanName());
Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverIPRangeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverIPRangeTest.java?rev=1633598&r1=1633562&r2=1633598&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverIPRangeTest.java (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverIPRangeTest.java Wed Oct 22 11:20:05 2014
@@ -16,14 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.plugins.segment.failover;
+package org.apache.jackrabbit.oak.plugins.segment.standby;
import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
-import org.apache.jackrabbit.oak.plugins.segment.failover.client.FailoverClient;
-import org.apache.jackrabbit.oak.plugins.segment.failover.server.FailoverServer;
-
+import org.apache.jackrabbit.oak.plugins.segment.standby.client.StandbyClient;
+import org.apache.jackrabbit.oak.plugins.segment.standby.server.StandbyServer;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
-
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -147,12 +145,12 @@ public class FailoverIPRangeTest extends
private void createTestWithConfig(String host, String[] ipRanges, boolean expectedToWork) throws Exception {
NodeStore store = new SegmentNodeStore(storeS);
- final FailoverServer server = new FailoverServer(port, storeS, ipRanges);
+ final StandbyServer server = new StandbyServer(port, storeS, ipRanges);
server.start();
addTestContent(store, "server");
storeS.flush(); // this speeds up the test a little bit...
- FailoverClient cl = new FailoverClient(host, port, storeC);
+ StandbyClient cl = new StandbyClient(host, port, storeC);
cl.run();
try {
Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverMultipleClientsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverMultipleClientsTest.java?rev=1633598&r1=1633562&r2=1633598&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverMultipleClientsTest.java (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverMultipleClientsTest.java Wed Oct 22 11:20:05 2014
@@ -16,14 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.plugins.segment.failover;
+package org.apache.jackrabbit.oak.plugins.segment.standby;
import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
import org.apache.jackrabbit.oak.plugins.segment.SegmentTestUtils;
-import org.apache.jackrabbit.oak.plugins.segment.failover.client.FailoverClient;
-import org.apache.jackrabbit.oak.plugins.segment.failover.server.FailoverServer;
+import org.apache.jackrabbit.oak.plugins.segment.standby.client.StandbyClient;
+import org.apache.jackrabbit.oak.plugins.segment.standby.server.StandbyServer;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
-
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -46,13 +45,13 @@ public class FailoverMultipleClientsTest
@Test
public void testMultipleClients() throws Exception {
NodeStore store = new SegmentNodeStore(storeS);
- final FailoverServer server = new FailoverServer(port, storeS);
+ final StandbyServer server = new StandbyServer(port, storeS);
server.start();
SegmentTestUtils.addTestContent(store, "server");
storeS.flush(); // this speeds up the test a little bit...
- FailoverClient cl1 = new FailoverClient("127.0.0.1", port, storeC);
- FailoverClient cl2 = new FailoverClient("127.0.0.1", port, storeC2);
+ StandbyClient cl1 = new StandbyClient("127.0.0.1", port, storeC);
+ StandbyClient cl2 = new StandbyClient("127.0.0.1", port, storeC2);
try {
assertFalse("first client has invalid initial store!", storeS.getHead().equals(storeC.getHead()));
Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverSslTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverSslTest.java?rev=1633598&r1=1633562&r2=1633598&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverSslTest.java (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverSslTest.java Wed Oct 22 11:20:05 2014
@@ -16,13 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.plugins.segment.failover;
+package org.apache.jackrabbit.oak.plugins.segment.standby;
import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
-import org.apache.jackrabbit.oak.plugins.segment.failover.client.FailoverClient;
-import org.apache.jackrabbit.oak.plugins.segment.failover.server.FailoverServer;
+import org.apache.jackrabbit.oak.plugins.segment.standby.client.StandbyClient;
+import org.apache.jackrabbit.oak.plugins.segment.standby.server.StandbyServer;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
-
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -47,12 +46,12 @@ public class FailoverSslTest extends Tes
public void testFailoverSecure() throws Exception {
NodeStore store = new SegmentNodeStore(storeS);
- final FailoverServer server = new FailoverServer(port, storeS, true);
+ final StandbyServer server = new StandbyServer(port, storeS, true);
server.start();
addTestContent(store, "server");
storeS.flush(); // this speeds up the test a little bit...
- FailoverClient cl = new FailoverClient("127.0.0.1", port, storeC, true);
+ StandbyClient cl = new StandbyClient("127.0.0.1", port, storeC, true);
cl.run();
try {
@@ -67,12 +66,12 @@ public class FailoverSslTest extends Tes
public void testFailoverSecureServerPlainClient() throws Exception {
NodeStore store = new SegmentNodeStore(storeS);
- final FailoverServer server = new FailoverServer(port, storeS, true);
+ final StandbyServer server = new StandbyServer(port, storeS, true);
server.start();
addTestContent(store, "server");
storeS.flush(); // this speeds up the test a little bit...
- FailoverClient cl = new FailoverClient("127.0.0.1", port, storeC);
+ StandbyClient cl = new StandbyClient("127.0.0.1", port, storeC);
cl.run();
try {
@@ -87,12 +86,12 @@ public class FailoverSslTest extends Tes
public void testFailoverPlainServerSecureClient() throws Exception {
NodeStore store = new SegmentNodeStore(storeS);
- final FailoverServer server = new FailoverServer(port, storeS);
+ final StandbyServer server = new StandbyServer(port, storeS);
server.start();
addTestContent(store, "server");
storeS.flush(); // this speeds up the test a little bit...
- FailoverClient cl = new FailoverClient("127.0.0.1", port, storeC, true);
+ StandbyClient cl = new StandbyClient("127.0.0.1", port, storeC, true);
cl.run();
try {
Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverTest.java?rev=1633598&r1=1633562&r2=1633598&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverTest.java (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/FailoverTest.java Wed Oct 22 11:20:05 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.plugins.segment.failover;
+package org.apache.jackrabbit.oak.plugins.segment.standby;
import static org.apache.jackrabbit.oak.plugins.segment.SegmentTestUtils.addTestContent;
import static org.apache.jackrabbit.oak.plugins.segment.SegmentTestUtils.createTmpTargetDir;
@@ -25,11 +25,10 @@ import static org.junit.Assert.assertEqu
import java.io.File;
import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
-import org.apache.jackrabbit.oak.plugins.segment.failover.client.FailoverClient;
-import org.apache.jackrabbit.oak.plugins.segment.failover.server.FailoverServer;
import org.apache.jackrabbit.oak.plugins.segment.file.FileStore;
+import org.apache.jackrabbit.oak.plugins.segment.standby.client.StandbyClient;
+import org.apache.jackrabbit.oak.plugins.segment.standby.server.StandbyServer;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
-
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -50,11 +49,11 @@ public class FailoverTest extends TestBa
public void testFailover() throws Exception {
NodeStore store = new SegmentNodeStore(storeS);
- final FailoverServer server = new FailoverServer(port, storeS);
+ final StandbyServer server = new StandbyServer(port, storeS);
server.start();
addTestContent(store, "server");
- FailoverClient cl = new FailoverClient("127.0.0.1", port, storeC);
+ StandbyClient cl = new StandbyClient("127.0.0.1", port, storeC);
cl.run();
try {
@@ -71,7 +70,7 @@ public class FailoverTest extends TestBa
d.delete();
d.mkdir();
FileStore s = new FileStore(d, 256, false);
- FailoverClient cl = new FailoverClient("127.0.0.1", 8023, s);
+ StandbyClient cl = new StandbyClient("127.0.0.1", 8023, s);
try {
cl.run();
} finally {