Author: degenaro Date: Mon Oct 17 19:04:36 2016 New Revision: 1765353 URL: http://svn.apache.org/viewvc?rev=1765353&view=rev Log: UIMA-5060 DUCC Orchestrator (OR) "warm" restart issues
- reduce OR dependencies on CommonConfiguration - employ DuccPropertiesResolver Modified: uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorCommonArea.java uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ReservationFactory.java uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/config/OrchestratorConfiguration.java uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/IJobFactory.java uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactory.java uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdScheduler.java uima/uima-ducc/trunk/uima-ducc-orchestrator/src/test/java/org/apache/uima/ducc/orchestrator/jd/scheduler/test/TestHelper.java uima/uima-ducc/trunk/uima-ducc-orchestrator/src/test/java/org/apache/uima/ducc/orchestrator/jd/scheduler/test/TestSuite.java Modified: uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java?rev=1765353&r1=1765352&r2=1765353&view=diff ============================================================================== --- uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java (original) +++ uima/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java Mon Oct 17 19:04:36 2016 @@ -121,10 +121,14 @@ public class DuccPropertiesResolver { public static final String ducc_orchestrator_job_factory_classpath_order = "ducc.orchestrator.job.factory.classpath.order"; public static final String ducc_orchestrator_unmanaged_reservations_accepted = "ducc.orchestrator.unmanaged.reservations.accepted"; public static final String ducc_orchestrator_use_lock_file = "ducc.orchestrator.use.lock.file"; + public static final String ducc_orchestrator_start_type = "ducc.orchestrator.start.type"; + public static final String ducc_orchestrator_checkpoint = "ducc.orchestrator.checkpoint"; public static final String ducc_default_process_per_item_time_max = "ducc.default.process.per.item.time.max"; public static final String ducc_default_process_init_time_max = "ducc.default.process.init.time.max"; + public static final String ducc_jd_queue_prefix = "ducc.jd.queue.prefix"; + public static final String ducc_jd_host_class = "ducc.jd.host.class"; public static final String ducc_jd_host_description = "ducc.jd.host.description"; public static final String ducc_jd_host_memory_size = "ducc.jd.host.memory.size"; Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorCommonArea.java URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorCommonArea.java?rev=1765353&r1=1765352&r2=1765353&view=diff ============================================================================== --- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorCommonArea.java (original) +++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorCommonArea.java Mon Oct 17 19:04:36 2016 @@ -18,12 +18,10 @@ */ package org.apache.uima.ducc.orchestrator; -import java.io.IOException; import java.util.concurrent.ConcurrentHashMap; import org.apache.commons.lang.SerializationUtils; import org.apache.uima.ducc.common.IDuccEnv; -import org.apache.uima.ducc.common.config.CommonConfiguration; import org.apache.uima.ducc.common.internationalization.Messages; import org.apache.uima.ducc.common.persistence.IPropertiesFileManager; import org.apache.uima.ducc.common.persistence.PropertiesFileManager; @@ -49,26 +47,21 @@ public class OrchestratorCommonArea { private static final DuccLogger logger = DuccLoggerComponents.getOrLogger(OrchestratorCommonArea.class.getName()); + private static DuccPropertiesResolver dpr = DuccPropertiesResolver.getInstance(); + public static OrchestratorCommonArea getInstance() { - assert(orchestratorCommonArea != null); + synchronized(OrchestratorCommonArea.class) { + if(orchestratorCommonArea == null) { + orchestratorCommonArea = new OrchestratorCommonArea(); + orchestratorCommonArea.init(); + } + } return orchestratorCommonArea; } - public static void initialize(CommonConfiguration commonConfiguration) throws IOException { - orchestratorCommonArea = new OrchestratorCommonArea(); - orchestratorCommonArea.commonConfiguration = commonConfiguration; - orchestratorCommonArea.init(); - } - private OrchestratorCommonArea() { } - private CommonConfiguration commonConfiguration = null; - - public CommonConfiguration getCommonConfiguration() { - return commonConfiguration; - } - private IHistoryPersistenceManager historyPersistenceManager = null; @Deprecated @@ -120,7 +113,6 @@ public class OrchestratorCommonArea { private void init() { // <Jira 3414> String methodName="init"; - DuccPropertiesResolver dpr = DuccPropertiesResolver.getInstance(); Boolean use_lock_file = new Boolean(dpr.getProperty(DuccPropertiesResolver.ducc_orchestrator_use_lock_file)); if(use_lock_file) { ComponentHelper.oneInstance(IDuccEnv.DUCC_STATE_DIR,"orchestrator"); @@ -131,7 +123,8 @@ public class OrchestratorCommonArea { setDuccIdFactory(new DuccIdFactory(propertiesFileManager,constSeqNo)); workMap = new DuccWorkMap(); processAccounting = new ProcessAccounting(); - OrchestratorCheckpoint.getInstance().switchOnOff(commonConfiguration.orchestratorCheckpoint); + String ckpt_setting = dpr.getCachedProperty(DuccPropertiesResolver.ducc_orchestrator_checkpoint); + OrchestratorCheckpoint.getInstance().switchOnOff(ckpt_setting); OrchestratorCheckpoint.getInstance().restoreState(); jdScheduler = JdScheduler.getInstance(); try { Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java?rev=1765353&r1=1765352&r2=1765353&view=diff ============================================================================== --- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java (original) +++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java Mon Oct 17 19:04:36 2016 @@ -28,7 +28,6 @@ import org.apache.camel.CamelContext; import org.apache.uima.ducc.common.boot.DuccDaemonRuntimeProperties; import org.apache.uima.ducc.common.boot.DuccDaemonRuntimeProperties.DaemonName; import org.apache.uima.ducc.common.component.AbstractDuccComponent; -import org.apache.uima.ducc.common.config.CommonConfiguration; import org.apache.uima.ducc.common.crypto.Crypto; import org.apache.uima.ducc.common.crypto.CryptoException; import org.apache.uima.ducc.common.internationalization.Messages; @@ -36,6 +35,7 @@ import org.apache.uima.ducc.common.main. import org.apache.uima.ducc.common.system.SystemState; import org.apache.uima.ducc.common.utils.DuccLogger; import org.apache.uima.ducc.common.utils.DuccLoggerComponents; +import org.apache.uima.ducc.common.utils.DuccPropertiesResolver; import org.apache.uima.ducc.common.utils.TimeStamp; import org.apache.uima.ducc.common.utils.id.DuccId; import org.apache.uima.ducc.orchestrator.OrchestratorConstants.StartType; @@ -91,16 +91,9 @@ import org.apache.uima.ducc.transport.ev import org.apache.uima.ducc.transport.event.jd.IDriverStatusReport; import org.apache.uima.ducc.transport.event.rm.IRmJobState; import org.apache.uima.ducc.transport.event.sm.ServiceMap; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; -@Configuration -@Import({CommonConfiguration.class}) public class OrchestratorComponent extends AbstractDuccComponent implements Orchestrator { - // Springframework magic to inject instance of {@link CommonConfiguration} - @Autowired CommonConfiguration common; private static final DuccLogger logger = DuccLoggerComponents.getOrLogger(OrchestratorComponent.class.getName()); private static DuccId jobid = null; @@ -112,10 +105,10 @@ implements Orchestrator { //private MqReaper mqReaper = MqReaper.getInstance(); private IJobFactory jobFactory = JobFactory.getInstance(); private ReservationFactory reservationFactory = ReservationFactory.getInstance(); - private CommonConfiguration commonConfiguration = orchestratorCommonArea.getCommonConfiguration(); private JdScheduler jdScheduler = orchestratorCommonArea.getJdScheduler(); private StateJobAccounting stateJobAccounting = StateJobAccounting.getInstance(); - + private DuccPropertiesResolver dpr = DuccPropertiesResolver.getInstance(); + public OrchestratorComponent(CamelContext context) { super("Orchestrator", context); } @@ -157,7 +150,7 @@ implements Orchestrator { String methodName = "getStartTypeProperty"; logger.trace(methodName, null, messages.fetch("enter")); StartType startType = StartType.warm; - String property = commonConfiguration.orchestratorStartType; + String property = dpr.getProperty(DuccPropertiesResolver.ducc_orchestrator_start_type); if(property != null) { String startTypeProperty = property.trim().toLowerCase(); if(startTypeProperty.equals("cold")) { @@ -181,7 +174,7 @@ implements Orchestrator { { String methodName = "resolveSignatureRequired"; logger.trace(methodName, null, messages.fetch("enter")); - String property = commonConfiguration.signatureRequired; + String property = dpr.getProperty(DuccPropertiesResolver.ducc_signature_required); if(property != null) { String signatureRequiredProperty = property.trim().toLowerCase(); if(signatureRequiredProperty.equals("on")) { @@ -556,7 +549,7 @@ implements Orchestrator { else { if(Validate.request(duccEvent)) { try { - IDuccWorkJob duccWorkJob = jobFactory.createJob(common,properties); + IDuccWorkJob duccWorkJob = jobFactory.createJob(properties); WorkMapHelper.addDuccWork(workMap, duccWorkJob, this, methodName); // state: Received stateJobAccounting.stateChange(duccWorkJob, JobState.Received); @@ -766,7 +759,7 @@ implements Orchestrator { submitError(properties, error_message); } else if(Validate.request(duccEvent)) { - DuccWorkReservation duccWorkReservation = reservationFactory.create(common,(ReservationRequestProperties)properties); + DuccWorkReservation duccWorkReservation = reservationFactory.create((ReservationRequestProperties)properties); WorkMapHelper.addDuccWork(workMap, duccWorkReservation, this, methodName); // state: Received duccWorkReservation.stateChange(ReservationState.Received); @@ -913,7 +906,7 @@ implements Orchestrator { } else { if(Validate.request(duccEvent)) { - IDuccWorkJob duccWorkJob = jobFactory.createService(common,properties); + IDuccWorkJob duccWorkJob = jobFactory.createService(properties); WorkMapHelper.addDuccWork(workMap, duccWorkJob, this, methodName); // state: Received stateJobAccounting.stateChange(duccWorkJob, JobState.Received); Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ReservationFactory.java URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ReservationFactory.java?rev=1765353&r1=1765352&r2=1765353&view=diff ============================================================================== --- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ReservationFactory.java (original) +++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ReservationFactory.java Mon Oct 17 19:04:36 2016 @@ -18,7 +18,6 @@ */ package org.apache.uima.ducc.orchestrator; -import org.apache.uima.ducc.common.config.CommonConfiguration; import org.apache.uima.ducc.common.internationalization.Messages; import org.apache.uima.ducc.common.utils.DuccLogger; import org.apache.uima.ducc.common.utils.DuccLoggerComponents; @@ -32,7 +31,6 @@ import org.apache.uima.ducc.transport.ev import org.apache.uima.ducc.transport.event.common.DuccWorkReservation; import org.apache.uima.ducc.transport.event.common.IDuccTypes.DuccType; - public class ReservationFactory { private static ReservationFactory reservationFactory = new ReservationFactory(); private static final DuccLogger logger = DuccLoggerComponents.getOrLogger(ReservationFactory.class.getName()); @@ -45,7 +43,7 @@ public class ReservationFactory { private Messages messages = orchestratorCommonArea.getSystemMessages(); private IDuccIdFactory duccIdFactory = orchestratorCommonArea.getDuccIdFactory(); - public DuccWorkReservation create(CommonConfiguration common, ReservationRequestProperties reservationRequestProperties) { + public DuccWorkReservation create(ReservationRequestProperties reservationRequestProperties) { String methodName = "create"; logger.trace(methodName, null, messages.fetch("enter")); DuccWorkReservation duccWorkReservation = new DuccWorkReservation(); Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/config/OrchestratorConfiguration.java URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/config/OrchestratorConfiguration.java?rev=1765353&r1=1765352&r2=1765353&view=diff ============================================================================== --- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/config/OrchestratorConfiguration.java (original) +++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/config/OrchestratorConfiguration.java Mon Oct 17 19:04:36 2016 @@ -33,7 +33,6 @@ import org.apache.uima.ducc.common.utils import org.apache.uima.ducc.common.utils.XStreamUtils; import org.apache.uima.ducc.common.utils.id.DuccId; import org.apache.uima.ducc.orchestrator.Orchestrator; -import org.apache.uima.ducc.orchestrator.OrchestratorCommonArea; import org.apache.uima.ducc.orchestrator.OrchestratorComponent; import org.apache.uima.ducc.orchestrator.OrchestratorState; import org.apache.uima.ducc.orchestrator.event.OrchestratorEventListener; @@ -287,7 +286,6 @@ public class OrchestratorConfiguration { @Bean public OrchestratorComponent orchestrator() throws Exception { - OrchestratorCommonArea.initialize(common); OrchestratorComponent orchestrator = new OrchestratorComponent(common.camelContext()); // Instantiate JobManagerEventListener delegate listener. This listener will receive // incoming messages. Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/IJobFactory.java URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/IJobFactory.java?rev=1765353&r1=1765352&r2=1765353&view=diff ============================================================================== --- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/IJobFactory.java (original) +++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/IJobFactory.java Mon Oct 17 19:04:36 2016 @@ -18,12 +18,11 @@ */ package org.apache.uima.ducc.orchestrator.factory; -import org.apache.uima.ducc.common.config.CommonConfiguration; import org.apache.uima.ducc.orchestrator.exceptions.ResourceUnavailableForJobDriverException; import org.apache.uima.ducc.transport.event.cli.JobRequestProperties; import org.apache.uima.ducc.transport.event.common.IDuccWorkJob; public interface IJobFactory { - public IDuccWorkJob createJob(CommonConfiguration common, JobRequestProperties jobRequestProperties) throws ResourceUnavailableForJobDriverException; - public IDuccWorkJob createService(CommonConfiguration common, JobRequestProperties jobRequestProperties); + public IDuccWorkJob createJob(JobRequestProperties jobRequestProperties) throws ResourceUnavailableForJobDriverException; + public IDuccWorkJob createService(JobRequestProperties jobRequestProperties); } Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactory.java URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactory.java?rev=1765353&r1=1765352&r2=1765353&view=diff ============================================================================== --- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactory.java (original) +++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactory.java Mon Oct 17 19:04:36 2016 @@ -26,7 +26,6 @@ import java.util.Map; import org.apache.uima.ducc.common.IDuccEnv; import org.apache.uima.ducc.common.IDuccUser; import org.apache.uima.ducc.common.NodeIdentity; -import org.apache.uima.ducc.common.config.CommonConfiguration; import org.apache.uima.ducc.common.container.FlagsHelper; import org.apache.uima.ducc.common.container.FlagsHelper.Name; import org.apache.uima.ducc.common.utils.DuccLogger; @@ -71,6 +70,7 @@ import org.apache.uima.ducc.transport.ev public class JobFactory implements IJobFactory { private static JobFactory jobFactory = new JobFactory(); private static final DuccLogger logger = DuccLoggerComponents.getOrLogger(JobFactory.class.getName()); + private DuccPropertiesResolver dpr = DuccPropertiesResolver.getInstance(); public static IJobFactory getInstance() { return jobFactory; @@ -193,7 +193,7 @@ public class JobFactory implements IJobF return retVal; } - private void setDebugPorts(CommonConfiguration common, JobRequestProperties jobRequestProperties, DuccWorkJob job) { + private void setDebugPorts(JobRequestProperties jobRequestProperties, DuccWorkJob job) { String location = "setDebugPorts"; DuccId jobid = job.getDuccId(); String portDriver = jobRequestProperties.getProperty(JobSpecificationProperties.key_driver_debug); @@ -369,11 +369,13 @@ public class JobFactory implements IJobF addDashD(jcl, flagName, flagValue); } - private void createDriver(CommonConfiguration common, JobRequestProperties jobRequestProperties, DuccWorkJob job) throws ResourceUnavailableForJobDriverException { + private void createDriver(JobRequestProperties jobRequestProperties, DuccWorkJob job) throws ResourceUnavailableForJobDriverException { String methodName = "createDriver"; // broker & queue - job.setJobBroker(common.brokerUrl); - job.setJobQueue(common.jdQueuePrefix+job.getDuccId()); + String brokerUrl = dpr.getProperty(DuccPropertiesResolver.ducc_broker_url); + job.setJobBroker(brokerUrl); + String jdQueuePrefix = dpr.getProperty(DuccPropertiesResolver.ducc_jd_queue_prefix); + job.setJobQueue(jdQueuePrefix+job.getDuccId()); // Command line JavaCommandLine driverCommandLine = buildJobDriverCommandLine(jobRequestProperties, job.getDuccId()); @@ -439,23 +441,23 @@ public class JobFactory implements IJobF } } - public DuccWorkJob createJob(CommonConfiguration common, JobRequestProperties jobRequestProperties) throws ResourceUnavailableForJobDriverException { + public DuccWorkJob createJob(JobRequestProperties jobRequestProperties) throws ResourceUnavailableForJobDriverException { DuccWorkJob job = new DuccWorkJob(); job.setDuccType(DuccType.Job); job.setDuccId(duccIdFactory.next()); - createDriver(common, jobRequestProperties, job); - setDebugPorts(common, jobRequestProperties, job); - return create(common, jobRequestProperties, job); + createDriver(jobRequestProperties, job); + setDebugPorts(jobRequestProperties, job); + return create(jobRequestProperties, job); } - public DuccWorkJob createService(CommonConfiguration common, JobRequestProperties jobRequestProperties) { + public DuccWorkJob createService(JobRequestProperties jobRequestProperties) { DuccWorkJob job = new DuccWorkJob(); job.setDuccType(DuccType.Service); job.setDuccId(duccIdFactory.next()); - return create(common, jobRequestProperties, job); + return create(jobRequestProperties, job); } - private DuccWorkJob create(CommonConfiguration common, JobRequestProperties jobRequestProperties, DuccWorkJob job) { + private DuccWorkJob create(JobRequestProperties jobRequestProperties, DuccWorkJob job) { String methodName = "create"; jobRequestProperties.normalize(); DuccId jobid = job.getDuccId(); @@ -565,7 +567,8 @@ public class JobFactory implements IJobF } else { // UIMA aggregate - String name = common.jdQueuePrefix+job.getDuccId().toString(); + String jdQueuePrefix = dpr.getProperty(DuccPropertiesResolver.ducc_jd_queue_prefix); + String name = jdQueuePrefix+job.getDuccId().toString(); String description = job.getStandardInfo().getDescription(); int threadCount = Integer.parseInt(job.getSchedulingInfo().getThreadsPerProcess()); String brokerURL = job.getjobBroker();; Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdScheduler.java URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdScheduler.java?rev=1765353&r1=1765352&r2=1765353&view=diff ============================================================================== --- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdScheduler.java (original) +++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdScheduler.java Mon Oct 17 19:04:36 2016 @@ -29,7 +29,6 @@ import java.util.concurrent.atomic.Atomi import org.apache.uima.ducc.common.NodeIdentity; import org.apache.uima.ducc.common.SizeBytes; -import org.apache.uima.ducc.common.config.CommonConfiguration; import org.apache.uima.ducc.common.db.DbQuery; import org.apache.uima.ducc.common.db.IDbMachine; import org.apache.uima.ducc.common.utils.DuccLogger; @@ -441,7 +440,6 @@ public class JdScheduler { private void reservationAcquire(IDuccWorkMap dwm, JdHostProperties jdHostProperties) { String location = "reservationAcquire"; - CommonConfiguration common = null; ReservationRequestProperties reservationRequestProperties = new ReservationRequestProperties(); // String key; @@ -463,7 +461,7 @@ public class JdScheduler { value = jdHostProperties.getHostDescription(); reservationRequestProperties.setProperty(key, value); // - DuccWorkReservation dwr = reservationFactory.create(common, reservationRequestProperties); + DuccWorkReservation dwr = reservationFactory.create(reservationRequestProperties); dwr.setJdReservation(); // DuccWorkMap workMap = (DuccWorkMap) dwm; Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/test/java/org/apache/uima/ducc/orchestrator/jd/scheduler/test/TestHelper.java URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/test/java/org/apache/uima/ducc/orchestrator/jd/scheduler/test/TestHelper.java?rev=1765353&r1=1765352&r2=1765353&view=diff ============================================================================== --- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/test/java/org/apache/uima/ducc/orchestrator/jd/scheduler/test/TestHelper.java (original) +++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/test/java/org/apache/uima/ducc/orchestrator/jd/scheduler/test/TestHelper.java Mon Oct 17 19:04:36 2016 @@ -21,7 +21,6 @@ package org.apache.uima.ducc.orchestrato import java.util.concurrent.atomic.AtomicInteger; import org.apache.uima.ducc.common.NodeIdentity; -import org.apache.uima.ducc.common.config.CommonConfiguration; import org.apache.uima.ducc.common.utils.id.DuccId; import org.apache.uima.ducc.orchestrator.ReservationFactory; import org.apache.uima.ducc.orchestrator.jd.scheduler.JdHostProperties; @@ -69,7 +68,6 @@ public class TestHelper { public static IDuccWorkReservation getDWR(String user, String pidAtHost, String description, String schedulingClass, String memorySize) { IDuccWorkReservation dwr = null; ReservationFactory rf = ReservationFactory.getInstance(); - CommonConfiguration cc = null; ReservationRequestProperties rrp = new ReservationRequestProperties(); String key; String value; @@ -94,7 +92,7 @@ public class TestHelper { value = memorySize; rrp.put(key, value); // - dwr = rf.create(cc, rrp); + dwr = rf.create(rrp); // assign(dwr); // Modified: uima/uima-ducc/trunk/uima-ducc-orchestrator/src/test/java/org/apache/uima/ducc/orchestrator/jd/scheduler/test/TestSuite.java URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-orchestrator/src/test/java/org/apache/uima/ducc/orchestrator/jd/scheduler/test/TestSuite.java?rev=1765353&r1=1765352&r2=1765353&view=diff ============================================================================== --- uima/uima-ducc/trunk/uima-ducc-orchestrator/src/test/java/org/apache/uima/ducc/orchestrator/jd/scheduler/test/TestSuite.java (original) +++ uima/uima-ducc/trunk/uima-ducc-orchestrator/src/test/java/org/apache/uima/ducc/orchestrator/jd/scheduler/test/TestSuite.java Mon Oct 17 19:04:36 2016 @@ -29,12 +29,10 @@ import java.util.Random; import org.apache.uima.ducc.common.NodeIdentity; import org.apache.uima.ducc.common.SizeBytes; -import org.apache.uima.ducc.common.config.CommonConfiguration; import org.apache.uima.ducc.common.main.DuccService; import org.apache.uima.ducc.common.utils.DuccLogger; import org.apache.uima.ducc.common.utils.id.DuccId; import org.apache.uima.ducc.orchestrator.OrchestratorCheckpoint; -import org.apache.uima.ducc.orchestrator.OrchestratorCommonArea; import org.apache.uima.ducc.orchestrator.jd.scheduler.JdHostProperties; import org.apache.uima.ducc.orchestrator.jd.scheduler.JdReservation; import org.apache.uima.ducc.orchestrator.jd.scheduler.JdScheduler; @@ -73,8 +71,6 @@ public class TestSuite { private void ducc_config() { try { DuccService.setDuccLogger(logger); - CommonConfiguration commonConfiguration = new CommonConfiguration(); - OrchestratorCommonArea.initialize(commonConfiguration); } catch(Exception e) { e.printStackTrace();