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 [2/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...
Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/MBeanTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/MBeanTest.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/MBeanTest.java (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/MBeanTest.java Wed Oct 22 11:20:05 2014
@@ -16,12 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.jackrabbit.oak.plugins.segment.failover;
-
-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;
+package org.apache.jackrabbit.oak.plugins.segment.standby;
+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.junit.After;
import org.junit.Before;
import org.junit.Ignore;
@@ -29,6 +28,7 @@ import org.junit.Test;
import javax.management.MBeanServer;
import javax.management.ObjectName;
+
import java.lang.management.ManagementFactory;
import java.util.Set;
@@ -48,11 +48,11 @@ public class MBeanTest extends TestBase
@Test
public void testServerEmptyConfig() throws Exception {
- final FailoverServer server = new FailoverServer(this.port, this.storeS);
+ final StandbyServer server = new StandbyServer(this.port, this.storeS);
server.start();
final MBeanServer jmxServer = ManagementFactory.getPlatformMBeanServer();
- ObjectName status = new ObjectName(FailoverStatusMBean.JMX_NAME + ",id=*");
+ ObjectName status = new ObjectName(StandbyStatusMBean.JMX_NAME + ",id=*");
try {
Set<ObjectName> instances = jmxServer.queryNames(status, null);
assertEquals(1, instances.size());
@@ -62,18 +62,18 @@ public class MBeanTest extends TestBase
assertEquals("master", jmxServer.getAttribute(status, "Mode"));
String m = jmxServer.getAttribute(status, "Status").toString();
- if (!m.equals(FailoverStatusMBean.STATUS_STARTING) && !m.equals("channel unregistered"))
+ if (!m.equals(StandbyStatusMBean.STATUS_STARTING) && !m.equals("channel unregistered"))
fail("unexpected Status" + m);
- assertEquals(FailoverStatusMBean.STATUS_STARTING, jmxServer.getAttribute(status, "Status"));
+ assertEquals(StandbyStatusMBean.STATUS_STARTING, jmxServer.getAttribute(status, "Status"));
assertEquals(true, jmxServer.getAttribute(status, "Running"));
jmxServer.invoke(status, "stop", null, null);
assertEquals(false, jmxServer.getAttribute(status, "Running"));
- assertEquals(FailoverStatusMBean.STATUS_STOPPED, jmxServer.getAttribute(status, "Status"));
+ assertEquals(StandbyStatusMBean.STATUS_STOPPED, jmxServer.getAttribute(status, "Status"));
jmxServer.invoke(status, "start", null, null);
assertEquals(true, jmxServer.getAttribute(status, "Running"));
- assertEquals(FailoverStatusMBean.STATUS_STARTING, jmxServer.getAttribute(status, "Status"));
+ assertEquals(StandbyStatusMBean.STATUS_STARTING, jmxServer.getAttribute(status, "Status"));
} finally {
server.close();
}
@@ -83,11 +83,11 @@ public class MBeanTest extends TestBase
@Test
public void testClientEmptyConfigNoServer() throws Exception {
- final FailoverClient client = new FailoverClient("127.0.0.1", this.port, this.storeC);
+ final StandbyClient client = new StandbyClient("127.0.0.1", this.port, this.storeC);
client.start();
final MBeanServer jmxServer = ManagementFactory.getPlatformMBeanServer();
- ObjectName status = new ObjectName(FailoverStatusMBean.JMX_NAME + ",id=*");
+ ObjectName status = new ObjectName(StandbyStatusMBean.JMX_NAME + ",id=*");
try {
Set<ObjectName> instances = jmxServer.queryNames(status, null);
assertEquals(1, instances.size());
@@ -101,15 +101,15 @@ public class MBeanTest extends TestBase
assertEquals("1", jmxServer.getAttribute(status, "FailedRequests").toString());
assertEquals("-1", jmxServer.getAttribute(status, "SecondsSinceLastSuccess").toString());
- assertEquals(FailoverStatusMBean.STATUS_STOPPED, jmxServer.getAttribute(status, "Status"));
+ assertEquals(StandbyStatusMBean.STATUS_STOPPED, jmxServer.getAttribute(status, "Status"));
assertEquals(false, jmxServer.getAttribute(status, "Running"));
jmxServer.invoke(status, "stop", null, null);
assertEquals(false, jmxServer.getAttribute(status, "Running"));
- assertEquals(FailoverStatusMBean.STATUS_STOPPED, jmxServer.getAttribute(status, "Status"));
+ assertEquals(StandbyStatusMBean.STATUS_STOPPED, jmxServer.getAttribute(status, "Status"));
jmxServer.invoke(status, "start", null, null);
assertEquals(false, jmxServer.getAttribute(status, "Running"));
- assertEquals(FailoverStatusMBean.STATUS_STOPPED, jmxServer.getAttribute(status, "Status"));
+ assertEquals(StandbyStatusMBean.STATUS_STOPPED, jmxServer.getAttribute(status, "Status"));
} finally {
client.close();
}
@@ -119,8 +119,8 @@ public class MBeanTest extends TestBase
@Test
public void testClientNoServer() throws Exception {
- System.setProperty(FailoverClient.CLIENT_ID_PROPERTY_NAME, "Foo");
- final FailoverClient client = new FailoverClient("127.0.0.1", this.port, this.storeC);
+ System.setProperty(StandbyClient.CLIENT_ID_PROPERTY_NAME, "Foo");
+ final StandbyClient client = new StandbyClient("127.0.0.1", this.port, this.storeC);
client.start();
final MBeanServer jmxServer = ManagementFactory.getPlatformMBeanServer();
@@ -144,15 +144,15 @@ public class MBeanTest extends TestBase
@Test
@Ignore("OAK-2086")
public void testClientAndServerEmptyConfig() throws Exception {
- final FailoverServer server = new FailoverServer(this.port, this.storeS);
+ final StandbyServer server = new StandbyServer(this.port, this.storeS);
server.start();
- System.setProperty(FailoverClient.CLIENT_ID_PROPERTY_NAME, "Bar");
- final FailoverClient client = new FailoverClient("127.0.0.1", this.port, this.storeC);
+ System.setProperty(StandbyClient.CLIENT_ID_PROPERTY_NAME, "Bar");
+ final StandbyClient client = new StandbyClient("127.0.0.1", this.port, this.storeC);
client.start();
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(client.getMBeanName());
ObjectName serverStatus = new ObjectName(server.getMBeanName());
try {
@@ -196,7 +196,7 @@ public class MBeanTest extends TestBase
jmxServer.invoke(serverStatus, "stop", null, null);
assertEquals(false, jmxServer.getAttribute(serverStatus, "Running"));
m = jmxServer.getAttribute(serverStatus, "Status").toString();
- if (!m.equals(FailoverStatusMBean.STATUS_STOPPED) && !m.equals("channel unregistered"))
+ if (!m.equals(StandbyStatusMBean.STATUS_STOPPED) && !m.equals("channel unregistered"))
fail("unexpected Status" + m);
// restart the master
@@ -204,19 +204,19 @@ public class MBeanTest extends TestBase
assertEquals(true, jmxServer.getAttribute(serverStatus, "Running"));
assertEquals(true, jmxServer.getAttribute(clientStatus, "Running"));
m = jmxServer.getAttribute(serverStatus, "Status").toString();
- if (!m.equals(FailoverStatusMBean.STATUS_STARTING) && !m.equals("channel unregistered"))
+ if (!m.equals(StandbyStatusMBean.STATUS_STARTING) && !m.equals("channel unregistered"))
fail("unexpected Status" + m);
// stop the slave
jmxServer.invoke(clientStatus, "stop", null, null);
assertEquals(true, jmxServer.getAttribute(serverStatus, "Running"));
assertEquals(false, jmxServer.getAttribute(clientStatus, "Running"));
- assertEquals(FailoverStatusMBean.STATUS_STOPPED, jmxServer.getAttribute(clientStatus, "Status"));
+ assertEquals(StandbyStatusMBean.STATUS_STOPPED, jmxServer.getAttribute(clientStatus, "Status"));
// restart the slave
jmxServer.invoke(clientStatus, "start", null, null);
assertEquals(true, jmxServer.getAttribute(clientStatus, "Running"));
- assertEquals(FailoverStatusMBean.STATUS_RUNNING, jmxServer.getAttribute(clientStatus, "Status"));
+ assertEquals(StandbyStatusMBean.STATUS_RUNNING, jmxServer.getAttribute(clientStatus, "Status"));
} finally {
client.close();
Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/RecoverTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/RecoverTest.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/RecoverTest.java (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/RecoverTest.java Wed Oct 22 11:20:05 2014
@@ -16,16 +16,14 @@
* 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.DebugSegmentStore;
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;
@@ -51,12 +49,12 @@ public class RecoverTest extends TestBas
NodeStore store = new SegmentNodeStore(storeS);
DebugSegmentStore s = new DebugSegmentStore(storeS);
- final FailoverServer server = new FailoverServer(port, s);
+ final StandbyServer server = new StandbyServer(port, s);
s.createReadErrors = true;
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 {
@@ -77,13 +75,13 @@ public class RecoverTest extends TestBas
NodeStore store = new SegmentNodeStore(storeC);
addTestContent(store, "client");
- final FailoverServer server = new FailoverServer(port, storeS);
+ final StandbyServer server = new StandbyServer(port, storeS);
server.start();
store = new SegmentNodeStore(storeS);
addTestContent(store, "server");
storeS.flush();
- FailoverClient cl = new FailoverClient("127.0.0.1", port, storeC);
+ StandbyClient cl = new StandbyClient("127.0.0.1", port, storeC);
try {
assertFalse("stores are not expected to be equal", storeS.getHead().equals(storeC.getHead()));
cl.run();
Modified: jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.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/TestBase.java (original)
+++ jackrabbit/oak/trunk/oak-tarmk-standby/src/test/java/org/apache/jackrabbit/oak/plugins/segment/standby/TestBase.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 org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.SystemUtils;
@@ -28,7 +28,7 @@ import java.io.IOException;
import static org.apache.jackrabbit.oak.plugins.segment.SegmentTestUtils.createTmpTargetDir;
public class TestBase {
- int port = Integer.valueOf(System.getProperty("failover.server.port", "52808"));
+ int port = Integer.valueOf(System.getProperty("standby.server.port", "52808"));
final static String LOCALHOST = "127.0.0.1";
File directoryS;