Thread: [Bigdata-commit] SF.net SVN: bigdata:[3269] branches/dev-btm

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

Revision: 3269
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3269&view=rev
Author:   btmurphy
Date:     2010-07-23 12:19:14 +0000 (Fri, 23 Jul 2010)

Log Message:
-----------
[branch dev-btm]: CHECKPOINT - smart proxy work, still incomplete and including debug println's and BTM markers, but checkpointed for syncing with trunk changes

Modified Paths:
--------------
    branches/dev-btm/bigdata/src/java/com/bigdata/counters/AbstractCounterSet.java
    branches/dev-btm/bigdata/src/java/com/bigdata/service/AbstractFederation.java
    branches/dev-btm/bigdata/src/java/com/bigdata/service/EmbeddedFederation.java
    branches/dev-btm/bigdata/src/java/com/bigdata/service/LocalDataServiceFederation.java
    branches/dev-btm/bigdata/src/java/com/bigdata/util/config/NicUtil.java
    branches/dev-btm/bigdata/src/test/com/bigdata/service/StressTestConcurrent.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/executor/ServiceImpl.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/AbstractServicesManagerService.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/ManageLogicalServiceTask.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/MonitorCreatePhysicalServiceLocksTask.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/RestartPersistentServices.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/ServiceConfigurationZNodeMonitorTask.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/ServicesManagerServer.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/ServicesManagerStartupTask.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/config/AbstractHostConstraint.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/config/BigdataServiceConfiguration.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/config/JavaServiceConfiguration.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/config/JiniCoreServicesConfiguration.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/config/JiniServiceConfiguration.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/config/LoadBalancerConfiguration.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/config/ManagedServiceConfiguration.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/config/ServiceConfiguration.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/config/ServicesManagerConfiguration.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/config/ZookeeperServerEntry.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/process/JiniCoreServicesProcessHelper.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/process/JiniServiceProcessHelper.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/process/ProcessHelper.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/process/ZookeeperProcessHelper.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/loadbalancer/EmbeddedLoadBalancer.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/loadbalancer/ServiceImpl.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/loadbalancer/ServiceProxy.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/loadbalancer/config/logging.properties
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/metadata/ServiceImpl.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/service/jini/AbstractServer.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/service/jini/JiniFederation.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/service/jini/lookup/LoadBalancerClient.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/service/jini/util/JiniServicesHelper.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/service/jini/util/LookupStarter.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/service/jini/util/config/lookup.config
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/shard/ServiceImpl.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/transaction/ServiceImpl.java
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/util/Util.java
    branches/dev-btm/bigdata-jini/src/resources/config/bigdataStandaloneTesting.config
    branches/dev-btm/bigdata-jini/src/test/com/bigdata/jini/start/config/TestZookeeperServerEntry.java
    branches/dev-btm/bigdata-jini/src/test/com/bigdata/jini/start/testReggie.config
    branches/dev-btm/bigdata-jini/src/test/com/bigdata/jini/start/testStartJini.config
    branches/dev-btm/bigdata-jini/src/test/com/bigdata/zookeeper/testzoo.config
    branches/dev-btm/build.properties
    branches/dev-btm/build.xml
    branches/dev-btm/src/resources/config/bigdataCluster.config
    branches/dev-btm/src/resources/config/jini/reggie.config
    branches/dev-btm/src/resources/config/log4j.properties
    branches/dev-btm/src/resources/config/logging.properties

Added Paths:
-----------
    branches/dev-btm/bigdata-jini/src/java/com/bigdata/util/EntryUtil.java

Modified: branches/dev-btm/bigdata/src/java/com/bigdata/counters/AbstractCounterSet.java
===================================================================

