Thread: [Bigdata-commit] SF.net SVN: bigdata:[8026] branches/BIGDATA_MGC_HA1_HA5

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 8026
          http://sourceforge.net/p/bigdata/code/8026
Author:   martyncutcher
Date:     2014-04-02 13:12:56 +0000 (Wed, 02 Apr 2014)
Log Message:
-----------
Initial commit on creation of HA1_HA5 branch

Modified Paths:
--------------
    branches/BIGDATA_MGC_HA1_HA5/bigdata/src/java/com/bigdata/journal/AbstractJournal.java
    branches/BIGDATA_MGC_HA1_HA5/bigdata-jini/src/java/com/bigdata/journal/jini/ha/HAJournalServer.java
    branches/BIGDATA_MGC_HA1_HA5/bigdata-jini/src/java/com/bigdata/journal/jini/ha/SnapshotManager.java
    branches/BIGDATA_MGC_HA1_HA5/bigdata-jini/src/test/com/bigdata/journal/jini/ha/AbstractHA3JournalServerTestCase.java
    branches/BIGDATA_MGC_HA1_HA5/bigdata-jini/src/test/com/bigdata/journal/jini/ha/AbstractHAJournalServerTestCase.java
    branches/BIGDATA_MGC_HA1_HA5/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHA3JournalServer.java
    branches/BIGDATA_MGC_HA1_HA5/bigdata-sails/src/java/com/bigdata/rdf/sail/webapp/StatusServlet.java

Added Paths:
-----------
    branches/BIGDATA_MGC_HA1_HA5/bigdata-jini/src/test/com/bigdata/journal/jini/ha/AbstractHA5JournalServerTestCase.java
    branches/BIGDATA_MGC_HA1_HA5/bigdata-jini/src/test/com/bigdata/journal/jini/ha/HAJournal-D.config
    branches/BIGDATA_MGC_HA1_HA5/bigdata-jini/src/test/com/bigdata/journal/jini/ha/HAJournal-E.config
    branches/BIGDATA_MGC_HA1_HA5/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHA1JournalServer.java
    branches/BIGDATA_MGC_HA1_HA5/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHA1SnapshotPolicy.java
    branches/BIGDATA_MGC_HA1_HA5/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHA1SnapshotPolicy2.java
    branches/BIGDATA_MGC_HA1_HA5/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHA5JournalServer.java
    branches/BIGDATA_MGC_HA1_HA5/bigdata-jini/src/test/com/bigdata/journal/jini/ha/log4j-template-D.properties
    branches/BIGDATA_MGC_HA1_HA5/bigdata-jini/src/test/com/bigdata/journal/jini/ha/log4j-template-E.properties
    branches/BIGDATA_MGC_HA1_HA5/bigdata-jini/src/test/com/bigdata/journal/jini/ha/zkClient1.config
    branches/BIGDATA_MGC_HA1_HA5/bigdata-jini/src/test/com/bigdata/journal/jini/ha/zkClient5.config
    branches/BIGDATA_MGC_HA1_HA5/branch-notes.txt

Removed Paths:
-------------
    branches/BIGDATA_MGC_HA1_HA5/bigdata-jini/src/test/com/bigdata/journal/jini/ha/log4j-template-A.properties
    branches/BIGDATA_MGC_HA1_HA5/bigdata-jini/src/test/com/bigdata/journal/jini/ha/log4j-template-B.properties
    branches/BIGDATA_MGC_HA1_HA5/bigdata-jini/src/test/com/bigdata/journal/jini/ha/log4j-template-C.properties

Modified: branches/BIGDATA_MGC_HA1_HA5/bigdata/src/java/com/bigdata/journal/AbstractJournal.java
===================================================================

--- branches/BIGDATA_MGC_HA1_HA5/bigdata/src/java/com/bigdata/journal/AbstractJournal.java	2014-04-02 13:03:59 UTC (rev 8025)
+++ branches/BIGDATA_MGC_HA1_HA5/bigdata/src/java/com/bigdata/journal/AbstractJournal.java	2014-04-02 13:12:56 UTC (rev 8026)
@@ -3428,8 +3428,8 @@
             if (quorum == null)
                 return;
 
