Menu
▾
▴
[Bigdata-commit] SF.net SVN: bigdata:[3534] branches/maven_scaleout
|
From: <sgo...@us...> - 2010-09-13 14:54:07
|
Revision: 3534
http://bigdata.svn.sourceforge.net/bigdata/?rev=3534&view=rev
Author: sgossard
Date: 2010-09-13 14:53:57 +0000 (Mon, 13 Sep 2010)
Log Message:
-----------
[merge dev-btm --> maven_scaleout] : Merge of ^/branches/dev-btm , revision 3463. The merged changes from the dev-btm branch included trunk revisions 3432:3460.
Revision Links:
--------------
http://bigdata.svn.sourceforge.net/bigdata/?rev=3463&view=rev
Modified Paths:
--------------
branches/maven_scaleout/bigdata-core/src/main/deploy/bin/config/browser.config
branches/maven_scaleout/bigdata-core/src/main/deploy/bin/pstart
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataStandalone.config
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/log4j.properties
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/DataFinder.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/cache/RingBuffer.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/executor/ServiceImpl.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/BigdataZooDefs.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/BigdataServiceConfiguration.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/JiniServiceConfiguration.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/MetadataServerConfiguration.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/ServicesManagerConfiguration.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/TransactionServerConfiguration.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/process/JiniServiceProcessHelper.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/journal/AbstractLocalTransactionManager.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/journal/AbstractTask.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/journal/BufferMode.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/journal/IConcurrencyManager.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/journal/ILocalTransactionManager.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/journal/ITransactionService.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/journal/JournalTransactionService.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/journal/TransactionService.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/journal/WriteExecutorService.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/loadbalancer/EmbeddedLoadBalancer.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/loadbalancer/ServiceImpl.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/mdi/PartitionLocator.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/metadata/AdminProxy.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/metadata/Constants.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/metadata/PrivateInterface.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/metadata/ServiceImpl.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/metadata/ServiceProxy.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/process/ServiceImpl.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/sail/BigdataSail.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/sail/bench/NanoSparqlServer.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/spo/SPO.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/resources/AsynchronousOverflowTask.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/resources/CompactingMergeTask.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/resources/ResourceManager.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/resources/StoreManager.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/AbstractFederation.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/AbstractIndexCache.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/AbstractScaleOutFederation.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/AbstractTransactionService.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/CommitTimeIndex.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/DataService.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/DefaultClientDelegate.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/DefaultServiceFederationDelegate.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/DistributedTransactionService.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/EmbeddedFederation.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/IBigdataFederation.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/IEventReceivingService.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/IFederationDelegate.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/IMetadataService.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/IServiceShutdown.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/IndexCache.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/ListIndicesTask.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/MetadataIndexCache.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/NoCacheMetadataIndexView.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/ShardLocator.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/jini/JiniFederation.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/jini/LoadBalancerServer.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/jini/MetadataServer.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/jini/lookup/LoadBalancerClient.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/jini/lookup/TransactionServiceClient.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/jini/master/ServiceMap.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/jini/util/DumpFederation.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/jini/util/JiniServicesHelper.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/ndx/AbstractScaleOutClientIndexView.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/ndx/ClientIndexView.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/ndx/RawDataServiceTupleIterator.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/shard/ServiceImpl.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/transaction/AdminProxy.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/transaction/Constants.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/transaction/PrivateInterface.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/transaction/ServiceImpl.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/transaction/ServiceProxy.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/util/Util.java
branches/maven_scaleout/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config
branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config
branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config
branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/cache/TestRingBuffer.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/jini/start/DestroyTransactionService.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/jini/start/TestServiceConfigurationMonitoring.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/jini/start/TestServiceStarter.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/jini/start/config/TestServiceConfiguration.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestAll.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/journal/TestTransactionService.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/rules/TestOptionals.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/rdf/store/TestLocalTripleStoreTransactionSemantics.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/resources/AbstractResourceManagerTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/resources/MockLocalTransactionManager.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/resources/MockTransactionService.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/AbstractEmbeddedFederationTestCase.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestEventReceiver.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestMove.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/TestRestartSafe.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/service/ndx/pipeline/TestMasterTask.java
Added Paths:
-----------
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/metadata/EmbeddedIndexStore.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/metadata/EmbeddedShardLocator.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/ShardManagement.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/TxState.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/service/jini/lookup/ShardLocatorClient.java
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/transaction/EmbeddedTransactionService.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/jini/start/TestServiceConfigurationMonitoringRemote.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/jini/start/TestServiceStarterRemote.java
branches/maven_scaleout/bigdata-core/src/test/java/com/bigdata/jini/start/config/TestServiceConfigurationRemote.java
Property Changed:
----------------
branches/maven_scaleout/
branches/maven_scaleout/bigdata-core/src/main/deploy/bin/
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties
branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties
branches/maven_scaleout/bigdata-core/src/main/java/
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/attr/
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/disco/
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/sail/bench/
branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/rdf/util/
branches/maven_scaleout/bigdata-core/src/test/deploy/testing/conf/bigdataStandaloneTesting.config
branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/config/testfed.config
branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/jini/start/testfed.config
branches/maven_scaleout/bigdata-core/src/test/deploy/testing/data/com/bigdata/service/jini/master/TestMappedRDFDataLoadMaster.config
branches/maven_scaleout/bigdata-core/src/test/java/
Property changes on: branches/maven_scaleout
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/BTREE_BUFFER_BRANCH:2004-2045
/branches/DEV_BRANCH_27_OCT_2009:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH:2633-3304
/branches/bugfix-btm:2594-3237
/branches/dev-btm:2574-3440
/branches/fko:3150-3194
/trunk:3379-3430
+ /branches/BTREE_BUFFER_BRANCH:2004-2045
/branches/DEV_BRANCH_27_OCT_2009:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH:2633-3304
/branches/bugfix-btm:2594-3237
/branches/dev-btm:2574-3440,3443,3463
/branches/fko:3150-3194
/branches/maven_scaleout:3379-3438
/trunk:3379-3430,3432-3460
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/bin
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/bin:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/bin:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/bin:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/bin:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/bin:2574-3440,3443,3463
/branches/dev-btm/src/resources/bin:3463
/branches/fko/bigdata-core/src/main/deploy/bin:3150-3194
/trunk/bigdata-core/src/main/deploy/bin:3379-3430,3432-3460
Modified: branches/maven_scaleout/bigdata-core/src/main/deploy/bin/config/browser.config
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/deploy/bin/config/browser.config 2010-09-12 19:57:56 UTC (rev 3533)
+++ branches/maven_scaleout/bigdata-core/src/main/deploy/bin/config/browser.config 2010-09-13 14:53:57 UTC (rev 3534)
@@ -35,6 +35,7 @@
"net.jini.core.constraint.RemoteMethodControl",
"net.jini.id.ReferentUuid",
"com.bigdata.service.Service",
+ "com.bigdata.service.ShardManagement",
"com.bigdata.service.EventReceivingService"
};
}
Modified: branches/maven_scaleout/bigdata-core/src/main/deploy/bin/pstart
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/deploy/bin/pstart 2010-09-12 19:57:56 UTC (rev 3533)
+++ branches/maven_scaleout/bigdata-core/src/main/deploy/bin/pstart 2010-09-13 14:53:57 UTC (rev 3534)
@@ -218,6 +218,12 @@
os.path.join(self.appHome, "lib", "start.jar"),
os.path.join(self.appHome, "lib", "log4j.jar"),
os.path.join(self.appHome, "lib", "bigdata-core.jar"),
+ os.path.join(self.appHome, "lib", "fastutil.jar"),
+ os.path.join(self.appHome, "lib", "dsiutils.jar"),
+ os.path.join(self.appHome, "lib", "cweb-extser.jar"),
+ os.path.join(self.appHome, "lib", "icu4j.jar"),
+ os.path.join(self.appHome, "lib", "ctc_utils.jar"),
+ os.path.join(self.appHome, "lib", "lgplutils.jar"),
os.path.join(self.appHome, "lib", "zookeeper.jar"),
os.path.join(self.appHome, "lib", "jsk-lib.jar") ]
Modified: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config 2010-09-12 19:57:56 UTC (rev 3533)
+++ branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config 2010-09-13 14:53:57 UTC (rev 3534)
@@ -629,12 +629,15 @@
"jini",
"org.apache.zookeeper.server.quorum.QuorumPeerMain",
- "com.bigdata.service.jini.TransactionServer",
- "com.bigdata.service.jini.MetadataServer",
+//BTM "com.bigdata.service.jini.TransactionServer",
+//BTM "com.bigdata.service.jini.MetadataServer",
"com.bigdata.service.jini.DataServer",
- "com.bigdata.service.jini.LoadBalancerServer",
-//BTM "com.bigdata.loadbalancer.ServiceImpl",
- "com.bigdata.service.jini.ClientServer"
+//BTM "com.bigdata.service.jini.LoadBalancerServer",
+ "com.bigdata.service.jini.ClientServer",
+
+"com.bigdata.transaction.ServiceImpl",
+"com.bigdata.metadata.ServiceImpl",
+"com.bigdata.loadbalancer.ServiceImpl"
};
@@ -1191,6 +1194,52 @@
}
//BTM - BEGIN
+com.bigdata.transaction.ServiceImpl {
+ constraints = new IServiceConstraint[] {
+ new JiniRunningConstraint(),
+ new ZookeeperRunningConstraint(),
+ new HostAllowConstraint(bigdata.txs)
+ };
+
+ properties = new NV[] {
+ new NV(TransactionServer.Options.MIN_RELEASE_AGE, "0"),
+ };
+
+ args = new String[]{
+ "-Xmx200m",
+ "-Djava.util.logging.config.file=@NAS@/dist/bigdata/var/config/logging/transaction-logging.properties",
+ "-Dlog4j.configuration=@NAS@/dist/bigdata/var/config/logging/transaction-logging.properties",
+ "-Dlog4j.primary.configuration=@NAS@/dist/bigdata/var/config/logging/transaction-logging.properties",
+ "-DusingServiceConfiguration=true",
+ "-Dbigdata.logDir=@NAS@/dist/bigdata/var/log",
+ "-DappHome=@APP_HOME@",
+ "-Dconfig=@NAS@/dist/bigdata/var/config/jini/transaction.config"
+ };
+}
+
+com.bigdata.metadata.ServiceImpl {
+ constraints = new IServiceConstraint[] {
+ new JiniRunningConstraint(),
+ new ZookeeperRunningConstraint(),
+ new HostAllowConstraint(bigdata.mds)
+ };
+
+ properties = new NV[] {
+ new NV(MetadataServer.Options.OVERFLOW_ENABLED,"false")
+ };
+
+ args = new String[]{
+ "-Xmx200m",
+ "-Djava.util.logging.config.file=@NAS@/dist/bigdata/var/config/logging/shardlocator-logging.properties",
+ "-Dlog4j.configuration=@NAS@/dist/bigdata/var/config/logging/shardlocator-logging.properties",
+ "-Dlog4j.primary.configuration=@NAS@/dist/bigdata/var/config/logging/shardlocator-logging.properties",
+ "-DusingServiceConfiguration=true",
+ "-Dbigdata.logDir=@NAS@/dist/bigdata/var/log",
+ "-DappHome=@APP_HOME@",
+ "-Dconfig=@NAS@/dist/bigdata/var/config/jini/shardlocator.config"
+ };
+}
+
com.bigdata.loadbalancer.ServiceImpl {
constraints = new IServiceConstraint[] {
new JiniRunningConstraint(),
@@ -1727,34 +1776,17 @@
// When true, a pre-existing job with the same name is deleted first.
deleteJob = true;
- // ALTERNATIVE 1: Start http servers for the directories containing
- // the ontology and the data files:
+ // Scanner identifies resources to be loaded.
+ resourceScannerFactory = com.bigdata.service.jini.master.FileSystemScanner.newFactory(
+ new File("@NAS@/lubm/U10"), // dataDir
+ //new File("/nas/metrics/lehigh/U10-compressed"), // dataDir
+ new com.bigdata.rdf.load.RDFFilenameFilter() // optional filename filter.
+ );
- ontologyDir = new File("/tmp/lubm");
- dataDir = new File("/tmp/lubm/datafiles");
- static dataServer = new com.bigdata.service.jini.master.FileServer(
- dataDir, 20, 8702, 20);
- static ontologyServer = new com.bigdata.service.jini.master.FileServer(
- ontologyDir, 5, 8703, 5);
- resourceScannerFactory =
- com.bigdata.service.jini.master.FileSystemScannerServer.newFactory(
- dataDir,
- new com.bigdata.rdf.load.RDFFilenameFilter(), dataServer);
- ontology = com.bigdata.service.jini.master.FileServer.getURL(
- ontologyServer, "/univ-bench.owl");
+ // The ontology to load (file or directory) when the KB is created.
+ ontology = new File("@install.lubm.config.dir@/univ-bench.owl");
+ //ontology = new File("/nas/metrics/lehigh/univ-bench.owl");
- // ALTERNATIVE 2: Supply the data files and ontology from an
- // external web server.
-
-// ontology = new URL("http://stub/lubm/univ-bench.owl");
-// resourceScannerFactory =
-// com.bigdata.service.jini.master.URLListScanner.newFactory(
-// new URL[] {
-// new URL("http://stub/lubm/datafiles/University0_0.owl"),
-// new URL("http://stub/lubm/datafiles/University0_1.owl"),
-// ...
-// });
-
// The maximum thread pool size for RDF parser tasks.
//parserPoolSize = 5;
@@ -1805,7 +1837,7 @@
forceOverflow = false;
/* How long the master will wait in milliseconds to discover the services
- * that you specify for [servicesTemplates].
+ * that you specify for [servicesTemplates] and [clientsTemplate].
*/
awaitServicesTimeout = 10000;
@@ -1849,8 +1881,25 @@
};
- // Minimum number of client services for distributed execution.
- clientServiceCount = bigdata.clientServiceCount;
+ /* Template for matching the services to which the clients will be
+ * distributed for execution. Normally you will specify
+ * IClientService as the interface to be discovered. While it is
+ * possible to run tasks on an IDataService or even an
+ * IMetadataService since they both implement IRemoteExecutor, it
+ * is generally discouraged unless the tasks require explicit
+ * access to the local index partitions for their execution.
+ */
+ clientsTemplate = new ServicesTemplate(
+ bigdata.clientServiceCount, // minMatches
+ new ServiceTemplate(
+ null, //serviceID
+ new Class[]{
+ com.bigdata.service.IClientService.class
+ },
+ null // attributes
+ ),
+ null // filter
+ );
/*
* RDF distributed data loader options.
@@ -1891,7 +1940,7 @@
forceOverflow = true;
/* How long the master will wait in milliseconds to discover the services
- * that you specify for [servicesTemplates].
+ * that you specify for [servicesTemplates] and [clientsTemplate].
*/
awaitServicesTimeout = 10000;
@@ -1935,8 +1984,25 @@
};
- // Minimum number of client services for distributed execution.
- clientServiceCount = bigdata.clientServiceCount;
+ /* Template for matching the services to which the clients will be
+ * distributed for execution. Normally you will specify
+ * IClientService as the interface to be discovered. While it is
+ * possible to run tasks on an IDataService or even an
+ * IMetadataService since they both implement IRemoteExecutor, it
+ * is generally discouraged unless the tasks require explicit
+ * access to the local index partitions for their execution.
+ */
+ clientsTemplate = new ServicesTemplate(
+ bigdata.clientServiceCount, // minMatches
+ new ServiceTemplate(
+ null, //serviceID
+ new Class[]{
+ com.bigdata.service.IClientService.class
+ },
+ null // attributes
+ ),
+ null // filter
+ );
/*
* RDF distributed data loader options.
@@ -2047,7 +2113,7 @@
}
-com.bigdata.service.jini.util.BroadcastSighup {
+com.bigdata.service.jini.BroadcastSighup {
pushConfig = false;
@@ -2111,8 +2177,24 @@
};
- // Minimum number of client services for distributed execution.
- clientServiceCount = bigdata.clientServiceCount;
+ /* Template for matching the services to which the clients will be
+ * distributed for execution. Normally you will specify
+ * IClientService as the interface to be discovered. While it is
+ * possible to run tasks on an IDataService or even an
+ * IMetadataService since they both implement IRemoteExecutor, it
+ * is generally discouraged unless the tasks require explicit
+ * access to the local index partitions for their execution.
+ */
+ clientsTemplate = new ServicesTemplate(
+ bigdata.clientServiceCount, // minMatches
+ new ServiceTemplate(
+ null, //serviceID
+ new Class[]{
+ com.bigdata.service.IClientService.class
+ },
+ null), // attributes
+ null // filter
+ );
/* The initial #of index partitions for the scale-out index
* (computed as #partitions per data service). Choose at least
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:2574-3440,3443,3463
/branches/dev-btm/src/resources/config/bigdataCluster.config:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/jini/bigdataCluster.config:3379-3430,3432-3460
Modified: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataStandalone.config
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataStandalone.config 2010-09-12 19:57:56 UTC (rev 3533)
+++ branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/bigdataStandalone.config 2010-09-13 14:53:57 UTC (rev 3534)
@@ -37,6 +37,7 @@
import com.bigdata.rdf.lexicon.LexiconRelation;
import com.bigdata.rdf.lexicon.LexiconKeyOrder;
import com.bigdata.rawstore.Bytes;
+import com.bigdata.DataFinder;
import java.net.URL;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeUnit.*;
@@ -1743,13 +1744,13 @@
// Scanner identifies resources to be loaded.
resourceScannerFactory = com.bigdata.service.jini.master.URLListScanner.newFactory(
- new File("/nas/data/lubm/U1000").toURI().toURL(), // dataDir
+ DataFinder.bestURL("/nas/data/lubm/U1000")// dataDir
new com.bigdata.rdf.load.RDFFilenameFilter() // optional filename filter.
);
// The ontology to load (file or directory) when the KB is created.
//ontology = new File("@install.lubm.config.dir@/univ-bench.owl");
- ontology = new File("/nas/data/lubm/univ-bench.owl").toURI().toURL();
+ ontology = DataFinder.bestURL("/nas/data/lubm/univ-bench.owl");
// The maximum thread pool size for RDF parser tasks.
//parserPoolSize = 5;
Modified: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config 2010-09-12 19:57:56 UTC (rev 3533)
+++ branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config 2010-09-13 14:53:57 UTC (rev 3534)
@@ -16,16 +16,29 @@
com.bigdata.metadata {
- private static exportIpAddr =
+ // for exporting the service
+
+ private static serverExporterIpAddr =
NicUtil.getIpAddress("default.nic", ConfigDeployUtil.getString("node.serviceNetwork"), false);
- private static exportPort =
+ private static serverExporterPort =
Integer.parseInt( System.getProperty("exportPort", "0") );
+ private static serverEnableDgc = false;
+ private static serverKeepAlive = true;
+ private static serverExporterTcpServerEndpoint =
+ TcpServerEndpoint.getInstance(serverExporterIpAddr, serverExporterPort);
- groupsToJoin = ConfigDeployUtil.getGroupsToDiscover();
- locatorsToJoin = ConfigDeployUtil.getLocatorsToDiscover();
+ // for exporting remote futures
- private static exporterTcpServerEndpoint =
- TcpServerEndpoint.getInstance(exportIpAddr, exportPort);
+ private static futureExporterIpAddr =
+ NicUtil.getIpAddress("default.nic", ConfigDeployUtil.getString("node.dataNetwork"), false);
+ private static futureExporterPort = 0;
+ private static futureEnableDgc = true;
+ private static futureKeepAlive = false;
+ private static futureExporterTcpServerEndpoint =
+ TcpServerEndpoint.getInstance(futureExporterIpAddr, futureExporterPort);
+
+ //shared by both exporters
+
private static serverILFactory =
new BasicILFactory(
new BasicMethodConstraints(
@@ -38,11 +51,20 @@
serverExporter =
new BasicJeriExporter
- (TcpServerEndpoint.getInstance(exportIpAddr,exportPort),
- serverILFactory,
- false,
- true);
+ (serverExporterTcpServerEndpoint,
+ serverILFactory,
+ serverEnableDgc,
+ serverKeepAlive);
+ futureExporter =
+ new BasicJeriExporter
+ (futureExporterTcpServerEndpoint,
+ futureILFactory,
+ futureEnableDgc,
+ futureKeepAlive);
+ groupsToJoin = ConfigDeployUtil.getGroupsToDiscover();
+ locatorsToJoin = ConfigDeployUtil.getLocatorsToDiscover();
+
static discoveryManager = new LookupDiscoveryManager(groupsToJoin,
locatorsToJoin,
null,
@@ -55,15 +77,15 @@
}
net.jini.discovery.LookupDiscovery {
- multicastRequestHost = com.bigdata.metadata.exportIpAddr;
+ multicastRequestHost = com.bigdata.metadata.serverExporterIpAddr;
multicastInterfaces = new NetworkInterface[] {
- NicUtil.getNetworkInterface(com.bigdata.metadata.exportIpAddr)
+ NicUtil.getNetworkInterface(com.bigdata.metadata.serverExporterIpAddr)
};
}
net.jini.lookup.ServiceDiscoveryManager {
eventListenerExporter =
new BasicJeriExporter
- (com.bigdata.metadata.exporterTcpServerEndpoint,
+ (com.bigdata.metadata.serverExporterTcpServerEndpoint,
com.bigdata.metadata.serverILFactory, false, false);
}
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2594-3237
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:2574-3440,3443,3463
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/metadata/config/shardlocator.config:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/jini/shardlocator.config:3379-3430,3432-3460
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging:2594-3237
/branches/dev-btm/bigdata/src/resources/logging:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging:2574-3440,3443,3463
/branches/fko/bigdata-core/src/main/deploy/var/config/logging:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/logging:3379-3430,3432-3460
Modified: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/log4j.properties
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/log4j.properties 2010-09-12 19:57:56 UTC (rev 3533)
+++ branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/log4j.properties 2010-09-13 14:53:57 UTC (rev 3534)
@@ -210,3 +210,5 @@
#log4j.logger.com.bigdata.boot.BootComponentTest=DEBUG
#log4j.logger.com.bigdata.boot.launcher.ConfigReaderUnitTest=DEBUG
#log4j.logger.com.bigdata.process.ProcessConfigXmlHandlerTest=DEBUG
+
+log4j.logger.com.bigdata.transaction=DEBUG
Modified: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties 2010-09-12 19:57:56 UTC (rev 3533)
+++ branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties 2010-09-13 14:53:57 UTC (rev 3534)
@@ -36,3 +36,6 @@
############################################################
#log4j.logger.com.bigdata.metadata=DEBUG
+#log4j.logger.com.bigdata.metadata.EmbeddedShardLocator=DEBUG
+#log4j.logger.com.bigdata.metadata.EmbeddedIndexStore=DEBUG
+
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2594-3237
/branches/dev-btm/bigdata/src/resources/logging/shardlocator-logging.properties:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:2574-3440,3443,3463
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/metadata/config/logging.properties:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/logging/shardlocator-logging.properties:3379-3430,3432-3460
Modified: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties 2010-09-12 19:57:56 UTC (rev 3533)
+++ branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties 2010-09-13 14:53:57 UTC (rev 3534)
@@ -36,4 +36,5 @@
############################################################
#log4j.logger.com.bigdata.transaction=DEBUG
+#log4j.logger.com.bigdata.transaction.EmbeddedTransactionService=DEBUG
Property changes on: branches/maven_scaleout/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2594-3237
/branches/dev-btm/bigdata/src/resources/logging/transaction-logging.properties:3463
/branches/dev-btm/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:2574-3440,3443,3463
/branches/dev-btm/bigdata-jini/src/java/com/bigdata/transaction/config/logging.properties:3463
/branches/fko/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:3150-3194
/trunk/bigdata-core/src/main/deploy/var/config/logging/transaction-logging.properties:3379-3430,3432-3460
Property changes on: branches/maven_scaleout/bigdata-core/src/main/java
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/BTREE_BUFFER_BRANCH/bigdata-core/src/main/java:2004-2045
/branches/DEV_BRANCH_27_OCT_2009/bigdata-core/src/main/java:2270-2546,2548-2782
/branches/LEXICON_REFACTOR_BRANCH/bigdata-core/src/main/java:2633-3304
/branches/bugfix-btm/bigdata-core/src/main/java:2594-3237
/branches/dev-btm/bigdata/src/java:3463
/branches/dev-btm/bigdata-core/src/main/java:2574-3440,3443,3463
/branches/dev-btm/bigdata-jini/src/java:3463
/branches/dev-btm/bigdata-rdf/src/java:3463
/branches/dev-btm/bigdata-sails/src/java:3463
/branches/fko/bigdata-core/src/main/java:3150-3194
/trunk/bigdata-core/src/main/java:3379-3430,3432-3460
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/DataFinder.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/DataFinder.java 2010-09-12 19:57:56 UTC (rev 3533)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/DataFinder.java 2010-09-13 14:53:57 UTC (rev 3534)
@@ -10,6 +10,7 @@
import org.slf4j.LoggerFactory;
import java.io.*;
+import java.net.MalformedURLException;
import java.net.URI;
import java.net.URL;
import java.util.ArrayList;
@@ -61,6 +62,10 @@
return DEFAULT_SEARCH.getBestURI(path);
}
+ public static URL bestURL(String path) throws MalformedURLException {
+ return DEFAULT_SEARCH.getBestURI(path).toURL();
+ }
+
public static DataFinder defaultFinder(){
return DEFAULT_SEARCH;
}
Property changes on: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/attr
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/bigdata-jini/src/java/com/bigdata/attr:3379-3430
+ /branches/dev-btm/bigdata-jini/src/java/com/bigdata/attr:3463
/trunk/bigdata-jini/src/java/com/bigdata/attr:3379-3430
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/cache/RingBuffer.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/cache/RingBuffer.java 2010-09-12 19:57:56 UTC (rev 3533)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/cache/RingBuffer.java 2010-09-13 14:53:57 UTC (rev 3534)
@@ -154,7 +154,7 @@
public boolean add(final T ref) throws IllegalStateException {
if (ref == null)
- throw new IllegalArgumentException();
+ throw new NullPointerException();
beforeOffer( ref );
@@ -178,7 +178,7 @@
public boolean offer(final T ref) {
if (ref == null)
- throw new IllegalArgumentException();
+ throw new NullPointerException();
beforeOffer( ref );
@@ -387,12 +387,12 @@
if (index < 0 || index >= size)
throw new IllegalArgumentException();
- if (index + 1 == size) {
-
- // remove the LRU position.
- return remove();
-
- }
+// if (index + 1 == size) {
+//
+// // remove the LRU position.
+// return remove();
+//
+// }
/*
* Otherwise we are removing some non-LRU element.
@@ -409,7 +409,7 @@
for (;;) {
- int nexti = (i + 1) % capacity; // update index.
+ final int nexti = (i + 1) % capacity; // update index.
if (nexti != head) {
@@ -491,10 +491,9 @@
*/
final public boolean scanHead(final int nscan, final T ref) {
- assert nscan > 0;
-// if (nscan <= 0)
-// throw new IllegalArgumentException();
-//
+ if (nscan <= 0)
+ throw new IllegalArgumentException();
+
if (ref == null)
throw new IllegalArgumentException();
@@ -581,6 +580,9 @@
public boolean contains(final Object ref) {
+ if (ref == null)
+ throw new NullPointerException();
+
// MRU to LRU scan.
for (int n = 0, i = tail; n < size; n++) {
@@ -601,7 +603,8 @@
throw new NullPointerException();
if (c == this)
- throw new IllegalArgumentException();
+ return true;
+// throw new IllegalArgumentException();
for( Object e : c ) {
Property changes on: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/disco
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/bigdata-jini/src/java/com/bigdata/disco:3379-3430
+ /branches/dev-btm/bigdata-jini/src/java/com/bigdata/disco:3463
/trunk/bigdata-jini/src/java/com/bigdata/disco:3379-3430
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/executor/ServiceImpl.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/executor/ServiceImpl.java 2010-09-12 19:57:56 UTC (rev 3533)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/executor/ServiceImpl.java 2010-09-13 14:53:57 UTC (rev 3534)
@@ -300,7 +300,7 @@
private long EXECUTOR_TERMINATION_TIMEOUT = 1L*60L*1000L;
public ShutdownThread() {
- super("Build Server Request Service Shutdown thread");
+ super("callable executor service shutdown thread");
setDaemon(false);
}
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/BigdataZooDefs.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/BigdataZooDefs.java 2010-09-12 19:57:56 UTC (rev 3533)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/BigdataZooDefs.java 2010-09-13 14:53:57 UTC (rev 3534)
@@ -28,12 +28,16 @@
* serviceConfigMonitor
* com.bigdata.service.jini.DataServer
* lock0000000000 (Ephemeral)
- * com.bigdata.service.jini.LoadBalancerServer or com.bigdata.loadbalancer.ServiceImpl
+ * com.bigdata.service.jini.LoadBalancerServer
* lock0000000000 (Ephemeral)
* com.bigdata.service.jini.MetadataServer
* lock0000000000 (Ephemeral)
* com.bigdata.service.jini.TransactionServer
* lock0000000000 (Ephemeral)
+ * com.bigdata.loadbalancer.ServiceImpl
+ * lock0000000000 (Ephemeral)
+ * com.bigdata.metadata.ServiceImpl
+ * lock0000000000 (Ephemeral)
* createPhysicalService
* config
* com.bigdata.service.jini.DataServer {DataServiceConfiguration}
@@ -43,7 +47,7 @@
* logicalService0000000000
* election
* physicalServiceb2bf8b98-da0c-42f5-ac65-027bf3304429 (Ephemeral) {UUID}
- * com.bigdata.service.jini.LoadBalancerServer or com.bigdata.loadbalancer.ServiceImpl {LoadBalancerConfiguration}
+ * com.bigdata.service.jini.LoadBalancerServer
* logicalService0000000000
* election
* physicalService911a9b28-7396-4932-ab80-77078119e7e2 (Ephemeral) {UUID}
@@ -55,15 +59,27 @@
* logicalService0000000000
* election
* physicalService87522080-2da6-42be-84a8-4a863b420042 (Ephemeral) {UUID}
+ * com.bigdata.loadbalancer.ServiceImpl {LoadBalancerConfiguration}
+ * logicalService0000000000
+ * election
+ * physicalService911a9b28-7396-4932-ab80-77078119e7e3 (Ephemeral) {UUID}
+ * com.bigdata.metadata.ServiceImpl {MetadataServiceConfiguration}
+ * logicalService0000000000
+ * election
+ * physicalServicec0f35d2e-0a20-40c4-bb76-c97e7cb72eb4 (Ephemeral) {UUID}
* services
* com.bigdata.service.jini.TransactionServer
* instances (persistent znodes)
- * com.bigdata.service.jini.LoadBalancerServer or com.bigdata.loadbalancer.ServiceImpl
+ * com.bigdata.service.jini.LoadBalancerServer
* instances (persistent znodes)
* com.bigdata.service.jini.MetadataServer
* instances (persistent znodes)
* com.bigdata.service.jini.DataServerServer
* instances (persistent znodes)
+ * com.bigdata.loadbalancer.ServiceImpl
+ * instances (persistent znodes)
+ * com.bigdata.metadata.ServiceImpl
+ * instances (persistent znodes)
* </pre>
*
* Each {@link ServiceConfiguration} znode defines the service type, the target
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/BigdataServiceConfiguration.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/BigdataServiceConfiguration.java 2010-09-12 19:57:56 UTC (rev 3533)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/BigdataServiceConfiguration.java 2010-09-13 14:53:57 UTC (rev 3534)
@@ -81,6 +81,14 @@
boolean classCastOk = false;
if( AbstractServer.class.isAssignableFrom(cls) ) {
classCastOk = true;
+ } else if( com.bigdata.service.jini.MetadataServer.class.isAssignableFrom(cls) ) {
+ classCastOk = true;
+ } else if( com.bigdata.metadata.ServiceImpl.class.isAssignableFrom(cls) ) {
+ classCastOk = true;
+ } else if( com.bigdata.service.jini.TransactionServer.class.isAssignableFrom(cls) ) {
+ classCastOk = true;
+ } else if( com.bigdata.transaction.ServiceImpl.class.isAssignableFrom(cls) ) {
+ classCastOk = true;
} else if( com.bigdata.service.jini.LoadBalancerServer.class.isAssignableFrom(cls) ) {
classCastOk = true;
} else if( com.bigdata.loadbalancer.ServiceImpl.class.isAssignableFrom(cls) ) {
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/JiniServiceConfiguration.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/JiniServiceConfiguration.java 2010-09-12 19:57:56 UTC (rev 3533)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/JiniServiceConfiguration.java 2010-09-13 14:53:57 UTC (rev 3534)
@@ -34,7 +34,6 @@
import java.io.OutputStreamWriter;
import java.io.StringWriter;
import java.io.Writer;
-import java.net.InetAddress;
import java.util.Arrays;
import java.util.Date;
import java.util.Enumeration;
@@ -132,8 +131,6 @@
public final Properties properties;
public final String[] jiniOptions;
- private final String serviceIpAddr;
-
protected void toString(StringBuilder sb) {
super.toString(sb);
@@ -181,12 +178,6 @@
} else {
log.warn("groups = " + Arrays.toString(this.groups));
}
-
- try {
- this.serviceIpAddr = NicUtil.getIpAddress("default.nic", ConfigDeployUtil.getString("node.serviceNetwork"), false);
- } catch(IOException e) {
- throw new ConfigurationException(e.getMessage(), e);
- }
}
/**
@@ -262,6 +253,9 @@
"net.jini.jeri.tcp.TcpServerEndpoint",
"net.jini.discovery.LookupDiscovery",
+//BTM
+"net.jini.discovery.LookupDiscoveryManager",
+
"net.jini.core.discovery.LookupLocator",
"net.jini.core.entry.Entry",
"net.jini.lookup.entry.Name",
@@ -434,7 +428,6 @@
}
out.write("}\n");
-
out.write("\n\n" + className + " {\n");
writeServiceDescription(out);
out.write("}\n");
@@ -483,6 +476,9 @@
final ServiceDir serviceDir = new ServiceDir(this.serviceDir);
+ String serviceIpAddr = NicUtil.getIpAddress ( "default.nic", "default", false ) ;
+ if ( null == serviceIpAddr )
+ throw new IOException ( "Can't get a host ip address" ) ;
final Hostname hostName = new Hostname(serviceIpAddr);
final ServiceUUID serviceUUID = new ServiceUUID(this.serviceUUID);
@@ -831,6 +827,7 @@
final ServiceID serviceID = JiniUtil
.uuid2ServiceID(serviceUUID);
+System.out.println("\n**** JiniServiceConfiguration.awaitServiceDiscoveryOrDeath: serviceID = "+serviceID);
final ServiceItem[] items = serviceDiscoveryManager.lookup(
new ServiceTemplate(//
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/MetadataServerConfiguration.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/MetadataServerConfiguration.java 2010-09-12 19:57:56 UTC (rev 3533)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/MetadataServerConfiguration.java 2010-09-13 14:53:57 UTC (rev 3534)
@@ -37,6 +37,9 @@
import com.bigdata.service.jini.MetadataServer;
import com.bigdata.util.NV;
+//BTM
+import com.bigdata.metadata.EmbeddedShardLocator;
+
/**
* Configuration for the {@link MetadataServer}.
*
@@ -54,17 +57,27 @@
/**
* @param config
*/
- public MetadataServerConfiguration(Configuration config)
- throws ConfigurationException {
-
- super(MetadataServer.class, config);
-
+//BTM - BEGIN
+//BTM public MetadataServerConfiguration(Configuration config)
+//BTM throws ConfigurationException {
+//BTM
+//BTM super(MetadataServer.class, config);
+//BTM
+//BTM }
+ public MetadataServerConfiguration(Class classType,
+ Configuration config)
+ throws ConfigurationException
+ {
+ super(classType, config);
+System.out.println("*** MetadataServerConfiguration: constructor ***");
}
+//BTM - END
public MetadataServiceStarter newServiceStarter(JiniFederation fed,
IServiceListener listener, String zpath, Entry[] attributes)
throws Exception {
+System.out.println("*** MetadataServerConfiguration ---> newServiceStarter ***");
return new MetadataServiceStarter(fed, listener, zpath, attributes);
}
@@ -81,14 +94,27 @@
IServiceListener listener, String zpath, Entry[] attributes) {
super(fed, listener, zpath, attributes);
+System.out.println("*** MetadataServerConfiguration.MetadataServiceStarter: constructor ***");
}
@Override
protected NV getDataDir() {
- return new NV(MetadataServer.Options.DATA_DIR, serviceDir
- .toString());
+//BTM return new NV(MetadataServer.Options.DATA_DIR, serviceDir
+//BTM .toString());
+//BTM - BEGIN
+ // className field defined/set in ServiceConfiguration parent
+ if ( (MetadataServer.class.getName()).equals(className) ) {
+System.out.println("*** MetadataConfiguration.MetadataServiceStarter: getDataDir [MetadataServer.Options.DATA_DIR="+MetadataServer.Options.DATA_DIR+", serviceDir="+serviceDir.toString()+"] ***");
+ return new NV(MetadataServer.Options.DATA_DIR, serviceDir.toString());
+ } else if ( (com.bigdata.loadbalancer.ServiceImpl.class.getName()).equals(className) ) {
+System.out.println("*** MetadataConfiguration.MetadataServiceStarter: getDataDir [EmbeddedShardLocator.Options.DATA_DIR="+EmbeddedShardLocator.Options.DATA_DIR+", serviceDir="+serviceDir.toString()+"] ***");
+ return new NV(EmbeddedShardLocator.Options.DATA_DIR, serviceDir.toString());
+ } else {
+ return null;
+ }
+//BTM - END
}
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/ServicesManagerConfiguration.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/ServicesManagerConfiguration.java 2010-09-12 19:57:56 UTC (rev 3533)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/ServicesManagerConfiguration.java 2010-09-13 14:53:57 UTC (rev 3534)
@@ -223,45 +223,64 @@
// .getName(), config));
} else if (a.equals(QuorumPeerMain.class.getName())) {
+
System.out.println("\n*** ServicesManagerConfiguration.getConfigurations: QuorumPeerMain BEGIN");
-
v.add(new ZookeeperServerConfiguration(config));
+System.out.println("*** ServicesManagerConfiguration.getConfigurations: QuorumPeerMain END\n");
-System.out.println("*** ServicesManagerConfiguration.getConfigurations: QuorumPeerMain END\n");
} else if (a.equals(TransactionServer.class.getName())) {
+
System.out.println("\n*** ServicesManagerConfiguration.getConfigurations: TransactionServer BEGIN");
+ v.add(new TransactionServerConfiguration(TransactionServer.class, config));
+System.out.println("*** ServicesManagerConfiguration.getConfigurations: TransactionServer END\n");
- v.add(new TransactionServerConfiguration(config));
+ } else if (a.equals(MetadataServer.class.getName())) {
-System.out.println("*** ServicesManagerConfiguration.getConfigurations: TransactionServer END\n");
- } else if (a.equals(MetadataServer.class.getName())) {
System.out.println("\n*** ServicesManagerConfiguration.getConfigurations: MetaDataServer BEGIN");
+ v.add(new MetadataServerConfiguration(MetadataServer.class, config));
+System.out.println("*** ServicesManagerConfiguration.getConfigurations: MetaDataServer END\n");
- v.add(new MetadataServerConfiguration(config));
+ } else if (a.equals(DataServer.class.getName())) {
-System.out.println("*** ServicesManagerConfiguration.getConfigurations: MetaDataServer END\n");
- } else if (a.equals(DataServer.class.getName())) {
System.out.println("\n*** ServicesManagerConfiguration.getConfigurations: DataServer BEGIN");
-
v.add(new DataServerConfiguration(config));
-
System.out.println("*** ServicesManagerConfiguration.getConfigurations: DataServer END\n");
} else if (a.equals(LoadBalancerServer.class.getName())) {
+
System.out.println("\n*** ServicesManagerConfiguration.getConfigurations: LoadBalancerServer BEGIN");
v.add(new LoadBalancerConfiguration(LoadBalancerServer.class, config));
System.out.println("*** ServicesManagerConfiguration.getConfigurations: LoadBalancerServer END\n");
- } else if (a.equals(com.bigdata.loadbalancer.ServiceImpl.class.getName())) {
+
+ } else if (a.equals(ClientServer.class.getName())) {
+
+System.out.println("\n*** ServicesManagerConfiguration.getConfigurations: ClientServer BEGIN");
+ v.add(new ClientServerConfiguration(config));
+System.out.println("*** ServicesManagerConfiguration.getConfigurations: ClientServer END\n");
+
+
+//BTM - BEGIN: smart proxy impls ------------------------------------------------------------
+
+ } else if (a.equals(com.bigdata.transaction.ServiceImpl.class.getName())) {//transaction service
+
+System.out.println("\n*** ServicesManagerConfiguration.getConfigurations: com.bigdata.transaction.ServiceImpl BEGIN");
+ v.add(new TransactionServerConfiguration(com.bigdata.transaction.ServiceImpl.class, config));
+System.out.println("*** ServicesManagerConfiguration.getConfigurations: com.bigdata.transaction.ServiceImpl END\n");
+
+ } else if (a.equals(com.bigdata.metadata.ServiceImpl.class.getName())) {//shard locator (metadata) service
+
+System.out.println("\n*** ServicesManagerConfiguration.getConfigurations: com.bigdata.metadata.ServiceImpl BEGIN");
+ v.add(new MetadataServerConfiguration(com.bigdata.metadata.ServiceImpl.class, config));
+System.out.println("*** ServicesManagerConfiguration.getConfigurations: com.bigdata.metadata.ServiceImpl END\n");
+
+ } else if (a.equals(com.bigdata.loadbalancer.ServiceImpl.class.getName())) {//load balancer service
+
System.out.println("\n*** ServicesManagerConfiguration.getConfigurations: com.bigdata.loadbalancer.ServiceImpl BEGIN");
v.add(new LoadBalancerConfiguration(com.bigdata.loadbalancer.ServiceImpl.class, config));
System.out.println("*** ServicesManagerConfiguration.getConfigurations: com.bigdata.loadbalancer.ServiceImpl END\n");
- } else if (a.equals(ClientServer.class.getName())) {
-System.out.println("\n*** ServicesManagerConfiguration.getConfigurations: ClientServer BEGIN");
+//BTM - END: smart proxy impls ------------------------------------------------------------
- v.add(new ClientServerConfiguration(config));
-
-System.out.println("*** ServicesManagerConfiguration.getConfigurations: ClientServer END\n");
} else {
System.out.println("\n*** ServicesManagerConfiguration.getConfigurations: "+a+" BEGIN");
Modified: branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/TransactionServerConfiguration.java
===================================================================
--- branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/TransactionServerConfiguration.java 2010-09-12 19:57:56 UTC (rev 3533)
+++ branches/maven_scaleout/bigdata-core/src/main/java/com/bigdata/jini/start/config/TransactionServerConfiguration.java 2010-09-13 14:53:57 UTC (rev 3534)
@@ -37,6 +37,9 @@
import com.bigdata.service.jini.TransactionServer;
import com.bigdata.util.NV;
+//BTM
+import com.bigdata.transaction.EmbeddedTransactionService;
+
/**
* Configuration for the {@link TransactionServer}.
*
@@ -54,17 +57,27 @@
/**
* @param config
*/
- public TransactionServerConfiguration(Configuration config)
- throws ConfigurationException {
-
- super(TransactionServer.class, config);
-
+//BTM - BEGIN
+//BTM public TransactionServerConfiguration(Configuration config)
+//BTM throws ConfigurationException {
+//BTM
+//BTM super(TransactionServer.class, config);
+//BTM
+//BTM }
+ public TransactionServerConfiguration(Class classType,
+ Configuration config)
+ throws ConfigurationException
+ {
+ super(classType, config);
+Sy...
[truncated message content] |