--- branches/dev-btm/bigdata/src/java/com/bigdata/counters/AbstractCounterSet.java	2010-07-23 11:04:00 UTC (rev 3268)
+++ branches/dev-btm/bigdata/src/java/com/bigdata/counters/AbstractCounterSet.java	2010-07-23 12:19:14 UTC (rev 3269)
@@ -42,6 +42,8 @@
  */
 public abstract class AbstractCounterSet implements ICounterSet {
 
+public static org.apache.log4j.Logger logger = com.bigdata.util.config.LogUtil.getLog4jLogger((AbstractCounterSet.class).getName());
+
     protected final String name;
     protected AbstractCounterSet parent;
 
@@ -198,11 +200,39 @@
         
         if( path.contains("//")) {
 
+if (logger.isEnabledFor(org.apache.log4j.Level.WARN)) {
+    logger.warn("***** AbstractCounterSet.getPath: CONTAINS SLASH-SLASH: path INPUT = "+path);
+    logger.warn("***** AbstractCounterSet.getPath: path.length = "+path.length());
+    byte[] pathBytes = path.getBytes();
+    StringBuffer strBuf = new StringBuffer();
+    if( (pathBytes[0] < 32) || (pathBytes[0] > 126) ) {
+        strBuf.append("X");
+    }else{
+        strBuf.append( new String(new byte[] {pathBytes[0]}) );
+    }
+    for(int i=1;i<pathBytes.length; i++) {
+        if( (pathBytes[i] < 32) || (pathBytes[i] > 126) ) {
+            strBuf.append("X");
+        }else{
+            strBuf.append( new String(new byte[] {pathBytes[i]}) );
+        }
+    }
+    logger.warn("***** AbstractCounterSet.getPath: CONTAINS SLASH-SLASH: path CONVERTED = "+strBuf.toString());
+}
+int slashSlashIndex = path.indexOf("//");
+if(slashSlashIndex >= 0) {//contains "//"
+    logger.warn("***** AbstractCounterSet.getPath: INDEX OF SLASH-SLASH = "+slashSlashIndex);
+}else{//does not contain "//"
+    logger.warn("***** AbstractCounterSet.getPath: !!!! path CONTAINS SLASH-SLASH, but indexOf = "+slashSlashIndex+" !!!!");
+}
+
+if(slashSlashIndex >= 0) {//throw exception only if BOTH path.contains AND path.indexOf say that the given path contains "//"
             /*
              * Empty path names are not allowed.
              */
             
             throw new IllegalArgumentException(path);
+}//BTM
             
         }
         

Modified: branches/dev-btm/bigdata/src/java/com/bigdata/service/AbstractFederation.java
===================================================================
--- branches/dev-btm/bigdata/src/java/com/bigdata/service/AbstractFederation.java	2010-07-23 11:04:00 UTC (rev 3268)
+++ branches/dev-btm/bigdata/src/java/com/bigdata/service/AbstractFederation.java	2010-07-23 12:19:14 UTC (rev 3269)
@@ -1388,7 +1388,7 @@
 
             // Note: This _is_ a local method call.
             final UUID serviceUUID = fed.getServiceUUID();
-
+System.out.println("\n>>>>> AbstractFederation.reportPerformanceCounters: serviceUUID = "+serviceUUID);
             // Will be null until assigned by the service registrar.
             if (serviceUUID == null) {
 
@@ -1403,12 +1403,14 @@
 final LoadBalancer loadBalancerService = fed.getLoadBalancerService();
 
             if (loadBalancerService == null) {
+System.out.println(">>>>> AbstractFederation.reportPerformanceCounters: loadBalancerService = NULL");
 
                 log.warn("Could not discover load balancer service.");
 
                 return;
 
             }
+System.out.println(">>>>> AbstractFederation.reportPerformanceCounters: loadBalancerService = "+loadBalancerService);
 
             /*
              * @todo this is probably worth compressing as there will be a lot
@@ -1419,9 +1421,12 @@
             final ByteArrayOutputStream baos = new ByteArrayOutputStream(
                     Bytes.kilobyte32 * 2);
 
+System.out.println(">>>>> AbstractFederation.reportPerformanceCounters: CALLING fed.getCounterSet() ...");
             fed.getCounterSet().asXML(baos, "UTF-8", null/* filter */);
 
+System.out.println(">>>>> AbstractFederation.reportPerformanceCounters: CALLING loadBalancer.notify ...");
             loadBalancerService.notify(serviceUUID, baos.toByteArray());
+System.out.println(">>>>> AbstractFederation.reportPerformanceCounters: DONE CALLING loadBalancer.notify");
 
             if (log.isInfoEnabled())
                 log.info("Notified the load balancer.");

Modified: branches/dev-btm/bigdata/src/java/com/bigdata/service/EmbeddedFederation.java
===================================================================
--- branches/dev-btm/bigdata/src/java/com/bigdata/service/EmbeddedFederation.java	2010-07-23 11:04:00 UTC (rev 3268)
+++ branches/dev-btm/bigdata/src/java/com/bigdata/service/EmbeddedFederation.java	2010-07-23 12:19:14 UTC (rev 3269)
@@ -620,6 +620,9 @@
 //BTM                p.setProperty(LoadBalancerService.Options.TRANSIENT, "true");
 p.setProperty(EmbeddedLoadBalancerServiceImpl.Options.TRANSIENT, "true");
 
+p.setProperty(EmbeddedLoadBalancerServiceImpl.Options.LOG_DIR,
+              new File(EmbeddedLoadBalancerServiceImpl.Options.DEFAULT_LOG_DIR).toString());
+
             } else {
                 
                 // specify the data directory for the load balancer.
@@ -860,6 +863,7 @@
 {
     super(serviceUUID, hostname, 
 sdm,
+properties.getProperty(EmbeddedLoadBalancerServiceImpl.Options.LOG_DIR),
 //BTM*** EmbeddedFederation.this,
 dataServiceMap,//BTM*** - remove after DataService smart proxy?
           properties);

Modified: branches/dev-btm/bigdata/src/java/com/bigdata/service/LocalDataServiceFederation.java
===================================================================
--- branches/dev-btm/bigdata/src/java/com/bigdata/service/LocalDataServiceFederation.java	2010-07-23 11:04:00 UTC (rev 3268)
+++ branches/dev-btm/bigdata/src/java/com/bigdata/service/LocalDataServiceFederation.java	2010-07-23 12:19:14 UTC (rev 3269)
@@ -193,6 +193,7 @@
 loadBalancerService = new EmbeddedLoadBalancer(UUID.randomUUID(),
                                                hostname,
                                                null,//SDM - replace with real SDM after conversion to smart proxy?
+p.getProperty(EmbeddedLoadBalancer.Options.LOG_DIR),
 //BTM*** LocalDataServiceFederation.this,
 //BTM*** remove after EmbeddedDataService is converted to smart proxy?
                                                dataServiceMap,

Modified: branches/dev-btm/bigdata/src/java/com/bigdata/util/config/NicUtil.java
===================================================================
--- branches/dev-btm/bigdata/src/java/com/bigdata/util/config/NicUtil.java	2010-07-23 11:04:00 UTC (rev 3268)
+++ branches/dev-btm/bigdata/src/java/com/bigdata/util/config/NicUtil.java	2010-07-23 12:19:14 UTC (rev 3269)
@@ -505,6 +505,253 @@
     }
 
     /**
+     * Special-purpose convenience method that returns a
+     * <code>String</code> value representing the ip address of 
+     * the current node; where the value that is returned is 
+     * determined according to following criteria:
+     * <p>
+     * <ul>
+     *  <li> If a non-<code>null</code> value is input for the
+     *       <code>systemPropertyName</code> parameter, then
+     *       this is viewed as a declaration by the caller that
+     *       that the system property with that given value
+     *       should take precedence over all other means of
+     *       determining the desired ip address. As such, this
+     *       method determines if a system property having the
+     *       given has indeed been set and, if it has, returns
+     *       the ip address of the nic having that name; or 
+     *       <code>null</code> if there is no nic with the 
+     *       desired name installed on the node.
+     *  <li> If a non-<code>null</code> value is input for the
+     *       <code>systemPropertyName</code> parameter, but
+     *       no system property with that name has been set, 
+     *       and <code>true</code> has been passed in for
+     *       the <code>fallbackOk</code> parameter, then this
+     *       method will return the IPV4 based address of the
+     *       first reachable nic that is found on the node.
+     *       Upon failing to find such an address, if the
+     *       <code>loopbackOk</code> parameter is also 
+     *       <code>true</code>, then this method will return
+     *       the <i>loop back</i> address of the node; otherwise
+     *       <code>null</code> is returned.
+     *  <li> If <code>null</code> is input for the 
+     *       <code>systemPropertyName</code> parameter, but
+     *       a non-<code>null</code> value is input for the
+     *       <code>defaultNic</code> parameter, then this
+     *       method returns the ip address of the nic having
+     *       that name; or <code>null</code> if there is no
+     *       nic with the desired default name installed on the
+     *       node.
+     *  <li> If <code>null</code> is input for both the 
+     *       <code>systemPropertyName</code> parameter and the
+     *       <code>defaultNic</code> parameter, and if the
+     *       <code>fallbackOk</code> parameter is <code>true</code>,
+     *       then this method will return the IPV4 based address
+     *       of the first reachable nic that is found on the node.
+     *       Upon failing to find such an address, if the
+     *       <code>loopbackOk</code> parameter is also 
+     *       <code>true</code>, then this method will return
+     *       the <i>loop back</i> address of the node; otherwise
+     *       <code>null</code> is returned.
+     * </ul>
+     * <p>
+     * This method can be called from within a configuration
+     * as well as from within program control.
+     *
+     * @param systemPropertyName <code>String</code> value containing
+     *                           the name of a system property whose
+     *                           value is the network interface name
+     *                           whose ip address should be returned.
+     *                           May be <code>null</code>.
+     *
+     * @param defaultNic         <code>String</code> value containing
+     *                           the name of the network interface
+     *                           whose ip address should be returned
+     *                           if <code>null</code> is input for the
+     *                           <code>systemPropertyName</code> parameter.
+     *
+     * @param fallbackOk         if <code>true</code>, then if either
+     *                           no system property is set having the
+     *                           name referenced by the 
+     *                           <code>systemPropertyName</code> parameter,
+     *                           or if <code>null</code> is input for both
+     *                           the <code>systemPropertyName</code>
+     *                           parameter and the <code>defaultNic</code>
+     *                           parameter, return the IPV4 based address
+     *                           of the first reachable network interface
+     *                           that can be found on the node.
+     *
+     * @param loopbackOk         if <code>true</code>, and if <code>true</code>
+     *                           is also input for the <code>fallbackOk</code>
+     *                           parameter, then if this method attempts,
+     *                           but fails, to find a valid IPV4 fallback
+     *                           address, then the node's <i>loop back</i>
+     *                           address is returned.
+     *
+     * @return a <code>String</code> representing an ip address associated
+     *         with the current node; where the value that is returned is
+     *         determined according to the criteria described above.
+     */
+    public static String getIpAddress(String  systemPropertyName,
+                                      String  defaultNic,
+                                      boolean fallbackOk,
+                                      boolean loopbackOk)
+                             throws SocketException, IOException
+    {
+        if(systemPropertyName != null) {//system property takes precedence
+            String nicName = System.getProperty(systemPropertyName);
+            boolean propSet = true;
+            if(nicName == null) {
+                propSet = false;
+            } else {
+                // handle ant script case where the system property
+                // may not have been set on the command line, but
+                // was still set to "${<systemPropertyName>}" using
+                // ant <sysproperty> tag
+                String rawProp = "${" + systemPropertyName + "}";
+                if( rawProp.equals(nicName) ) propSet = false;
+            }
+            if(propSet) {
+                return getIpAddress(nicName, 0, loopbackOk);
+            } else {//desired system property not set, try fallback
+                if(fallbackOk) {
+                    return getDefaultIpv4Address(loopbackOk);
+                } else {
+                    return null;
+                }
+            }
+        } else {//no system property name provided, try default nic
+            if(defaultNic != null) {
+                return getIpAddress(defaultNic, 0, loopbackOk);
+            } else {//no default nic provided, try fallback
+                if(fallbackOk) {
+                    return getDefaultIpv4Address(loopbackOk);
+                } else {
+                    return null;
+                }
+            }
+        }
+    }
+
+    public static String getIpAddress()
+                             throws SocketException, IOException
+    {
+        return getIpAddress(null, null, true, true);
+    }
+
+    /**
+     * Examines each address associated with each network interface
+     * card (nic) installed on the current node, and returns the
+     * <code>String</code> value of the first such address that is
+     * determined to be both <i>reachable</i> and an address type
+     * that represents an <i>IPv4</i> address.
+     *
+     * This method will always first examine addresses that are
+     * <i>not</i> the <i>loopback</i> address (<i>local host</i>);
+     * returning a loopback adddress only if <code>true</code>
+     * is input for the <code>loopbackOk</code> parameter, and
+     * none of the non-loopback addresses satisfy this method's
+     * search criteria.
+     *
+     * If this method fails to find any address that satisfies the
+     * above criteria, then this method returns <code>null</code>.
+     *
+     * @param loopbackOk if <code>true</code>, then upon failure
+     *                   find an non-<i>loopback</i> address that
+     *                   satisfies this method's search criteria
+     *                   (an IPv4 type address and reachable), the
+     *                   first loopback address that is found to be
+     *                   reachable is returned.
+     *
+     *                   If <code>false</code> is input for this
+     *                   parameter, then this method will examine
+     *                   only those addresses that do <i>not</i>
+     *                   correspond to the corresponding nic's
+     *                   loopback address.
+     *
+     * @return a <code>String</code> value representing the first
+     *         network interface address installed on the current
+     *         node that is determined to be both <i>reachable</i>
+     *         and an IPv4 type address; where the return value
+     *         corresponds to a <i>loopback</i> address only if 
+     *         <code>true</code> is input for the <code>loopbackOk</code>
+     *         parameter, and no non-loopback address satisfying
+     *         the desired criteria can be found. If this method
+     *         fails to find any address that satisfies the desired
+     *         criteria, then <code>null</code> is returned.
+     *
+     * @throws SocketException if there is an error in the underlying
+     *         I/O subsystem and/or protocol while retrieving the
+     *         the network interfaces currently installed on the
+     *         node.
+     *
+     * @throws IOException if a network error occurs while determining
+     *         if a candidate return address is <i>reachable</i>.
+     */
+    public static String getDefaultIpv4Address(boolean loopbackOk)
+                             throws SocketException, IOException
+    {
+        //get all nics on the current node
+        Enumeration<NetworkInterface> nics = 
+            NetworkInterface.getNetworkInterfaces();
+        while( nics.hasMoreElements() ) {
+            NetworkInterface curNic = nics.nextElement();
+            List<InterfaceAddress> interfaceAddrs = 
+                                       curNic.getInterfaceAddresses();
+            for(InterfaceAddress interfaceAddr : interfaceAddrs) {
+                InetAddress inetAddr = interfaceAddr.getAddress();
+                boolean isIpv4 = inetAddr instanceof Inet4Address;
+                boolean isLoopbackAddress = inetAddr.isLoopbackAddress();
+                if(isIpv4) {
+                    if(isLoopbackAddress) continue;
+                    boolean isReachable = inetAddr.isReachable(3*1000);
+                    Inet4Address inet4Addr = (Inet4Address)inetAddr;
+                    String retVal = inet4Addr.getHostAddress();
+
+                    jiniConfigLogger.log
+                        (CONFIG, "default IPv4 address: "+retVal);
+                    utilLogger.log
+                        (Level.TRACE, "default IPv4 address: "+retVal);
+                    return retVal;
+                }
+            }
+        }
+
+        if(!loopbackOk) return null;
+
+        nics = NetworkInterface.getNetworkInterfaces();
+        while( nics.hasMoreElements() ) {
+            NetworkInterface curNic = nics.nextElement();
+            List<InterfaceAddress> interfaceAddrs = 
+                                       curNic.getInterfaceAddresses();
+            for(InterfaceAddress interfaceAddr : interfaceAddrs) {
+                InetAddress inetAddr = interfaceAddr.getAddress();
+                boolean isIpv4 = inetAddr instanceof Inet4Address;
+                boolean isLoopbackAddress = inetAddr.isLoopbackAddress();
+                if(isIpv4) {
+                    if(!isLoopbackAddress) continue;
+                    boolean isReachable = inetAddr.isReachable(3*1000);
+                    Inet4Address inet4Addr = (Inet4Address)inetAddr;
+                    String retVal = inet4Addr.getHostAddress();
+
+                    jiniConfigLogger.log
+                        (CONFIG, "default IPv4 address: "+retVal);
+                    utilLogger.log
+                        (Level.TRACE, "default IPv4 address: "+retVal);
+                    return retVal;
+                }
+            }
+        }
+        return null;
+    }
+
+    public static String getDefaultIpv4Address()
+                             throws SocketException, IOException
+    {
+        return getDefaultIpv4Address(false);//localhost NOT ok
+    }
+
+    /**
      * Intended for use by scripts.
      */
     public static void main(String[] args) {

Modified: branches/dev-btm/bigdata/src/test/com/bigdata/service/StressTestConcurrent.java
===================================================================
--- branches/dev-btm/bigdata/src/test/com/bigdata/service/StressTestConcurrent.java	2010-07-23 11:04:00 UTC (rev 3268)
+++ branches/dev-btm/bigdata/src/test/com/bigdata/service/StressTestConcurrent.java	2010-07-23 12:19:14 UTC (rev 3269)
@@ -791,10 +791,12 @@
             throws IOException {
 
         // explicitly set the log level for the load balancer.
-        LoadBalancerService.log.setLevel(Level.INFO);
+//BTM        LoadBalancerService.log.setLevel(Level.INFO);
+EmbeddedLoadBalancer.logger.setLevel(Level.INFO);
 
-        final AbstractEmbeddedLoadBalancerService lbs = ((AbstractEmbeddedLoadBalancerService) ((EmbeddedFederation<?>) fed)
-                .getLoadBalancerService());
+//BTM        final AbstractEmbeddedLoadBalancerService lbs = ((AbstractEmbeddedLoadBalancerService) ((EmbeddedFederation<?>) fed)
+//BTM                .getLoadBalancerService());
+final EmbeddedLoadBalancer lbs = ((EmbeddedLoadBalancer)((EmbeddedFederation)fed).getLoadBalancerService());
 
         final ServiceScore[] fakeServiceScores = new ServiceScore[2];
 

Modified: branches/dev-btm/bigdata-jini/src/java/com/bigdata/executor/ServiceImpl.java
===================================================================
--- branches/dev-btm/bigdata-jini/src/java/com/bigdata/executor/ServiceImpl.java	2010-07-23 11:04:00 UTC (rev 3268)
+++ branches/dev-btm/bigdata-jini/src/java/com/bigdata/executor/ServiceImpl.java	2010-07-23 12:19:14 UTC (rev 3269)
@@ -286,7 +286,7 @@
                    +", locators="
                    +Util.writeArrayElementsToString(locatorsToJoin));
 
-        waitThread = new Util.WaitOnInterruptThread();
+        waitThread = new Util.WaitOnInterruptThread(logger);
         waitThread.start();
 
         readyState.ready();//ready to accept calls from clients

Modified: branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/AbstractServicesManagerService.java
===================================================================
--- branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/AbstractServicesManagerService.java	2010-07-23 11:04:00 UTC (rev 3268)
+++ branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/AbstractServicesManagerService.java	2010-07-23 12:19:14 UTC (rev 3269)
@@ -67,6 +67,7 @@
                  * processes.
                  */
                 
+System.out.println("\nXXXXXXX AbstractServicesManagerService.add >>>>> KILLING process = "+service.name);
                 service.kill(true/* immediateShutdown */);
                 
             } catch (InterruptedException e) {
@@ -121,6 +122,7 @@
         // halt our monitor tasks.
         getFederation().cancelMonitoredTasks(true/* mayInterruptIfRunning */);
         
+System.out.println("\nXXXXXXX AbstractServicesManagerService.shutdown >>>>> KILLING CHILD PROCESSES");
         // kill our children.
         killChildProcesses(false/* immediateShutdown */);
 
@@ -146,6 +148,7 @@
         // halt our monitor tasks.
         getFederation().cancelMonitoredTasks(true/* mayInterruptIfRunning */);
 
+System.out.println("\nXXXXXXX AbstractServicesManagerService.shutdownNow >>>>> KILLING CHILD PROCESSES");
         // kill our children.
         killChildProcesses(true/* immediateShutdown */);
 
@@ -186,6 +189,7 @@
 
             try {
 
+System.out.println("\nXXXXXXX AbstractServicesManagerService.killChildProcesses >>>>> calling Process.kill");
                 helper.kill(immediateShutdown);
                 
             } catch (Throwable t) {
@@ -301,6 +305,7 @@
         /*
          * Run startup.
          */
+System.out.println("\n*** AbstractServicesManagerService: setup() - ServicesManagerStartupTask().call() ***\n");
         new ServicesManagerStartupTask(fed, config, true/* pushConfig */,
                 true/* restartServices */, this/* listener */).call();
         

Modified: branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/ManageLogicalServiceTask.java
===================================================================
--- branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/ManageLogicalServiceTask.java	2010-07-23 11:04:00 UTC (rev 3268)
+++ branches/dev-btm/bigdata-jini/src/java/com/bigdata/jini/start/ManageLogicalServiceTask.java	2010-07-23 12:19:14 UTC (rev 3269)
@@ -107,6 +107,7 @@
         this.configZPath = configZPath;
         this.children = children;
         this.config = config;
+System.out.println("\nEEEE ManageLogicalServiceTask.constructor: configZPath="+this.configZPath);
         
     }
 
@@ -178,6 +179,7 @@
      */
     protected void newLogicalService() throws KeeperException, InterruptedException {
 
+System.out.println("\nEEEE ManageLogicalServiceTask.newLogicalService: className="+config.className);
         if (INFO)
             log.info("className=" + config.className);
 
@@ -194,31 +196,38 @@
         /*
          * Create zpath for the new logical service.
          */
+System.out.println("EEEE ManageLogicalServiceTask.newLogicalService: CREATING ZNODE ---> configZPath="+configZPath+", LOGICAL_SERVICE_PREFIX="+BigdataZooDefs.LOGICAL_SERVICE_PREFIX+", path="+(configZPath+"/"+BigdataZooDefs.LOGICAL_SERVICE_PREFIX));
         final String logicalServiceZPath = zookeeper.create(configZPath + "/"
                 + BigdataZooDefs.LOGICAL_SERVICE_PREFIX, new byte[0], acl,
                 CreateMode.PERSISTENT_SEQUENTIAL);
+System.out.println("EEEE ManageLogicalServiceTask.newLogicalService: CREATED ZNODE ---> logicalServiceZPath="+logicalServiceZPath);
 
         /*
          * The new znode (last path component of the new zpath).
          */
         final String logicalServiceZNode = logicalServiceZPath
                 .substring(logicalServiceZPath.lastIndexOf('/') + ...
 
[truncated message content]

Thread: [Bigdata-commit] SF.net SVN: bigdata:[3269] branches/dev-btm

Fast, scalable, robust graph database platform

bigdata-commit