-            if (!quorum.isHighlyAvailable())
-                return;
+//            if (!quorum.isHighlyAvailable())
+//                return;
 
             /**
              * CRITICAL SECTION. We need obtain a distributed consensus for the

Modified: branches/BIGDATA_MGC_HA1_HA5/bigdata-jini/src/java/com/bigdata/journal/jini/ha/HAJournalServer.java
===================================================================
--- branches/BIGDATA_MGC_HA1_HA5/bigdata-jini/src/java/com/bigdata/journal/jini/ha/HAJournalServer.java	2014-04-02 13:03:59 UTC (rev 8025)
+++ branches/BIGDATA_MGC_HA1_HA5/bigdata-jini/src/java/com/bigdata/journal/jini/ha/HAJournalServer.java	2014-04-02 13:12:56 UTC (rev 8026)
@@ -4574,7 +4574,7 @@
 
 //            }
 
-            log.warn("Starting NSS");
+            log.warn("Starting NSS from " + jettyXml);
             
             // Start the server.
             jettyServer.start();
@@ -4658,8 +4658,9 @@
         if (tmp == null)
             throw new IllegalStateException("Server is not running");
 
-        return tmp.getConnectors()[0].getLocalPort();
-
+        final int port = tmp.getConnectors()[0].getLocalPort();
+        haLog.warn("Returning NSSPort: " + port);
+        return port;
     }
     
     /**

Modified: branches/BIGDATA_MGC_HA1_HA5/bigdata-jini/src/java/com/bigdata/journal/jini/ha/SnapshotManager.java
===================================================================
--- branches/BIGDATA_MGC_HA1_HA5/bigdata-jini/src/java/com/bigdata/journal/jini/ha/SnapshotManager.java	2014-04-02 13:03:59 UTC (rev 8025)
+++ branches/BIGDATA_MGC_HA1_HA5/bigdata-jini/src/java/com/bigdata/journal/jini/ha/SnapshotManager.java	2014-04-02 13:12:56 UTC (rev 8026)
@@ -1096,6 +1096,8 @@
                     + haLogBytesOnDisk//
                     + ", journalSize="
                     + journalSize//
+                    + ", thresholdPercentLogSize="
+                    + thresholdPercentLogSize//
                     + ", percentLogSize="
                     + actualPercentLogSize//
                     + "%, takeSnapshot=" + takeSnapshot //

Modified: branches/BIGDATA_MGC_HA1_HA5/bigdata-jini/src/test/com/bigdata/journal/jini/ha/AbstractHA3JournalServerTestCase.java
===================================================================
--- branches/BIGDATA_MGC_HA1_HA5/bigdata-jini/src/test/com/bigdata/journal/jini/ha/AbstractHA3JournalServerTestCase.java	2014-04-02 13:03:59 UTC (rev 8025)
+++ branches/BIGDATA_MGC_HA1_HA5/bigdata-jini/src/test/com/bigdata/journal/jini/ha/AbstractHA3JournalServerTestCase.java	2014-04-02 13:12:56 UTC (rev 8026)
@@ -133,7 +133,7 @@
      * Implementation listens for the death of the child process and can be used
      * to decide when the child process is no longer executing.
      */
