Menu
▾
▴
[Bigdata-commit] SF.net SVN: bigdata:[3492] branches/maven_scaleout/src
|
From: <fko...@us...> - 2010-09-01 21:16:59
|
Revision: 3492
http://bigdata.svn.sourceforge.net/bigdata/?rev=3492&view=rev
Author: fkoliver
Date: 2010-09-01 21:16:52 +0000 (Wed, 01 Sep 2010)
Log Message:
-----------
Add serviceJoin(Service...) methods to match existing
serviceJoin(IService...) methods for smart proxies.
Modified Paths:
--------------
branches/maven_scaleout/src/main/java/com/bigdata/service/AbstractFederation.java
branches/maven_scaleout/src/main/java/com/bigdata/service/DefaultClientDelegate.java
branches/maven_scaleout/src/main/java/com/bigdata/service/DefaultServiceFederationDelegate.java
branches/maven_scaleout/src/main/java/com/bigdata/service/IFederationDelegate.java
branches/maven_scaleout/src/main/java/com/bigdata/service/jini/JiniFederation.java
branches/maven_scaleout/src/main/java/com/bigdata/service/jini/util/ListServices.java
branches/maven_scaleout/src/test/java/com/bigdata/resources/AbstractResourceManagerTestCase.java
branches/maven_scaleout/src/test/java/com/bigdata/service/TestEventReceiver.java
Modified: branches/maven_scaleout/src/main/java/com/bigdata/service/AbstractFederation.java
===================================================================
--- branches/maven_scaleout/src/main/java/com/bigdata/service/AbstractFederation.java 2010-09-01 20:02:58 UTC (rev 3491)
+++ branches/maven_scaleout/src/main/java/com/bigdata/service/AbstractFederation.java 2010-09-01 21:16:52 UTC (rev 3492)
@@ -78,7 +78,6 @@
* Abstract base class for {@link IBigdataFederation} implementations.
*
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
* @param <T>
* The generic type of the client or service.
*
@@ -947,8 +946,25 @@
/**
* Delegated. {@inheritDoc}
*/
- public void serviceLeave(final UUID serviceUUID) {
+ public void serviceJoin(final Service service, final UUID serviceUUID) {
+ if (!isOpen()) return;
+
+ if (log.isInfoEnabled()) {
+
+ log.info("service=" + service + ", serviceUUID" + serviceUUID);
+
+ }
+
+ client.getDelegate().serviceJoin(service, serviceUUID);
+
+ }
+
+ /**
+ * Delegated. {@inheritDoc}
+ */
+ public void serviceLeave(final UUID serviceUUID) {
+
if(!isOpen()) return;
if(log.isInfoEnabled()) {
@@ -1007,7 +1023,6 @@
* before the service can be started.
*
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
*/
protected class StartDeferredTasksTask implements Runnable {
@@ -1303,7 +1318,6 @@
* load balancer service.
*
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
*/
public static class ReportTask implements Runnable {
@@ -1504,7 +1518,6 @@
* Sends events to the load balancer service.
*
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
*
* FIXME should discard events if too many build up on the client.
*/
Modified: branches/maven_scaleout/src/main/java/com/bigdata/service/DefaultClientDelegate.java
===================================================================
--- branches/maven_scaleout/src/main/java/com/bigdata/service/DefaultClientDelegate.java 2010-09-01 20:02:58 UTC (rev 3491)
+++ branches/maven_scaleout/src/main/java/com/bigdata/service/DefaultClientDelegate.java 2010-09-01 21:16:52 UTC (rev 3492)
@@ -19,7 +19,6 @@
* {@link AbstractClient#setDelegate(IFederationDelegate)}.
*
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
*/
public class DefaultClientDelegate<T> implements IFederationDelegate<T> {
@@ -118,6 +117,11 @@
}
/** NOP */
+ public void serviceJoin(Service service, UUID serviceUUID) {
+
+ }
+
+ /** NOP */
public void serviceLeave(UUID serviceUUID) {
}
Modified: branches/maven_scaleout/src/main/java/com/bigdata/service/DefaultServiceFederationDelegate.java
===================================================================
--- branches/maven_scaleout/src/main/java/com/bigdata/service/DefaultServiceFederationDelegate.java 2010-09-01 20:02:58 UTC (rev 3491)
+++ branches/maven_scaleout/src/main/java/com/bigdata/service/DefaultServiceFederationDelegate.java 2010-09-01 21:16:52 UTC (rev 3492)
@@ -53,7 +53,6 @@
* service interface reported to the load balancer service.
*
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
*/
public class DefaultServiceFederationDelegate<T extends AbstractService>
implements IFederationDelegate<T> {
@@ -145,6 +144,11 @@
}
/** NOP */
+ public void serviceJoin(Service service, UUID serviceUUID) {
+
+ }
+
+ /** NOP */
public void serviceLeave(UUID serviceUUID) {
}
Modified: branches/maven_scaleout/src/main/java/com/bigdata/service/IFederationDelegate.java
===================================================================
--- branches/maven_scaleout/src/main/java/com/bigdata/service/IFederationDelegate.java 2010-09-01 20:02:58 UTC (rev 3491)
+++ branches/maven_scaleout/src/main/java/com/bigdata/service/IFederationDelegate.java 2010-09-01 21:16:52 UTC (rev 3492)
@@ -39,7 +39,6 @@
* by the {@link AbstractFederation}.
*
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
* @param <T>
* The generic type of the client or service.
*/
@@ -100,15 +99,27 @@
* Notice that the service has been discovered. This notice will be
* generated the first time the service is discovered by a given
* {@link IBigdataClient}.
- *
+ *
* @param service
* The service.
* @param serviceUUID
* The service {@link UUID}.
*/
public void serviceJoin(IService service, UUID serviceUUID);
-
+
/**
+ * Notice that the service has been discovered. This notice will be
+ * generated the first time the service is discovered by a given
+ * {@link IBigdataClient}.
+ *
+ * @param service
+ * The service.
+ * @param serviceUUID
+ * The service {@link UUID}.
+ */
+ public void serviceJoin(Service service, UUID serviceUUID);
+
+ /**
* Notice that the service is no longer available. This notice will be
* generated once for a given {@link IBigdataClient} when the service is no
* longer available from any of its service registrars.
Modified: branches/maven_scaleout/src/main/java/com/bigdata/service/jini/JiniFederation.java
===================================================================
--- branches/maven_scaleout/src/main/java/com/bigdata/service/jini/JiniFederation.java 2010-09-01 20:02:58 UTC (rev 3491)
+++ branches/maven_scaleout/src/main/java/com/bigdata/service/jini/JiniFederation.java 2010-09-01 21:16:52 UTC (rev 3492)
@@ -109,12 +109,12 @@
//BTM
import com.bigdata.service.LoadBalancer;
+import com.bigdata.service.Service;
/**
* Concrete implementation for Jini.
*
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
*/
public class JiniFederation<T> extends AbstractDistributedFederation<T> implements
DiscoveryListener, ServiceDiscoveryListener {
@@ -1260,17 +1260,22 @@
if (serviceItem.service instanceof IService) {
-// System.err.println("serviceAdded: "+serviceItem);
-
final UUID serviceUUID = JiniUtil
.serviceID2UUID(serviceItem.serviceID);
serviceJoin((IService) serviceItem.service, serviceUUID);
+ } else if (serviceItem.service instanceof Service) {
+
+ final UUID serviceUUID = JiniUtil
+ .serviceID2UUID(serviceItem.serviceID);
+
+ serviceJoin((Service) serviceItem.service, serviceUUID);
+
} else {
- log.warn("Not an " + IService.class);
-
+ log.warn("Not an " + IService.class + " or an " + Service.class);
+
}
}
@@ -1410,7 +1415,6 @@
* Glue object.
*
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
*/
static private class TaskFuture<T> {
@@ -1436,7 +1440,6 @@
* Run as a scheduled task that monitors futures.
*
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
*/
private static class MonitorFuturesTask implements Runnable {
Modified: branches/maven_scaleout/src/main/java/com/bigdata/service/jini/util/ListServices.java
===================================================================
--- branches/maven_scaleout/src/main/java/com/bigdata/service/jini/util/ListServices.java 2010-09-01 20:02:58 UTC (rev 3491)
+++ branches/maven_scaleout/src/main/java/com/bigdata/service/jini/util/ListServices.java 2010-09-01 21:16:52 UTC (rev 3492)
@@ -59,7 +59,6 @@
* Utility will list the discovered services in federation to which it connects.
*
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
*/
public class ListServices {
@@ -155,7 +154,6 @@
*
* @author <a href="mailto:tho...@us...">Bryan
* Thompson</a>
- * @version $Id$
*/
static class DiscoverAndListTask implements Callable<String> {
@@ -329,7 +327,12 @@
+ "running.\n");
sb.append("Discovered " + registrars.length
- + " jini service registrars.\n");
+ + " jini service registrars. [ ");
+ for (ServiceRegistrar registrar : registrars) {
+ sb.append(registrar.getLocator().toString());
+ sb.append(' ');
+ }
+ sb.append("]\n");
sb.append("Discovered " + a.length + " services\n");
Modified: branches/maven_scaleout/src/test/java/com/bigdata/resources/AbstractResourceManagerTestCase.java
===================================================================
--- branches/maven_scaleout/src/test/java/com/bigdata/resources/AbstractResourceManagerTestCase.java 2010-09-01 20:02:58 UTC (rev 3491)
+++ branches/maven_scaleout/src/test/java/com/bigdata/resources/AbstractResourceManagerTestCase.java 2010-09-01 21:16:52 UTC (rev 3492)
@@ -79,13 +79,13 @@
import com.bigdata.util.httpd.AbstractHTTPD;
import com.bigdata.service.LoadBalancer;
+import com.bigdata.service.Service;
/**
* Base class for {@link ResourceManager} test suites that can use normal
* startup and shutdown.
*
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
*/
public class AbstractResourceManagerTestCase extends
AbstractResourceManagerBootstrapTestCase {
@@ -238,7 +238,6 @@
* trying to test.
*
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
*/
protected static class MockMetadataService implements IMetadataService {
@@ -410,7 +409,6 @@
* {@link ResourceManager} during the unit tests.
*
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
*/
protected class MockFederation implements IBigdataFederation<MockMetadataService> {
@@ -611,6 +609,9 @@
public void serviceJoin(IService service, UUID serviceUUID) {
}
+ public void serviceJoin(Service service, UUID serviceUUID) {
+ }
+
public void serviceLeave(UUID serviceUUID) {
}
Modified: branches/maven_scaleout/src/test/java/com/bigdata/service/TestEventReceiver.java
===================================================================
--- branches/maven_scaleout/src/test/java/com/bigdata/service/TestEventReceiver.java 2010-09-01 20:02:58 UTC (rev 3491)
+++ branches/maven_scaleout/src/test/java/com/bigdata/service/TestEventReceiver.java 2010-09-01 21:16:52 UTC (rev 3492)
@@ -63,7 +63,6 @@
* Unit tests for the {@link EventReceiver}.
*
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
*/
public class TestEventReceiver extends TestCase2 {
@@ -85,7 +84,6 @@
* {@link EventReceiver} on the {@link MockFederation}.
*
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
*/
static class MyEvent extends Event {
@@ -418,7 +416,6 @@
* Generates events.
*
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
*/
private static class EventFactory implements Callable<Void> {
@@ -484,7 +481,6 @@
* the events are stored).
*
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
*/
static private class EventConsumer implements Callable<Void> {
@@ -525,7 +521,6 @@
* Mock federation to support the unit tests in the outer class.
*
* @author <a href="mailto:tho...@us...">Bryan Thompson</a>
- * @version $Id$
*/
static class MockFederation implements IBigdataFederation<IEventReceivingService> {
@@ -706,9 +701,13 @@
}
public void serviceJoin(IService service, UUID serviceUUID) {
-
+
}
+ public void serviceJoin(Service service, UUID serviceUUID) {
+
+ }
+
public void serviceLeave(UUID serviceUUID) {
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