-    private static class ServiceListener implements IServiceListener {
+    public static class ServiceListener implements IServiceListener {
 
         private volatile HAGlue haGlue;
         private volatile ProcessHelper processHelper;
@@ -218,8 +218,12 @@
      * The {@link Remote} interfaces for these services (if started and
      * successfully discovered).
      */
-    private HAGlue serverA = null, serverB = null, serverC = null;
+    protected HAGlue serverA = null;
 
+	protected HAGlue serverB = null;
+
+	protected HAGlue serverC = null;
+
     /**
      * {@link UUID}s for the {@link HAJournalServer}s.
      */
@@ -232,17 +236,20 @@
      * @see <a href="http://trac.bigdata.com/ticket/730" > Allow configuration
      *      of embedded NSS jetty server using jetty-web.xml </a>
      */
-    private final int A_JETTY_PORT = 8090, B_JETTY_PORT = A_JETTY_PORT + 1,
-            C_JETTY_PORT = B_JETTY_PORT + 1;
+    protected final int A_JETTY_PORT = 8090;
+	protected final int B_JETTY_PORT = A_JETTY_PORT + 1;
+	protected final int C_JETTY_PORT = B_JETTY_PORT + 1;
 
     /**
      * These {@link IServiceListener}s are used to reliably detect that the
      * corresponding process starts and (most importantly) that it is really
      * dies once it has been shutdown or destroyed.
      */
-    private ServiceListener serviceListenerA = null, serviceListenerB = null;
+    protected ServiceListener serviceListenerA = null;
 
-    private ServiceListener serviceListenerC = null;
+	protected ServiceListener serviceListenerB = null;
+
+    protected ServiceListener serviceListenerC = null;
     
     private LookupDiscoveryManager lookupDiscoveryManager = null;
 
@@ -1143,14 +1150,14 @@
         
     }
 
-    private void safeShutdown(final HAGlue haGlue, final File serviceDir,
+    void safeShutdown(final HAGlue haGlue, final File serviceDir,
             final ServiceListener serviceListener) {
 
         safeShutdown(haGlue, serviceDir, serviceListener, false/* now */);
 
     }
     
-    private void safeShutdown(final HAGlue haGlue, final File serviceDir,
+    protected void safeShutdown(final HAGlue haGlue, final File serviceDir,
             final ServiceListener serviceListener, final boolean now) {
 
         if (haGlue == null)
@@ -1368,6 +1375,10 @@
 
     }
 
+    protected String getZKConfigFile() {
+    	return "zkClient.config";
+    }
+    
     /**
      * Return Zookeeper quorum that can be used to reflect (or act on) the
      * distributed quorum state for the logical service.
@@ -1382,7 +1393,7 @@
             KeeperException, IOException {
 
         final Configuration config = ConfigurationProvider
-                .getInstance(new String[] { SRC_PATH + "zkClient.config" });
+                .getInstance(new String[] { SRC_PATH + getZKConfigFile() });
 
         zkClientConfig = new ZookeeperClientConfig(config);
 
@@ -1551,7 +1562,7 @@
      * 
      * @author <a href="mailto:tho...@us...">Bryan Thompson</a>
      */
-    abstract private class StartServerTask implements Callable<HAGlue> {
+    public abstract class StartServerTask implements Callable<HAGlue> {
 
         private final String name;
         private final String configName;

Added: branches/BIGDATA_MGC_HA1_HA5/bigdata-jini/src/test/com/bigdata/journal/jini/ha/AbstractHA5JournalServerTestCase.java
===================================================================
--- branches/BIGDATA_MGC_HA1_HA5/bigdata-jini/src/test/com/bigdata/journal/jini/ha/AbstractHA5JournalServerTestCase.java	                        (rev 0)
+++ branches/BIGDATA_MGC_HA1_HA5/bigdata-jini/src/test/com/bigdata/journal/jini/ha/AbstractHA5JournalServerTestCase.java	2014-04-02 13:12:56 UTC (rev 8026)
@@ -0,0 +1,466 @@
+package com.bigdata.journal.jini.ha;
+
+import java.io.File;
+import java.io.IOException;
+import java.rmi.Remote;
+import java.security.DigestException;
+import java.security.NoSuchAlgorithmException;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import com.bigdata.ha.HAGlue;
+import com.bigdata.jini.start.IServiceListener;
+import com.bigdata.journal.jini.ha.AbstractHA3JournalServerTestCase.SafeShutdownATask;
+import com.bigdata.journal.jini.ha.AbstractHA3JournalServerTestCase.SafeShutdownBTask;
+import com.bigdata.journal.jini.ha.AbstractHA3JournalServerTestCase.SafeShutdownCTask;
+import com.bigdata.journal.jini.ha.AbstractHA3JournalServerTestCase.SafeShutdownTask;
+import com.bigdata.journal.jini.ha.AbstractHA3JournalServerTestCase.ServiceListener;
+import com.bigdata.journal.jini.ha.AbstractHA3JournalServerTestCase.StartATask;
+import com.bigdata.journal.jini.ha.AbstractHA3JournalServerTestCase.StartBTask;
+import com.bigdata.journal.jini.ha.AbstractHA3JournalServerTestCase.StartCTask;
+import com.bigdata.journal.jini.ha.AbstractHA3JournalServerTestCase.StartServerTask;
+import com.bigdata.quorum.AsynchronousQuorumCloseException;
+
+public class AbstractHA5JournalServerTestCase extends
+		AbstractHA3JournalServerTestCase {
+
+    /**
+     * The {@link Remote} interfaces for these services (if started and
+     * successfully discovered).
+     */
+    protected HAGlue serverD = null;
+
+	protected HAGlue serverE = null;
+
+    /**
+     * {@link UUID}s for the {@link HAJournalServer}s.
+     */
+    private UUID serverDId = UUID.randomUUID();
+    private UUID serverEId = UUID.randomUUID();
+
+    /**
+     * The HTTP ports at which the services will respond.
+     * 
+     * @see <a href="http://trac.bigdata.com/ticket/730" > Allow configuration
+     *      of embedded NSS jetty server using jetty-web.xml </a>
+     */
+	protected final int D_JETTY_PORT = C_JETTY_PORT + 1;
+	protected final int E_JETTY_PORT = D_JETTY_PORT + 1;
+
+    protected String getZKConfigFile() {
+    	return "zkClient5.config"; // 5 stage pipeline
+    }
+
+    /**
+     * These {@link IServiceListener}s are used to reliably detect that the
+     * corresponding process starts and (most importantly) that it is really
+     * dies once it has been shutdown or destroyed.
+     */
+    protected ServiceListener serviceListenerD = null, serviceListenerE = null;
+
+    protected File getServiceDirD() {
+        return new File(getTestDir(), "D");
+    }
+    
+    protected File getServiceDirE() {
+        return new File(getTestDir(), "E");
+    }
+    
+    protected File getHAJournalFileD() {
+        return new File(getServiceDirD(), "bigdata-ha.jnl");
+    }
+
+    protected File getHAJournalFileE() {
+        return new File(getServiceDirE(), "bigdata-ha.jnl");
+    }
+
+    protected File getHALogDirD() {
+        return new File(getServiceDirD(), "HALog");
+    }
+
+    protected File getHALogDirE() {
+        return new File(getServiceDirE(), "HALog");
+    }
+
+    /**
+     * Start A then B then C. As each service starts, this method waits for that
+     * service to appear in the pipeline in the proper position.
+     * 
+     * @return The ordered array of services <code>[A, B, C]</code>
+     */
+    protected HAGlue[] startSequenceABCDE() throws Exception {
+
+        startA();
+        awaitPipeline(new HAGlue[] { serverA });
+        
+        startB();
+        awaitPipeline(new HAGlue[] { serverA, serverB });
+        
+        startC();
+        awaitPipeline(new HAGlue[] { serverA, serverB, serverC });
+
+        startD();
+        awaitPipeline(new HAGlue[] { serverA, serverB, serverC, serverD });
+
+        startE();
+        awaitPipeline(new HAGlue[] { serverA, serverB, serverC, serverD, serverE });
+
+        return new HAGlue[] { serverA, serverB, serverC, serverD, serverE };
+        
+    }
+    
+    /**
+     * Helper class for simultaneous/seqeunced start of 3 HA services.
+     */
+    protected class ABCDE {
+        
+        /**
+         * The services.
+         */
+        final HAGlue serverA, serverB, serverC, serverD, serverE;
+
+        /**
+         * Start of 3 HA services (this happens in the ctor).
+         * 
+         * @param sequential
+         *           True if the startup should be sequential or false
+         *           if services should start concurrently.
+         * @throws Exception
+         */
+        public ABCDE(final boolean sequential)
+                throws Exception {
+
+            this(true/* sequential */, true/* newServiceStarts */);
+
+        }
+
+        /**
+         * Start of 3 HA services (this happens in the ctor).
+         * 
+         * @param sequential
+         *            True if the startup should be sequential or false if
+         *            services should start concurrently.
+         * @param newServiceStarts
+         *            When <code>true</code> the services are new, the database
+         *            should be at <code>commitCounter:=0</code> and the
+         *            constructor will check for the implicit create of the
+         *            default KB.
+         * @throws Exception
+         */
+        public ABCDE(final boolean sequential, final boolean newServiceStarts)
+                throws Exception {
+
+            if (sequential) {
+            
+                final HAGlue[] services = startSequenceABCDE();
+
+                serverA = services[0];
+
+                serverB = services[1];
+
+                serverC = services[2];
+
+                serverD = services[3];
+
+                serverE = services[4];
+
+            } else {
+                
+                final List<Callable<HAGlue>> tasks = new LinkedList<Callable<HAGlue>>();
+
+                tasks.add(new StartATask(false/* restart */));
+                tasks.add(new StartBTask(false/* restart */));
+                tasks.add(new StartCTask(false/* restart */));
+                tasks.add(new StartDTask(false/* restart */));
+                tasks.add(new StartETask(false/* restart */));
+
+                // Start all servers in parallel. Wait up to a timeout.
+                final List<Future<HAGlue>> futures = executorService.invokeAll(
+                        tasks, 30/* timeout */, TimeUnit.SECONDS);
+
+                serverA = futures.get(0).get();
+
+                serverB = futures.get(1).get();
+
+                serverC = futures.get(2).get();
+
+                serverD = futures.get(3).get();
+
+                serverE = futures.get(4).get();
+
+            }
+
+            // wait for the quorum to fully meet.
+            awaitFullyMetQuorum();
+
+            if(newServiceStarts) {
+                // wait for the initial commit point (KB create).
+                awaitCommitCounter(1L, serverA, serverB, serverC, serverD, serverE);
+            }
+            
+        }
+
+        public void shutdownAll() throws InterruptedException,
+                ExecutionException {
+
+            shutdownAll(false/* now */);
+            
+        }
+
+        public void shutdownAll(final boolean now) throws InterruptedException,
+                ExecutionException {
+            
+            final List<Callable<Void>> tasks = new LinkedList<Callable<Void>>();
+
+            tasks.add(new SafeShutdownATask());
+            tasks.add(new SafeShutdownBTask());
+            tasks.add(new SafeShutdownCTask());
+            tasks.add(new SafeShutdownDTask());
+            tasks.add(new SafeShutdownETask());
+
+            // Start all servers in parallel. Wait up to a timeout.
+            final List<Future<Void>> futures = executorService.invokeAll(
+                    tasks, 30/* timeout */, TimeUnit.SECONDS);
+
+            futures.get(0).get();
+            futures.get(1).get();
+            futures.get(2).get();
+            futures.get(3).get();
+            futures.get(4).get();
+
+        }
+
+		public void assertDigestsEqual() throws NoSuchAlgorithmException, DigestException, IOException {
+	        assertDigestsEquals(new HAGlue[] { serverA, serverB, serverC, serverD, serverE });
+		}
+
+    }
+
+    protected HAGlue startD() throws Exception {
+
+        return new StartDTask(false/* restart */).call();
+
+    }
+
+    protected HAGlue startE() throws Exception {
+
+        return new StartETask(false/* restart */).call();
+
+    }
+
+    protected HAGlue restartD() throws Exception {
+
+        return new StartDTask(true/* restart */).call();
+
+    }
+
+    protected HAGlue restartE() throws Exception {
+
+        return new StartETask(true/* restart */).call();
+
+    }
+
+    protected void shutdownD() throws IOException {
+        safeShutdown(serverD, getServiceDirD(), serviceListenerD, true);
+
+        serverD = null;
+        serviceListenerD = null;
+    }
+
+    protected void shutdownE() throws IOException {
+        safeShutdown(serverE, getServiceDirE(), serviceListenerE, true);
+
+        serverE = null;
+        serviceListenerE = null;
+    }
+
+    protected class StartDTask extends StartServerTask {
+
+        public StartDTask(final boolean restart) {
+
+            super("D", "HAJournal-D.config", serverDId, D_JETTY_PORT,
+                    serviceListenerD = new ServiceListener(), restart);
+
+        }
+
+        @Override
+        public HAGlue call() throws Exception {
+
+            if (restart) {
+
+                safeShutdown(serverD, getServiceDirD(), serviceListenerD);
+                
+                serverD = null;
+                
+            }
+            
+            return serverD = start();
+
+        }
+
+    }
+
+    protected class StartETask extends StartServerTask {
+
+        public StartETask(final boolean restart) {
+
+            super("E", "HAJournal-E.config", serverEId, E_JETTY_PORT,
+                    serviceListenerE = new ServiceListener(), restart);
+
+        }
+
+        @Override
+        public HAGlue call() throws Exception {
+
+            if (restart) {
+
+                safeShutdown(serverE, getServiceDirE(), serviceListenerE);
+                
+                serverE = null;
+                
+            }
+            
+            return serverE = start();
+
+        }
+
+    }
+    
+    protected class SafeShutdownDTask extends SafeShutdownTask {
+
+        public SafeShutdownDTask() {
+            this(false/* now */);
+        }
+
+        public SafeShutdownDTask(final boolean now) {
+            super(serverD, getServiceDirC(), serviceListenerD, now);
+        }
+
+    }
+
+    protected class SafeShutdownETask extends SafeShutdownTask {
+
+        public SafeShutdownETask() {
+            this(false/* now */);
+        }
+
+        public SafeShutdownETask(final boolean now) {
+            super(serverE, getServiceDirC(), serviceListenerE, now);
+        }
+
+    }
+    public AbstractHA5JournalServerTestCase() {
+    }
+
+    public AbstractHA5JournalServerTestCase(final String name) {
+        super(name);
+    }
+    
+	protected void destroyAll() throws AsynchronousQuorumCloseException,
+			InterruptedException, TimeoutException {
+		/**
+		 * The most reliable tear down is in reverse pipeline order.
+		 * 
+		 * This may not be necessary long term but for now we want to avoid
+		 * destroying the leader first since it can lead to problems as
+		 * followers attempt to reform
+		 */
+		final HAGlue leader;
+		final File leaderServiceDir;
+		final ServiceListener leaderListener;
+		if (quorum.isQuorumMet()) {
+			final long token = quorum.awaitQuorum(awaitQuorumTimeout,
+					TimeUnit.MILLISECONDS);
+			/*
+			 * Note: It is possible to resolve a proxy for a service that has
+			 * been recently shutdown or destroyed. This is effectively a data
+			 * race.
+			 */
+			final HAGlue t = quorum.getClient().getLeader(token);
+			if (t.equals(serverA)) {
+				leader = t;
+				leaderServiceDir = getServiceDirA();
+				leaderListener = serviceListenerA;
+			} else if (t.equals(serverB)) {
+				leader = t;
+				leaderServiceDir = getServiceDirB();
+				leaderListener = serviceListenerB;
+			} else if (t.equals(serverC)) {
+				leader = t;
+				leaderServiceDir = getServiceDirC();
+				leaderListener = serviceListenerC;
+			} else if (t.equals(serverD)) {
+				leader = t;
+				leaderServiceDir = getServiceDirD();
+				leaderListener = serviceListenerD;
+			} else if (t.equals(serverE)) {
+				leader = t;
+				leaderServiceDir = getServiceDirE();
+				leaderListener = serviceListenerE;
+			} else {
+				if (serverA == null && serverB == null && serverC == null && serverD == null && serverE == null) {
+					/*
+					 * There are no services running and nothing to shutdown. We
+					 * probably resolved a stale proxy to the leader above.
+					 */
+					return;
+				}
+				throw new IllegalStateException(
+						"Leader is none of A, B, or C: leader=" + t + ", A="
+								+ serverA + ", B=" + serverB + ", C=" + serverC);
+			}
+		} else {
+			leader = null;
+			leaderServiceDir = null;
+			leaderListener = null;
+		}
+
+		if (leader == null || !leader.equals(serverA)) {
+			destroyA();
+		}
+
+		if (leader == null || !leader.equals(serverB)) {
+			destroyB();
+		}
+
+		if (leader == null || !leader.equals(serverC)) {
+			destroyC();
+		}
+
+		if (leader == null || !leader.equals(serverD)) {
+			destroyD();
+		}
+
+		if (leader == null || !leader.equals(serverE)) {
+			destroyE();
+		}
+
+		// Destroy leader last
+		if (leader != null) {
+			safeDestroy(leader, leaderServiceDir, leaderListener);
+
+			serverA = serverB = serverC = serverD = serverE = null;
+			serviceListenerA = serviceListenerC = serviceListenerB = serviceListenerD = serviceListenerE = null;
+		}
+
+	}
+
+    protected void destroyD() {
+        safeDestroy(serverD, getServiceDirD(), serviceListenerD);
+        serverD = null;
+        serviceListenerD = null;
+    }
+
+    protected void destroyE() {
+        safeDestroy(serverE, getServiceDirE(), serviceListenerE);
+        serverE = null;
+        serviceListenerE = null;
+    }
+
+}

Modified: branches/BIGDATA_MGC_HA1_HA5/bigdata-jini/src/test/com/bigdata/journal/jini/ha/AbstractHAJournalServerTestCase.java
===================================================================
--- branches/BIGDATA_MGC_HA1_HA5/bigdata-jini/src/test/com/bigdata/journal/jini/ha/AbstractHAJournalServerTestCase.java	2014-04-02 13:03:59 UTC (rev 8025)
+++ branches/BIGDATA_MGC_HA1_HA5/bigdata-jini/src/test/com/bigdata/journal/jini/ha/AbstractHAJournalServerTestCase.java	2014-04-02 13:12:56 UTC (rev 8026)
@@ -440,8 +440,17 @@
          * Wait for the service to report that it is ready as a leader or
          * follower.
          */
-        haGlue.awaitHAReady(awaitQuorumTimeout, TimeUnit.MILLISECONDS);
+        return awaitNSSAndHAReady(haGlue, awaitQuorumTimeout, TimeUnit.MILLISECONDS);
+    }
+
+    protected HAStatusEnum awaitNSSAndHAReady(final HAGlue haGlue, long timout, TimeUnit unit)
+            throws Exception {
         /*
+         * Wait for the service to report that it is ready as a leader or
+         * follower.
+         */
+        haGlue.awaitHAReady(timout, unit);
+        /*
          * Wait for the NSS to report the status of the service (this verifies
          * that the NSS interface is running).
          */
@@ -525,7 +534,9 @@
     protected String getNanoSparqlServerURL(final HAGlue haGlue)
             throws IOException {
 
-        return "http://localhost:" + haGlue.getNSSPort();
+    	final int port = haGlue.getNSSPort();
+    	
+        return "http://localhost:" + port;
 
     }
 
@@ -541,7 +552,7 @@
 
         final String sparqlEndpointURL = getNanoSparqlServerURL(haGlue)
                 + "/sparql";
-
+        
         // Client for talking to the NSS.
         final HttpClient httpClient = new DefaultHttpClient(ccm);
 
@@ -1248,4 +1259,35 @@
 
     }
 
+    /**
+     * The effective name for this test as used to name the directories in which
+     * we store things.
+     * 
+     * TODO If there are method name collisions across the different test
+     * classes then the test suite name can be added to this. Also, if there are
+     * file naming problems, then this value can be munged before it is
+     * returned.
+     */
+    private final String effectiveTestFileName = getClass().getSimpleName()
+            + "." + getName();
+
+    /**
+     * The directory that is the parent of each {@link HAJournalServer}'s
+     * individual service directory.
+     */
+    protected File getTestDir() {
+        return new File(TGT_PATH, getEffectiveTestFileName());
+    }
+
+    /**
+     * The effective name for this test as used to name the directories in which
+     * we store things.
+     */
+    protected String getEffectiveTestFileName() {
+        
+        return effectiveTestFileName;
+        
+    }
+
+
 }

Added: branches/BIGDATA_MGC_HA1_HA5/bigdata-jini/src/test/com/bigdata/journal/jini/ha/HAJournal-D.config
===================================================================
--- branches/BIGDATA_MGC_HA1_HA5/bigdata-jini/src/test/com/bigdata/journal/jini/ha/HAJournal-D.config	                        (rev 0)
+++ branches/BIGDATA_MGC_HA1_HA5/bigdata-jini/src/test/com/bigdata/journal/jini/ha/HAJournal-D.config	2014-04-02 13:12:56 UTC (rev 8026)
@@ -0,0 +1,288 @@
+import net.jini.jeri.BasicILFactory;
+import net.jini.jeri.BasicJeriExporter;
+import net.jini.jeri.tcp.TcpServerEndpoint;
+
+import net.jini.discovery.LookupDiscovery;
+import net.jini.core.discovery.LookupLocator;
+import net.jini.core.entry.Entry;
+import net.jini.lookup.entry.Name;
+import net.jini.lookup.entry.Comment;
+import net.jini.lookup.entry.Address;
+import net.jini.lookup.entry.Location;
+import net.jini.lookup.entry.ServiceInfo;
+import net.jini.core.lookup.ServiceTemplate;
+
+import java.io.File;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.util.UUID;
+
+import com.bigdata.util.NV;
+import com.bigdata.util.config.NicUtil;
+import com.bigdata.journal.Options;
+import com.bigdata.journal.BufferMode;
+import com.bigdata.journal.jini.ha.HAJournal;
+import com.bigdata.jini.lookup.entry.*;
+import com.bigdata.service.IBigdataClient;
+import com.bigdata.service.AbstractTransactionService;
+import com.bigdata.service.jini.*;
+import com.bigdata.service.jini.lookup.DataServiceFilter;
+import com.bigdata.service.jini.master.ServicesTemplate;
+import com.bigdata.jini.start.config.*;
+import com.bigdata.jini.util.ConfigMath;
+
+import org.apache.zookeeper.ZooDefs;
+import org.apache.zookeeper.data.ACL;
+import org.apache.zookeeper.data.Id;
+
+// imports for various options.
+import com.bigdata.btree.IndexMetadata;
+import com.bigdata.btree.keys.KeyBuilder;
+import com.bigdata.rdf.sail.BigdataSail;
+import com.bigdata.rdf.spo.SPORelation;
+import com.bigdata.rdf.spo.SPOKeyOrder;
+import com.bigdata.rdf.lexicon.LexiconRelation;
+import com.bigdata.rdf.lexicon.LexiconKeyOrder;
+import com.bigdata.rawstore.Bytes;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeUnit.*;
+
+/*
+ * This is a sample configuration file for a highly available Journal. A
+ * version of this file must be available to each HAJournalServer in the
+ * pipeline.
+ */
+
+/*
+ * Globals.
+ */
+bigdata {
+
+   private static fedname = "benchmark";
+   
+   // NanoSparqlServer (http) port.
+   private static nssPort = ConfigMath.add(8090,3);
+   
+   // write replication pipeline port (listener).
+   private static haPort = ConfigMath.add(9090,3);
+
+   // The #of services in the write pipeline.
+   private static replicationFactor = 5;
+   
+   // The logical service identifier shared by all members of the quorum.
+   private static logicalServiceId = System.getProperty("test.logicalServiceId","CI-HAJournal-1");
+
+   // The service directory.
+   // Note: Overridden by environment property when deployed.
+   private static serviceDir = new File(System.getProperty("test.serviceDir",ConfigMath.getAbsolutePath(new File(new File(fedname,logicalServiceId),"D"))));
+   //new File(new File(fedname,logicalServiceId),"D");
+   
+   // journal data directory.
+   private static dataDir = serviceDir;
+
+   // one federation, multicast discovery.
+   //static private groups = LookupDiscovery.ALL_GROUPS;
+
+   // unicast discovery or multiple setups, MUST specify groups.
+   static private groups = new String[]{bigdata.fedname};
+
+    /**
...
 
[truncated message content]

Thread: [Bigdata-commit] SF.net SVN: bigdata:[8026] branches/BIGDATA_MGC_HA1_HA5

Fast, scalable, robust graph database platform

bigdata-commit