http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/context/ContextRepresenters.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/context/ContextRepresenters.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/context/ContextRepresenters.java index 663c110..021f4e4 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/context/ContextRepresenters.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/context/ContextRepresenters.java @@ -94,7 +94,8 @@ public final class ContextRepresenters { * @param contextStatusProto * @param notifyClientOnNewActiveContext */ - public synchronized void onContextStatusMessages(final Iterable<ReefServiceProtos.ContextStatusProto> contextStatusProtos, + public synchronized void onContextStatusMessages(final Iterable<ReefServiceProtos.ContextStatusProto> + contextStatusProtos, final boolean notifyClientOnNewActiveContext) { for (final ReefServiceProtos.ContextStatusProto contextStatusProto : contextStatusProtos) { this.onContextStatusMessage(contextStatusProto, notifyClientOnNewActiveContext); @@ -185,7 +186,8 @@ public final class ContextRepresenters { } // Dispatch the messages to the application, if there are any. - for (final ReefServiceProtos.ContextStatusProto.ContextMessageProto contextMessageProto : contextStatusProto.getContextMessageList()) { + for (final ReefServiceProtos.ContextStatusProto.ContextMessageProto + contextMessageProto : contextStatusProto.getContextMessageList()) { final byte[] theMessage = contextMessageProto.getMessage().toByteArray(); final String sourceID = contextMessageProto.getSourceId(); this.messageDispatcher.onContextMessage(new ContextMessageImpl(theMessage, contextID, sourceID));
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/defaults/DefaultDriverRestartContextActiveHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/defaults/DefaultDriverRestartContextActiveHandler.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/defaults/DefaultDriverRestartContextActiveHandler.java index 1f295de..f92bb81 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/defaults/DefaultDriverRestartContextActiveHandler.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/defaults/DefaultDriverRestartContextActiveHandler.java @@ -38,7 +38,8 @@ public final class DefaultDriverRestartContextActiveHandler implements EventHand @Override public void onNext(final ActiveContext activeContext) { - LOG.log(Level.INFO, "Received ActiveContext running on previous Evaluator during driver restart: {0} :: CLOSING", activeContext); + LOG.log(Level.INFO, "Received ActiveContext running on previous Evaluator during driver restart: {0} :: CLOSING", + activeContext); activeContext.close(); } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/defaults/DefaultDriverRestartTaskRunningHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/defaults/DefaultDriverRestartTaskRunningHandler.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/defaults/DefaultDriverRestartTaskRunningHandler.java index 666f278..a73ee8f 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/defaults/DefaultDriverRestartTaskRunningHandler.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/defaults/DefaultDriverRestartTaskRunningHandler.java @@ -38,6 +38,7 @@ public final class DefaultDriverRestartTaskRunningHandler implements EventHandle @Override public void onNext(final RunningTask runningTask) { throw new RuntimeException( - "RunningTask [" + runningTask.toString() + "] received during driver restart, but no DriverRestartTaskRunningHandler is bound"); + "RunningTask [" + runningTask.toString() + "] received during driver restart, " + + "but no DriverRestartTaskRunningHandler is bound"); } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorControlHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorControlHandler.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorControlHandler.java index 979690f..49d7312 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorControlHandler.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorControlHandler.java @@ -69,7 +69,8 @@ public final class EvaluatorControlHandler { throw new IllegalStateException("Trying to send an EvaluatorControlProto before the Evaluator ID is set."); } if (!this.stateManager.isRunning()) { - LOG.log(Level.WARNING, "Trying to send an EvaluatorControlProto to Evaluator [{0}] that is in state [{1}], not [RUNNING]. The control message was: {2}", + LOG.log(Level.WARNING, "Trying to send an EvaluatorControlProto to Evaluator [{0}] that is in state [{1}], " + + "not [RUNNING]. The control message was: {2}", new Object[]{this.evaluatorId, this.stateManager, evaluatorControlProto}); return; } @@ -87,7 +88,8 @@ public final class EvaluatorControlHandler { throw new IllegalStateException("Trying to reset the evaluator ID. This isn't supported."); } else { LOG.log(Level.FINE, "Registering remoteId [{0}] for Evaluator [{1}]", new Object[]{evaluatorRID, evaluatorId}); - this.wrapped = Optional.of(remoteManager.getHandler(evaluatorRID, EvaluatorRuntimeProtocol.EvaluatorControlProto.class)); + this.wrapped = Optional.of(remoteManager.getHandler(evaluatorRID, + EvaluatorRuntimeProtocol.EvaluatorControlProto.class)); } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorHeartBeatSanityChecker.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorHeartBeatSanityChecker.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorHeartBeatSanityChecker.java index 655d4e4..cebdf0a 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorHeartBeatSanityChecker.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorHeartBeatSanityChecker.java @@ -43,7 +43,8 @@ final class EvaluatorHeartBeatSanityChecker { synchronized void check(final String id, final long timeStamp) { if (knownTimeStamps.containsKey(id)) { final long oldTimeStamp = this.knownTimeStamps.get(id); - LOG.log(Level.FINEST, "TIMESTAMP CHECKER: id [ " + id + " ], old timestamp [ " + oldTimeStamp + " ], new timestamp [ " + timeStamp + " ]"); + LOG.log(Level.FINEST, "TIMESTAMP CHECKER: id [ " + id + " ], old timestamp [ " + oldTimeStamp + " ], " + + "new timestamp [ " + timeStamp + " ]"); if (oldTimeStamp > timeStamp) { final String msg = "Received an old heartbeat with timestamp `" + timeStamp + "` while earlier receiving one with timestamp `" + oldTimeStamp + "`"; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorHeartbeatHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorHeartbeatHandler.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorHeartbeatHandler.java index 7fff9e4..8225a0a 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorHeartbeatHandler.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorHeartbeatHandler.java @@ -35,7 +35,8 @@ import java.util.logging.Logger; */ @Private @DriverSide -public final class EvaluatorHeartbeatHandler implements EventHandler<RemoteMessage<EvaluatorRuntimeProtocol.EvaluatorHeartbeatProto>> { +public final class EvaluatorHeartbeatHandler + implements EventHandler<RemoteMessage<EvaluatorRuntimeProtocol.EvaluatorHeartbeatProto>> { private static final Logger LOG = Logger.getLogger(EvaluatorHeartbeatHandler.class.getName()); private final Evaluators evaluators; private final EvaluatorManagerFactory evaluatorManagerFactory; @@ -54,7 +55,8 @@ public final class EvaluatorHeartbeatHandler implements EventHandler<RemoteMessa LOG.log(Level.FINEST, "TIME: Begin Heartbeat {0}", evaluatorId); LOG.log(Level.FINEST, "Heartbeat from Evaluator {0} with state {1} timestamp {2} from remoteId {3}", - new Object[]{evaluatorId, status.getState(), heartbeat.getTimestamp(), evaluatorHeartbeatMessage.getIdentifier()}); + new Object[]{evaluatorId, status.getState(), heartbeat.getTimestamp(), + evaluatorHeartbeatMessage.getIdentifier()}); final Optional<EvaluatorManager> evaluatorManager = this.evaluators.get(evaluatorId); if (evaluatorManager.isPresent()) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorManager.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorManager.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorManager.java index 0bd8314..2abdca7 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorManager.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorManager.java @@ -121,7 +121,8 @@ public final class EvaluatorManager implements Identifiable, AutoCloseable { final ExceptionCodec exceptionCodec, final EventHandlerIdlenessSource idlenessSource, final LoggingScopeFactory loggingScopeFactory, - @Parameter(EvaluatorConfigurationProviders.class) final Set<ConfigurationProvider> evaluatorConfigurationProviders, + @Parameter(EvaluatorConfigurationProviders.class) + final Set<ConfigurationProvider> evaluatorConfigurationProviders, // TODO: Eventually remove the factories when they are removed from AllocatedEvaluatorImpl final JVMProcessFactory jvmProcessFactory, final CLRProcessFactory clrProcessFactory) { @@ -274,14 +275,16 @@ public final class EvaluatorManager implements Identifiable, AutoCloseable { final Optional<Throwable> taskException = Optional.<Throwable>of(new Exception("Evaluator crash")); final String message = "Evaluator crash"; final Optional<String> description = Optional.empty(); - final FailedTask failedTask = new FailedTask(taskId, message, description, taskException, bytes, evaluatorContext); + final FailedTask failedTask = + new FailedTask(taskId, message, description, taskException, bytes, evaluatorContext); failedTaskOptional = Optional.of(failedTask); } else { failedTaskOptional = Optional.empty(); } - this.messageDispatcher.onEvaluatorFailed(new FailedEvaluatorImpl(exception, failedContextList, failedTaskOptional, this.evaluatorId)); + this.messageDispatcher.onEvaluatorFailed(new FailedEvaluatorImpl(exception, failedContextList, + failedTaskOptional, this.evaluatorId)); } catch (final Exception e) { LOG.log(Level.SEVERE, "Exception while handling FailedEvaluator", e); @@ -325,7 +328,8 @@ public final class EvaluatorManager implements Identifiable, AutoCloseable { new Object[]{expectedEvaluatorsNumber, numRecoveredContainers}); throw new RuntimeException("More then expected number of evaluators are checking in during recovery."); } else if (numRecoveredContainers == expectedEvaluatorsNumber) { - LOG.log(Level.INFO, "All [{0}] expected evaluators have checked in. Recovery completed.", expectedEvaluatorsNumber); + LOG.log(Level.INFO, "All [{0}] expected evaluators have checked in. Recovery completed.", + expectedEvaluatorsNumber); this.driverStatusManager.setRestartCompleted(); this.messageDispatcher.OnDriverRestartCompleted(new DriverRestartCompleted(System.currentTimeMillis())); } else { @@ -405,11 +409,13 @@ public final class EvaluatorManager implements Identifiable, AutoCloseable { assert (evaluatorStatusProto.getState() == ReefServiceProtos.State.FAILED); final EvaluatorException evaluatorException; if (evaluatorStatusProto.hasError()) { - final Optional<Throwable> exception = this.exceptionCodec.fromBytes(evaluatorStatusProto.getError().toByteArray()); + final Optional<Throwable> exception = + this.exceptionCodec.fromBytes(evaluatorStatusProto.getError().toByteArray()); if (exception.isPresent()) { evaluatorException = new EvaluatorException(getId(), exception.get()); } else { - evaluatorException = new EvaluatorException(getId(), new Exception("Exception sent, but can't be deserialized")); + evaluatorException = new EvaluatorException(getId(), + new Exception("Exception sent, but can't be deserialized")); } } else { evaluatorException = new EvaluatorException(getId(), new Exception("No exception sent")); @@ -518,11 +524,13 @@ public final class EvaluatorManager implements Identifiable, AutoCloseable { if (this.stateManager.isSubmitted()) { messageBuilder - .append(" This most likely means that the Evaluator suffered a failure before establishing a communications link to the driver."); + .append(" This most likely means that the Evaluator suffered a failure before establishing " + + "a communications link to the driver."); } else if (this.stateManager.isAllocated()) { messageBuilder.append(" This most likely means that the Evaluator suffered a failure before being used."); } else if (this.stateManager.isRunning()) { - messageBuilder.append(" This means that the Evaluator failed but wasn't able to send an error message back to the driver."); + messageBuilder.append(" This means that the Evaluator failed but wasn't able to send an error message " + + "back to the driver."); } if (this.task.isPresent()) { messageBuilder.append(" Task [") @@ -532,7 +540,8 @@ public final class EvaluatorManager implements Identifiable, AutoCloseable { this.isResourceReleased = true; if (resourceStatusEvent.getState() == ReefServiceProtos.State.KILLED) { - this.onEvaluatorException(new EvaluatorKilledByResourceManagerException(this.evaluatorId, messageBuilder.toString())); + this.onEvaluatorException(new EvaluatorKilledByResourceManagerException(this.evaluatorId, + messageBuilder.toString())); } else { this.onEvaluatorException(new EvaluatorException(this.evaluatorId, messageBuilder.toString())); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorManagerFactory.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorManagerFactory.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorManagerFactory.java index 050a44a..da35145 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorManagerFactory.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorManagerFactory.java @@ -46,7 +46,9 @@ public final class EvaluatorManagerFactory { private final EvaluatorProcessFactory processFactory; @Inject - EvaluatorManagerFactory(final Injector injector, final ResourceCatalog resourceCatalog, final EvaluatorProcessFactory processFactory) { + EvaluatorManagerFactory(final Injector injector, + final ResourceCatalog resourceCatalog, + final EvaluatorProcessFactory processFactory) { this.injector = injector; this.resourceCatalog = resourceCatalog; this.processFactory = processFactory; @@ -92,7 +94,8 @@ public final class EvaluatorManagerFactory { throw new RuntimeException("Unknown resource: " + resourceAllocationEvent.getNodeId()); } final EvaluatorDescriptorImpl evaluatorDescriptor = new EvaluatorDescriptorImpl(nodeDescriptor, - resourceAllocationEvent.getResourceMemory(), resourceAllocationEvent.getVirtualCores().get(), processFactory.newEvaluatorProcess()); + resourceAllocationEvent.getResourceMemory(), resourceAllocationEvent.getVirtualCores().get(), + processFactory.newEvaluatorProcess()); LOG.log(Level.FINEST, "Resource allocation: new evaluator id[{0}]", resourceAllocationEvent.getIdentifier()); return this.getNewEvaluatorManagerInstance(resourceAllocationEvent.getIdentifier(), evaluatorDescriptor); @@ -102,6 +105,7 @@ public final class EvaluatorManagerFactory { if (!resourceStatusEvent.getIsFromPreviousDriver().get()) { throw new RuntimeException("Invalid resourceStatusEvent, must be status for resource from previous Driver."); } - return getNewEvaluatorManagerInstance(resourceStatusEvent.getIdentifier(), new EvaluatorDescriptorImpl(null, 128, 1, processFactory.newEvaluatorProcess())); + return getNewEvaluatorManagerInstance(resourceStatusEvent.getIdentifier(), + new EvaluatorDescriptorImpl(null, 128, 1, processFactory.newEvaluatorProcess())); } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorMessageDispatcher.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorMessageDispatcher.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorMessageDispatcher.java index a4f1273..6c83da2 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorMessageDispatcher.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorMessageDispatcher.java @@ -74,10 +74,14 @@ public final class EvaluatorMessageDispatcher { @Parameter(ContextFailedHandlers.class) final Set<EventHandler<FailedContext>> contextFailedHandlers, @Parameter(ContextMessageHandlers.class) final Set<EventHandler<ContextMessage>> contextMessageHandlers, // Service-provided Context event handlers - @Parameter(ServiceContextActiveHandlers.class) final Set<EventHandler<ActiveContext>> serviceContextActiveHandlers, - @Parameter(ServiceContextClosedHandlers.class) final Set<EventHandler<ClosedContext>> serviceContextClosedHandlers, - @Parameter(ServiceContextFailedHandlers.class) final Set<EventHandler<FailedContext>> serviceContextFailedHandlers, - @Parameter(ServiceContextMessageHandlers.class) final Set<EventHandler<ContextMessage>> serviceContextMessageHandlers, + @Parameter(ServiceContextActiveHandlers.class) + final Set<EventHandler<ActiveContext>> serviceContextActiveHandlers, + @Parameter(ServiceContextClosedHandlers.class) + final Set<EventHandler<ClosedContext>> serviceContextClosedHandlers, + @Parameter(ServiceContextFailedHandlers.class) + final Set<EventHandler<FailedContext>> serviceContextFailedHandlers, + @Parameter(ServiceContextMessageHandlers.class) + final Set<EventHandler<ContextMessage>> serviceContextMessageHandlers, // Application-provided Task event handlers @Parameter(TaskRunningHandlers.class) final Set<EventHandler<RunningTask>> taskRunningHandlers, @Parameter(TaskCompletedHandlers.class) final Set<EventHandler<CompletedTask>> taskCompletedHandlers, @@ -86,28 +90,41 @@ public final class EvaluatorMessageDispatcher { @Parameter(TaskFailedHandlers.class) final Set<EventHandler<FailedTask>> taskExceptionEventHandlers, // Service-provided Task event handlers @Parameter(ServiceTaskRunningHandlers.class) final Set<EventHandler<RunningTask>> serviceTaskRunningEventHandlers, - @Parameter(ServiceTaskCompletedHandlers.class) final Set<EventHandler<CompletedTask>> serviceTaskCompletedEventHandlers, - @Parameter(ServiceTaskSuspendedHandlers.class) final Set<EventHandler<SuspendedTask>> serviceTaskSuspendedEventHandlers, + @Parameter(ServiceTaskCompletedHandlers.class) + final Set<EventHandler<CompletedTask>> serviceTaskCompletedEventHandlers, + @Parameter(ServiceTaskSuspendedHandlers.class) + final Set<EventHandler<SuspendedTask>> serviceTaskSuspendedEventHandlers, @Parameter(ServiceTaskMessageHandlers.class) final Set<EventHandler<TaskMessage>> serviceTaskMessageEventHandlers, @Parameter(ServiceTaskFailedHandlers.class) final Set<EventHandler<FailedTask>> serviceTaskExceptionEventHandlers, // Application-provided Evaluator event handlers - @Parameter(EvaluatorAllocatedHandlers.class) final Set<EventHandler<AllocatedEvaluator>> evaluatorAllocatedHandlers, + @Parameter(EvaluatorAllocatedHandlers.class) + final Set<EventHandler<AllocatedEvaluator>> evaluatorAllocatedHandlers, @Parameter(EvaluatorFailedHandlers.class) final Set<EventHandler<FailedEvaluator>> evaluatorFailedHandlers, - @Parameter(EvaluatorCompletedHandlers.class) final Set<EventHandler<CompletedEvaluator>> evaluatorCompletedHandlers, + @Parameter(EvaluatorCompletedHandlers.class) + final Set<EventHandler<CompletedEvaluator>> evaluatorCompletedHandlers, // Service-provided Evaluator event handlers - @Parameter(ServiceEvaluatorAllocatedHandlers.class) final Set<EventHandler<AllocatedEvaluator>> serviceEvaluatorAllocatedEventHandlers, - @Parameter(ServiceEvaluatorFailedHandlers.class) final Set<EventHandler<FailedEvaluator>> serviceEvaluatorFailedHandlers, - @Parameter(ServiceEvaluatorCompletedHandlers.class) final Set<EventHandler<CompletedEvaluator>> serviceEvaluatorCompletedHandlers, + @Parameter(ServiceEvaluatorAllocatedHandlers.class) + final Set<EventHandler<AllocatedEvaluator>> serviceEvaluatorAllocatedEventHandlers, + @Parameter(ServiceEvaluatorFailedHandlers.class) + final Set<EventHandler<FailedEvaluator>> serviceEvaluatorFailedHandlers, + @Parameter(ServiceEvaluatorCompletedHandlers.class) + final Set<EventHandler<CompletedEvaluator>> serviceEvaluatorCompletedHandlers, // Application event handlers specific to a Driver restart - @Parameter(DriverRestartTaskRunningHandlers.class) final Set<EventHandler<RunningTask>> driverRestartTaskRunningHandlers, - @Parameter(DriverRestartContextActiveHandlers.class) final Set<EventHandler<ActiveContext>> driverRestartActiveContextHandlers, - @Parameter(DriverRestartCompletedHandlers.class) final Set<EventHandler<DriverRestartCompleted>> driverRestartCompletedHandlers, + @Parameter(DriverRestartTaskRunningHandlers.class) + final Set<EventHandler<RunningTask>> driverRestartTaskRunningHandlers, + @Parameter(DriverRestartContextActiveHandlers.class) + final Set<EventHandler<ActiveContext>> driverRestartActiveContextHandlers, + @Parameter(DriverRestartCompletedHandlers.class) + final Set<EventHandler<DriverRestartCompleted>> driverRestartCompletedHandlers, // Service-provided event handlers specific to a Driver restart - @Parameter(ServiceDriverRestartTaskRunningHandlers.class) final Set<EventHandler<RunningTask>> serviceDriverRestartTaskRunningHandlers, - @Parameter(ServiceDriverRestartContextActiveHandlers.class) final Set<EventHandler<ActiveContext>> serviceDriverRestartActiveContextHandlers, - @Parameter(ServiceDriverRestartCompletedHandlers.class) final Set<EventHandler<DriverRestartCompleted>> serviceDriverRestartCompletedHandlers, + @Parameter(ServiceDriverRestartTaskRunningHandlers.class) + final Set<EventHandler<RunningTask>> serviceDriverRestartTaskRunningHandlers, + @Parameter(ServiceDriverRestartContextActiveHandlers.class) + final Set<EventHandler<ActiveContext>> serviceDriverRestartActiveContextHandlers, + @Parameter(ServiceDriverRestartCompletedHandlers.class) + final Set<EventHandler<DriverRestartCompleted>> serviceDriverRestartCompletedHandlers, @Parameter(EvaluatorDispatcherThreads.class) final int numberOfThreads, @Parameter(EvaluatorManager.EvaluatorIdentifier.class) final String evaluatorIdentifier, http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorResourceManagerErrorHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorResourceManagerErrorHandler.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorResourceManagerErrorHandler.java index fbfde40..a55fec3 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorResourceManagerErrorHandler.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorResourceManagerErrorHandler.java @@ -35,7 +35,8 @@ import java.util.logging.Logger; * Its primary function is to dispatch these to the appropriate EvaluatorManager. */ @Private -public final class EvaluatorResourceManagerErrorHandler implements EventHandler<RemoteMessage<ReefServiceProtos.RuntimeErrorProto>> { +public final class EvaluatorResourceManagerErrorHandler + implements EventHandler<RemoteMessage<ReefServiceProtos.RuntimeErrorProto>> { private static final Logger LOG = Logger.getLogger(EvaluatorResourceManagerErrorHandler.class.toString()); private final Evaluators evaluators; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/FailedEvaluatorImpl.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/FailedEvaluatorImpl.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/FailedEvaluatorImpl.java index cde8029..80b08ce 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/FailedEvaluatorImpl.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/FailedEvaluatorImpl.java @@ -37,7 +37,10 @@ final class FailedEvaluatorImpl implements FailedEvaluator { private final List<FailedContext> ctx; private final Optional<FailedTask> task; - public FailedEvaluatorImpl(final EvaluatorException ex, final List<FailedContext> ctx, final Optional<FailedTask> task, final String id) { + public FailedEvaluatorImpl(final EvaluatorException ex, + final List<FailedContext> ctx, + final Optional<FailedTask> task, + final String id) { this.ex = ex; this.ctx = ctx; this.task = task; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/idle/DriverIdleManager.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/idle/DriverIdleManager.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/idle/DriverIdleManager.java index 548ec1d..f100395 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/idle/DriverIdleManager.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/idle/DriverIdleManager.java @@ -58,7 +58,8 @@ public final class DriverIdleManager { for (final DriverIdlenessSource idlenessSource : this.idlenessSources) { final IdleMessage idleMessage = idlenessSource.getIdleStatus(); LOG.log(IDLE_REASONS_LEVEL, "[{0}] is reporting {1} because [{2}]." - , new Object[]{idleMessage.getComponentName(), idleMessage.isIdle() ? "idle" : "not idle", idleMessage.getReason()} + , new Object[]{idleMessage.getComponentName(), idleMessage.isIdle() ? "idle" : "not idle", + idleMessage.getReason()} ); isIdle &= idleMessage.isIdle(); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/idle/EventHandlerIdlenessSource.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/idle/EventHandlerIdlenessSource.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/idle/EventHandlerIdlenessSource.java index 32874b0..9e8a389 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/idle/EventHandlerIdlenessSource.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/idle/EventHandlerIdlenessSource.java @@ -28,8 +28,10 @@ import javax.inject.Inject; */ public final class EventHandlerIdlenessSource implements DriverIdlenessSource { - private static final IdleMessage IDLE_MESSAGE = new IdleMessage("EventHandlers", "All events have been processed.", true); - private static final IdleMessage NOT_IDLE_MESSAGE = new IdleMessage("EventHandlers", "Some events are still in flight.", true); + private static final IdleMessage IDLE_MESSAGE = + new IdleMessage("EventHandlers", "All events have been processed.", true); + private static final IdleMessage NOT_IDLE_MESSAGE = + new IdleMessage("EventHandlers", "Some events are still in flight.", true); private final InjectionFuture<Evaluators> evaluators; private final InjectionFuture<DriverIdleManager> driverIdleManager; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/parameters/EvaluatorTimeout.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/parameters/EvaluatorTimeout.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/parameters/EvaluatorTimeout.java index 3353b8b..69144ac 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/parameters/EvaluatorTimeout.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/parameters/EvaluatorTimeout.java @@ -24,6 +24,7 @@ import org.apache.reef.tang.annotations.NamedParameter; /** * The evaluator timeout (how long to wait before deciding an evaluator is dead. */ -@NamedParameter(doc = "The evaluator timeout (how long to wait before deciding an evaluator is dead.", default_value = "60000") +@NamedParameter(doc = "The evaluator timeout (how long to wait before deciding an evaluator is dead.", + default_value = "60000") public final class EvaluatorTimeout implements Name<Long> { } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/resourcemanager/ResourceManagerStatus.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/resourcemanager/ResourceManagerStatus.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/resourcemanager/ResourceManagerStatus.java index b10262a..a04ade5 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/resourcemanager/ResourceManagerStatus.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/resourcemanager/ResourceManagerStatus.java @@ -42,7 +42,8 @@ public final class ResourceManagerStatus implements EventHandler<RuntimeStatusEv private static final Logger LOG = Logger.getLogger(ResourceManagerStatus.class.getName()); private static final String COMPONENT_NAME = "ResourceManager"; - private static final IdleMessage IDLE_MESSAGE = new IdleMessage(COMPONENT_NAME, "No outstanding requests or allocations", true); + private static final IdleMessage IDLE_MESSAGE = + new IdleMessage(COMPONENT_NAME, "No outstanding requests or allocations", true); private final ResourceManagerErrorHandler resourceManagerErrorHandler; private final DriverStatusManager driverStatusManager; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/resourcemanager/ResourceStatusHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/resourcemanager/ResourceStatusHandler.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/resourcemanager/ResourceStatusHandler.java index 393d8ad..c661d7b 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/resourcemanager/ResourceStatusHandler.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/resourcemanager/ResourceStatusHandler.java @@ -57,7 +57,8 @@ public final class ResourceStatusHandler implements EventHandler<ResourceStatusE evaluatorManager.get().onResourceStatusMessage(resourceStatusEvent); } else { if (resourceStatusEvent.getIsFromPreviousDriver().get()) { - EvaluatorManager previousEvaluatorManager = this.evaluatorManagerFactory.createForEvaluatorFailedDuringDriverRestart(resourceStatusEvent); + EvaluatorManager previousEvaluatorManager = + this.evaluatorManagerFactory.createForEvaluatorFailedDuringDriverRestart(resourceStatusEvent); previousEvaluatorManager.onResourceStatusMessage(resourceStatusEvent); } else { throw new RuntimeException( http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/task/RunningTaskImpl.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/task/RunningTaskImpl.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/task/RunningTaskImpl.java index 887159f..89a46df 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/task/RunningTaskImpl.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/task/RunningTaskImpl.java @@ -98,7 +98,8 @@ public final class RunningTaskImpl implements RunningTask { @Override public void close(final byte[] message) { - LOG.log(Level.FINEST, "CLOSE: TaskRuntime id[" + taskId + "] on evaluator id[" + evaluatorManager.getId() + "] with message."); + LOG.log(Level.FINEST, "CLOSE: TaskRuntime id[" + taskId + "] on evaluator id[" + evaluatorManager.getId() + + "] with message."); if (this.taskRepresenter.isNotRunning()) { throw new RuntimeException("Trying to send a message to a Task that is no longer RUNNING."); } @@ -112,7 +113,8 @@ public final class RunningTaskImpl implements RunningTask { @Override public void suspend(final byte[] message) { - LOG.log(Level.FINEST, "SUSPEND: TaskRuntime id[" + taskId + "] on evaluator id[" + evaluatorManager.getId() + "] with message."); + LOG.log(Level.FINEST, "SUSPEND: TaskRuntime id[" + taskId + "] on evaluator id[" + evaluatorManager.getId() + + "] with message."); final ContextControlProto contextControlProto = ContextControlProto.newBuilder() .setSuspendTask(SuspendTaskProto.newBuilder().build()) http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/task/TaskRepresenter.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/task/TaskRepresenter.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/task/TaskRepresenter.java index 1d71d72..6bfee45 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/task/TaskRepresenter.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/task/TaskRepresenter.java @@ -140,7 +140,8 @@ public final class TaskRepresenter { this.messageDispatcher.onDriverRestartTaskRunning(runningTask); } - for (final ReefServiceProtos.TaskStatusProto.TaskMessageProto taskMessageProto : taskStatusProto.getTaskMessageList()) { + for (final ReefServiceProtos.TaskStatusProto.TaskMessageProto + taskMessageProto : taskStatusProto.getTaskMessageList()) { this.messageDispatcher.onTaskMessage( new TaskMessageImpl(taskMessageProto.getMessage().toByteArray(), this.taskId, this.context.getId(), taskMessageProto.getSourceId())); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/context/ContextRuntime.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/context/ContextRuntime.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/context/ContextRuntime.java index 3aca309..08ec14d 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/context/ContextRuntime.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/context/ContextRuntime.java @@ -226,8 +226,10 @@ public final class ContextRuntime { * Launches a Task on this context. * * @param taskConfig the configuration to be used for the task. - * @throws org.apache.reef.runtime.common.evaluator.task.TaskClientCodeException If the Task cannot be instantiated due to user code / configuration issues. - * @throws IllegalStateException If this method is called when there is either a task or child context already present. + * @throws org.apache.reef.runtime.common.evaluator.task.TaskClientCodeException If the Task cannot be instantiated + * due to user code / configuration issues. + * @throws IllegalStateException If this method is called when + * there is either a task or child context already present. */ void startTask(final Configuration taskConfig) throws TaskClientCodeException { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/context/RootContextLauncher.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/context/RootContextLauncher.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/context/RootContextLauncher.java index 34078c9..ced3920 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/context/RootContextLauncher.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/context/RootContextLauncher.java @@ -47,7 +47,8 @@ final class RootContextLauncher { RootContextLauncher(@Parameter(RootContextConfiguration.class) final String rootContextConfiguration, @Parameter(RootServiceConfiguration.class) final String rootServiceConfiguration, @Parameter(InitialTaskConfiguration.class) final String initialTaskConfiguration, - final Injector injector, final ConfigurationSerializer configurationSerializer) throws IOException, BindException { + final Injector injector, final ConfigurationSerializer configurationSerializer) + throws IOException, BindException { this.injector = injector; this.configurationSerializer = configurationSerializer; this.rootContextConfiguration = this.configurationSerializer.fromString(rootContextConfiguration); @@ -58,7 +59,8 @@ final class RootContextLauncher { @Inject RootContextLauncher(@Parameter(RootContextConfiguration.class) final String rootContextConfiguration, final Injector injector, - @Parameter(RootServiceConfiguration.class) final String rootServiceConfiguration, final ConfigurationSerializer configurationSerializer) throws IOException, BindException { + @Parameter(RootServiceConfiguration.class) final String rootServiceConfiguration, + final ConfigurationSerializer configurationSerializer) throws IOException, BindException { this.injector = injector; this.configurationSerializer = configurationSerializer; this.rootContextConfiguration = this.configurationSerializer.fromString(rootContextConfiguration); @@ -69,7 +71,8 @@ final class RootContextLauncher { @Inject RootContextLauncher(final Injector injector, @Parameter(RootContextConfiguration.class) final String rootContextConfiguration, - @Parameter(InitialTaskConfiguration.class) final String initialTaskConfiguration, final ConfigurationSerializer configurationSerializer) throws IOException, BindException { + @Parameter(InitialTaskConfiguration.class) final String initialTaskConfiguration, + final ConfigurationSerializer configurationSerializer) throws IOException, BindException { this.injector = injector; this.configurationSerializer = configurationSerializer; this.rootContextConfiguration = this.configurationSerializer.fromString(rootContextConfiguration); @@ -79,7 +82,8 @@ final class RootContextLauncher { @Inject RootContextLauncher(@Parameter(RootContextConfiguration.class) final String rootContextConfiguration, - final Injector injector, final ConfigurationSerializer configurationSerializer) throws IOException, BindException { + final Injector injector, final ConfigurationSerializer configurationSerializer) + throws IOException, BindException { this.injector = injector; this.configurationSerializer = configurationSerializer; this.rootContextConfiguration = this.configurationSerializer.fromString(rootContextConfiguration); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/context/defaults/DefaultContextStartHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/context/defaults/DefaultContextStartHandler.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/context/defaults/DefaultContextStartHandler.java index 2b0155f..da32979 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/context/defaults/DefaultContextStartHandler.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/context/defaults/DefaultContextStartHandler.java @@ -38,6 +38,7 @@ public final class DefaultContextStartHandler implements EventHandler<ContextSta @Override public void onNext(final ContextStart contextStart) { - Logger.getLogger(this.getClass().toString()).log(Level.INFO, "DefaultContextStartHandler received: " + contextStart); + Logger.getLogger(this.getClass().toString()).log(Level.INFO, "DefaultContextStartHandler received: " + + contextStart); } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskLifeCycleHandlers.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskLifeCycleHandlers.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskLifeCycleHandlers.java index 403f546..76375b0 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskLifeCycleHandlers.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskLifeCycleHandlers.java @@ -46,8 +46,10 @@ final class TaskLifeCycleHandlers { private final TaskStop taskStop; @Inject - TaskLifeCycleHandlers(@Parameter(TaskConfigurationOptions.StopHandlers.class) final Set<EventHandler<TaskStop>> taskStopHandlers, - @Parameter(TaskConfigurationOptions.StartHandlers.class) final Set<EventHandler<TaskStart>> taskStartHandlers, + TaskLifeCycleHandlers(@Parameter(TaskConfigurationOptions.StopHandlers.class) + final Set<EventHandler<TaskStop>> taskStopHandlers, + @Parameter(TaskConfigurationOptions.StartHandlers.class) + final Set<EventHandler<TaskStart>> taskStartHandlers, final TaskStartImpl taskStart, final TaskStopImpl taskStop) { this.taskStopHandlers = taskStopHandlers; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskRuntime.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskRuntime.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskRuntime.java index 2a80bb1..4b3e40e 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskRuntime.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskRuntime.java @@ -75,11 +75,15 @@ public final class TaskRuntime implements Runnable { final HeartBeatManager heartBeatManager, final Task task, final TaskStatus currentStatus, - @Parameter(TaskConfigurationOptions.CloseHandler.class) final InjectionFuture<EventHandler<CloseEvent>> fCloseHandler, - @Parameter(TaskConfigurationOptions.SuspendHandler.class) final InjectionFuture<EventHandler<SuspendEvent>> fSuspendHandler, - @Parameter(TaskConfigurationOptions.MessageHandler.class) final InjectionFuture<EventHandler<DriverMessage>> fMessageHandler, + @Parameter(TaskConfigurationOptions.CloseHandler.class) + final InjectionFuture<EventHandler<CloseEvent>> fCloseHandler, + @Parameter(TaskConfigurationOptions.SuspendHandler.class) + final InjectionFuture<EventHandler<SuspendEvent>> fSuspendHandler, + @Parameter(TaskConfigurationOptions.MessageHandler.class) + final InjectionFuture<EventHandler<DriverMessage>> fMessageHandler, final TaskLifeCycleHandlers taskLifeCycleHandlers) { - this(heartBeatManager, task, currentStatus, fCloseHandler, fSuspendHandler, fMessageHandler, null, taskLifeCycleHandlers); + this(heartBeatManager, task, currentStatus, fCloseHandler, fSuspendHandler, fMessageHandler, null, + taskLifeCycleHandlers); } // TODO: Document @@ -88,9 +92,12 @@ public final class TaskRuntime implements Runnable { final HeartBeatManager heartBeatManager, final Task task, final TaskStatus currentStatus, - @Parameter(TaskConfigurationOptions.CloseHandler.class) final InjectionFuture<EventHandler<CloseEvent>> fCloseHandler, - @Parameter(TaskConfigurationOptions.SuspendHandler.class) final InjectionFuture<EventHandler<SuspendEvent>> fSuspendHandler, - @Parameter(TaskConfigurationOptions.MessageHandler.class) final InjectionFuture<EventHandler<DriverMessage>> fMessageHandler, + @Parameter(TaskConfigurationOptions.CloseHandler.class) + final InjectionFuture<EventHandler<CloseEvent>> fCloseHandler, + @Parameter(TaskConfigurationOptions.SuspendHandler.class) + final InjectionFuture<EventHandler<SuspendEvent>> fSuspendHandler, + @Parameter(TaskConfigurationOptions.MessageHandler.class) + final InjectionFuture<EventHandler<DriverMessage>> fMessageHandler, @Parameter(TaskConfigurationOptions.Memento.class) final String memento, final TaskLifeCycleHandlers taskLifeCycleHandlers) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskStatus.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskStatus.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskStatus.java index 50076bf..dfaca1c 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskStatus.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskStatus.java @@ -56,7 +56,8 @@ public final class TaskStatus { @Inject TaskStatus(@Parameter(TaskConfigurationOptions.Identifier.class) final String taskId, @Parameter(ContextIdentifier.class) final String contextId, - @Parameter(TaskConfigurationOptions.TaskMessageSources.class) final Set<TaskMessageSource> evaluatorMessageSources, + @Parameter(TaskConfigurationOptions.TaskMessageSources.class) + final Set<TaskMessageSource> evaluatorMessageSources, final HeartBeatManager heartBeatManager, final ExceptionCodec exceptionCodec) { this.taskId = taskId; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/parameters/ErrorHandlerRID.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/parameters/ErrorHandlerRID.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/parameters/ErrorHandlerRID.java index 38aa950..4ac3101 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/parameters/ErrorHandlerRID.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/parameters/ErrorHandlerRID.java @@ -21,7 +21,8 @@ package org.apache.reef.runtime.common.launch.parameters; import org.apache.reef.tang.annotations.Name; import org.apache.reef.tang.annotations.NamedParameter; -@NamedParameter(doc = "The error handler remote identifier.", short_name = ErrorHandlerRID.SHORT_NAME, default_value = ErrorHandlerRID.NONE) +@NamedParameter(doc = "The error handler remote identifier.", short_name = ErrorHandlerRID.SHORT_NAME, + default_value = ErrorHandlerRID.NONE) public final class ErrorHandlerRID implements Name<String> { /** * Indicates that no ErrorHandler is bound. http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/parameters/DeleteTempFiles.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/parameters/DeleteTempFiles.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/parameters/DeleteTempFiles.java index fee0c1e..7eea4c5 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/parameters/DeleteTempFiles.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/parameters/DeleteTempFiles.java @@ -24,7 +24,8 @@ import org.apache.reef.tang.annotations.NamedParameter; /** * Whether or not to delete the temporary files created during Driver and Evaluator submission. */ -@NamedParameter(doc = "Whether or not to delete the temporary files created during Driver and Evaluator submission.", default_value = "true") +@NamedParameter(doc = "Whether or not to delete the temporary files created during Driver and Evaluator submission.", + default_value = "true") public final class DeleteTempFiles implements Name<Boolean> { private DeleteTempFiles() { } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/utils/DispatchingEStage.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/utils/DispatchingEStage.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/utils/DispatchingEStage.java index b5c8f80..a03253c 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/utils/DispatchingEStage.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/utils/DispatchingEStage.java @@ -54,7 +54,8 @@ public final class DispatchingEStage implements AutoCloseable { /** * @param errorHandler used for exceptions thrown from the event handlers registered. * @param numThreads number of threads to allocate to dispatch events. - * @param stageName the name to use for the underlying stage. It will be carried over to name the Thread(s) spawned. + * @param stageName the name to use for the underlying stage. + * It will be carried over to name the Thread(s) spawned. */ public DispatchingEStage(final EventHandler<Throwable> errorHandler, final int numThreads, http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/task/TaskMessageSource.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/task/TaskMessageSource.java b/lang/java/reef-common/src/main/java/org/apache/reef/task/TaskMessageSource.java index 2c4525e..c9fc912 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/task/TaskMessageSource.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/task/TaskMessageSource.java @@ -25,8 +25,9 @@ import org.apache.reef.util.Optional; /** * Message source for control flow messages from a task to the Driver. * <p/> - * The getMessage() method in an Implementation of this interface will be called by the Evaluator resourcemanager whenever it is - * about to communicate with the Driver anyway. Hence, this can be used for occasional status updates etc. + * The getMessage() method in an Implementation of this interface will be called by the Evaluator resourcemanager + * whenever it is about to communicate with the Driver anyway. + * Hence, this can be used for occasional status updates etc. */ @Public @EvaluatorSide http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/util/DeadlockInfo.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/util/DeadlockInfo.java b/lang/java/reef-common/src/main/java/org/apache/reef/util/DeadlockInfo.java index 45c2257..35fb591 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/util/DeadlockInfo.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/util/DeadlockInfo.java @@ -58,9 +58,11 @@ final class DeadlockInfo { * Get a list of monitor locks that were acquired by this thread at this stack element. * @param threadInfo The thread that created the stack element * @param stackTraceElement The stack element - * @return List of monitor locks that were acquired by this thread at this stack element or an empty list if none were acquired + * @return List of monitor locks that were acquired by this thread at this stack element + * or an empty list if none were acquired */ - public List<MonitorInfo> getMonitorLockedElements(final ThreadInfo threadInfo, final StackTraceElement stackTraceElement) { + public List<MonitorInfo> getMonitorLockedElements(final ThreadInfo threadInfo, + final StackTraceElement stackTraceElement) { final Map<StackTraceElement, List<MonitorInfo>> elementMap = monitorLockedElements.get(threadInfo); if (null == elementMap) { return Collections.EMPTY_LIST; @@ -77,7 +79,8 @@ final class DeadlockInfo { /** * Get a string identifying the lock that this thread is waiting on. * @param threadInfo - * @return A string identifying the lock that this thread is waiting on, or null if the thread is not waiting on a lock + * @return A string identifying the lock that this thread is waiting on, + * or null if the thread is not waiting on a lock */ @Nullable public String getWaitingLockString(final ThreadInfo threadInfo) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LogParser.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LogParser.java b/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LogParser.java index 80c9796..8192a10 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LogParser.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LogParser.java @@ -57,13 +57,17 @@ public final class LogParser { } /** - * Get lines from a given file with a specified filter, trim the line by removing strings before removeBeforeToken and after removeAfterToken. + * Get lines from a given file with a specified filter, trim the line by removing strings + * before removeBeforeToken and after removeAfterToken. * @param fileName * @param filter * @return * @throws IOException */ - public static ArrayList<String> getFilteredLinesFromFile(final String fileName, final String filter, final String removeBeforeToken, final String removeAfterToken) throws IOException{ + public static ArrayList<String> getFilteredLinesFromFile(final String fileName, + final String filter, + final String removeBeforeToken, + final String removeAfterToken) throws IOException{ final ArrayList<String> filteredLines = new ArrayList<String>(); try (final FileReader fr = new FileReader(fileName)) { try (final BufferedReader in = new BufferedReader(fr)) { @@ -105,7 +109,8 @@ public final class LogParser { * @return * @throws IOException */ - public static ArrayList<String> getFilteredLinesFromFile(final String fileName, final String filter) throws IOException { + public static ArrayList<String> getFilteredLinesFromFile(final String fileName, final String filter) + throws IOException { return getFilteredLinesFromFile(fileName, filter, null, null); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LoggingScopeFactory.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LoggingScopeFactory.java b/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LoggingScopeFactory.java index 02772ae..5a31192 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LoggingScopeFactory.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LoggingScopeFactory.java @@ -103,7 +103,8 @@ public final class LoggingScopeFactory { } /** - * The method is to measure the time used to start the driver. It can be inserted to the code between start driver till it is started + * The method is to measure the time used to start the driver. + * It can be inserted to the code between start driver till it is started * @param startTime * @return */ @@ -112,7 +113,8 @@ public final class LoggingScopeFactory { } /** - * The method is to measure the time used to stop the driver. It can be inserted to the code between start driver stop till it is stopped + * The method is to measure the time used to stop the driver. + * It can be inserted to the code between start driver stop till it is stopped * @param timeStamp * @return */ @@ -121,7 +123,8 @@ public final class LoggingScopeFactory { } /** - * The method is to measure the time used to set up Java CRL bridge. It can be inserted to the code between beginning of bridge set up and the end of it + * The method is to measure the time used to set up Java CRL bridge. + * It can be inserted to the code between beginning of bridge set up and the end of it * @return */ public LoggingScope setupBridge() { @@ -137,7 +140,8 @@ public final class LoggingScopeFactory { } /** - * The method is to measure the time used to pass EvaluatorRequestor from Java to .Net. It can be inserted to the code between beginning to send EvaluatorRequestor to CLR until it is returned. + * The method is to measure the time used to pass EvaluatorRequestor from Java to .Net. + * It can be inserted to the code between beginning to send EvaluatorRequestor to CLR until it is returned. * @return */ public LoggingScope evaluatorRequestorPassToCs() { @@ -145,7 +149,8 @@ public final class LoggingScopeFactory { } /** - * The method is to measure the time used to submit Evaluator request from CLR to Java driver. It can be inserted to evaluator submit() method. + * The method is to measure the time used to submit Evaluator request from CLR to Java driver. + * It can be inserted to evaluator submit() method. * @param evaluatorsNumber * @return */ http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/resources/checkstyle.xml ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/resources/checkstyle.xml b/lang/java/reef-common/src/main/resources/checkstyle.xml index ca6d8c2..a69a167 100644 --- a/lang/java/reef-common/src/main/resources/checkstyle.xml +++ b/lang/java/reef-common/src/main/resources/checkstyle.xml @@ -137,7 +137,6 @@ <module name="LineLength"> <property name="ignorePattern" value="^import"/> <property name="max" value="120"/> - <property name="severity" value="warning"/> </module> <module name="MethodLength"/> <module name="ParameterNumber"> http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-examples-clr/src/main/java/org/apache/reef/examples/helloCLR/HelloCLR.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples-clr/src/main/java/org/apache/reef/examples/helloCLR/HelloCLR.java b/lang/java/reef-examples-clr/src/main/java/org/apache/reef/examples/helloCLR/HelloCLR.java index da969c0..953ae53 100644 --- a/lang/java/reef-examples-clr/src/main/java/org/apache/reef/examples/helloCLR/HelloCLR.java +++ b/lang/java/reef-examples-clr/src/main/java/org/apache/reef/examples/helloCLR/HelloCLR.java @@ -51,7 +51,9 @@ public final class HelloCLR { */ private static final int JOB_TIMEOUT = 1000000; // 1000 sec. - private static ConfigurationModule addAll(final ConfigurationModule conf, final OptionalParameter<String> param, final File folder) { + private static ConfigurationModule addAll(final ConfigurationModule conf, + final OptionalParameter<String> param, + final File folder) { ConfigurationModule result = conf; for (final File f : folder.listFiles()) { if (f.canRead() && f.exists() && f.isFile()) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-examples-clr/src/main/java/org/apache/reef/examples/helloCLR/HelloDriver.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples-clr/src/main/java/org/apache/reef/examples/helloCLR/HelloDriver.java b/lang/java/reef-examples-clr/src/main/java/org/apache/reef/examples/helloCLR/HelloDriver.java index 29b3126..1bfd348 100644 --- a/lang/java/reef-examples-clr/src/main/java/org/apache/reef/examples/helloCLR/HelloDriver.java +++ b/lang/java/reef-examples-clr/src/main/java/org/apache/reef/examples/helloCLR/HelloDriver.java @@ -80,8 +80,11 @@ public final class HelloDriver { private static Configuration getCLRTaskConfiguration(final String taskId) throws BindException { final ConfigurationBuilder taskConfigurationBuilder = Tang.Factory.getTang() .newConfigurationBuilder(loadClassHierarchy()); - taskConfigurationBuilder.bind("Org.Apache.Reef.Tasks.TaskConfigurationOptions+Identifier,Org.Apache.Reef.Tasks.ITask, Version=1.0.0.0, Culture=neutral, PublicKeyToken=69c3241e6f0468ca", taskId); - taskConfigurationBuilder.bind("Org.Apache.Reef.Tasks.ITask, Org.Apache.Reef.Tasks.ITask, Version=1.0.0.0, Culture=neutral, PublicKeyToken=69c3241e6f0468ca", "Org.Apache.Reef.Tasks.HelloTask, Org.Apache.Reef.Tasks.HelloTask, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null"); + taskConfigurationBuilder.bind("Org.Apache.Reef.Tasks.TaskConfigurationOptions+Identifier," + + "Org.Apache.Reef.Tasks.ITask, Version=1.0.0.0, Culture=neutral, PublicKeyToken=69c3241e6f0468ca", taskId); + taskConfigurationBuilder.bind("Org.Apache.Reef.Tasks.ITask, Org.Apache.Reef.Tasks.ITask, Version=1.0.0.0, " + + "Culture=neutral, PublicKeyToken=69c3241e6f0468ca", "Org.Apache.Reef.Tasks.HelloTask, " + + "Org.Apache.Reef.Tasks.HelloTask, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null"); return taskConfigurationBuilder.build(); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/MasterTask.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/MasterTask.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/MasterTask.java index c7da1c4..2c67b2a 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/MasterTask.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/MasterTask.java @@ -85,7 +85,8 @@ public class MasterTask implements Task { this.controlMessageBroadcaster = communicationGroupClient.getBroadcastSender(ControlMessageBroadcaster.class); this.modelBroadcaster = communicationGroupClient.getBroadcastSender(ModelBroadcaster.class); this.lossAndGradientReducer = communicationGroupClient.getReduceReceiver(LossAndGradientReducer.class); - this.modelAndDescentDirectionBroadcaster = communicationGroupClient.getBroadcastSender(ModelAndDescentDirectionBroadcaster.class); + this.modelAndDescentDirectionBroadcaster = + communicationGroupClient.getBroadcastSender(ModelAndDescentDirectionBroadcaster.class); this.descentDriectionBroadcaster = communicationGroupClient.getBroadcastSender(DescentDirectionBroadcaster.class); this.lineSearchEvaluationsReducer = communicationGroupClient.getReduceReceiver(LineSearchEvaluationsReducer.class); this.minEtaBroadcaster = communicationGroupClient.getBroadcastSender(MinEtaBroadcaster.class); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/SlaveTask.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/SlaveTask.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/SlaveTask.java index 3d18f8c..e414bb7 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/SlaveTask.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/SlaveTask.java @@ -78,7 +78,8 @@ public class SlaveTask implements Task { this.controlMessageBroadcaster = communicationGroup.getBroadcastReceiver(ControlMessageBroadcaster.class); this.modelBroadcaster = communicationGroup.getBroadcastReceiver(ModelBroadcaster.class); this.lossAndGradientReducer = communicationGroup.getReduceSender(LossAndGradientReducer.class); - this.modelAndDescentDirectionBroadcaster = communicationGroup.getBroadcastReceiver(ModelAndDescentDirectionBroadcaster.class); + this.modelAndDescentDirectionBroadcaster = + communicationGroup.getBroadcastReceiver(ModelAndDescentDirectionBroadcaster.class); this.descentDirectionBroadcaster = communicationGroup.getBroadcastReceiver(DescentDirectionBroadcaster.class); this.lineSearchEvaluationsReducer = communicationGroup.getReduceSender(LineSearchEvaluationsReducer.class); this.minEtaBroadcaster = communicationGroup.getBroadcastReceiver(MinEtaBroadcaster.class); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/parameters/LossFunctionType.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/parameters/LossFunctionType.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/parameters/LossFunctionType.java index 8d265e0..3361f7e 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/parameters/LossFunctionType.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/parameters/LossFunctionType.java @@ -24,7 +24,8 @@ import org.apache.reef.tang.annotations.NamedParameter; /** * */ -@NamedParameter(doc = "Loss Function to be used: logLoss|weightedLogLoss|squaredError", short_name = "loss", default_value = "logLoss") +@NamedParameter(doc = "Loss Function to be used: logLoss|weightedLogLoss|squaredError", short_name = "loss", + default_value = "logLoss") public class LossFunctionType implements Name<String> { } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hello/HelloREEFMesos.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hello/HelloREEFMesos.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hello/HelloREEFMesos.java index 1fce55b..476f73b 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hello/HelloREEFMesos.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hello/HelloREEFMesos.java @@ -33,7 +33,8 @@ public final class HelloREEFMesos { private static Configuration getDriverConfiguration() { return DriverConfiguration.CONF - .set(DriverConfiguration.GLOBAL_LIBRARIES, HelloREEFMesos.class.getProtectionDomain().getCodeSource().getLocation().getFile()) + .set(DriverConfiguration.GLOBAL_LIBRARIES, + HelloREEFMesos.class.getProtectionDomain().getCodeSource().getLocation().getFile()) .set(DriverConfiguration.DRIVER_IDENTIFIER, "HelloREEF") .set(DriverConfiguration.ON_DRIVER_STARTED, HelloDriver.StartHandler.class) .set(DriverConfiguration.ON_EVALUATOR_ALLOCATED, HelloDriver.EvaluatorAllocatedHandler.class) http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hello/HelloREEFYarn.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hello/HelloREEFYarn.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hello/HelloREEFYarn.java index ad8d3f0..78df28d 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hello/HelloREEFYarn.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hello/HelloREEFYarn.java @@ -46,7 +46,8 @@ public final class HelloREEFYarn { */ private static Configuration getDriverConfiguration() { return DriverConfiguration.CONF - .set(DriverConfiguration.GLOBAL_LIBRARIES, HelloREEFYarn.class.getProtectionDomain().getCodeSource().getLocation().getFile()) + .set(DriverConfiguration.GLOBAL_LIBRARIES, + HelloREEFYarn.class.getProtectionDomain().getCodeSource().getLocation().getFile()) .set(DriverConfiguration.DRIVER_IDENTIFIER, "HelloREEF") .set(DriverConfiguration.ON_DRIVER_STARTED, HelloDriver.StartHandler.class) .set(DriverConfiguration.ON_EVALUATOR_ALLOCATED, HelloDriver.EvaluatorAllocatedHandler.class) http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hello/HelloReefYarnTcp.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hello/HelloReefYarnTcp.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hello/HelloReefYarnTcp.java index fa6c46a..8b30c9c 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hello/HelloReefYarnTcp.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hello/HelloReefYarnTcp.java @@ -52,7 +52,8 @@ public final class HelloReefYarnTcp { */ private static Configuration getDriverConfiguration() { return DriverConfiguration.CONF - .set(DriverConfiguration.GLOBAL_LIBRARIES, HelloReefYarnTcp.class.getProtectionDomain().getCodeSource().getLocation().getFile()) + .set(DriverConfiguration.GLOBAL_LIBRARIES, + HelloReefYarnTcp.class.getProtectionDomain().getCodeSource().getLocation().getFile()) .set(DriverConfiguration.DRIVER_IDENTIFIER, "HelloREEF") .set(DriverConfiguration.ON_DRIVER_STARTED, HelloDriver.StartHandler.class) .set(DriverConfiguration.ON_EVALUATOR_ALLOCATED, HelloDriver.EvaluatorAllocatedHandler.class) http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hellohttp/HelloREEFHttp.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hellohttp/HelloREEFHttp.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hellohttp/HelloREEFHttp.java index 40e1d12..3804de6 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hellohttp/HelloREEFHttp.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hellohttp/HelloREEFHttp.java @@ -58,7 +58,8 @@ public final class HelloREEFHttp { .set(HttpHandlerConfiguration.HTTP_HANDLERS, HttpServerShellCmdtHandler.class) .build(); final Configuration driverConfigurationForHttpServer = DriverServiceConfiguration.CONF - .set(DriverServiceConfiguration.ON_EVALUATOR_ALLOCATED, ReefEventStateManager.AllocatedEvaluatorStateHandler.class) + .set(DriverServiceConfiguration.ON_EVALUATOR_ALLOCATED, + ReefEventStateManager.AllocatedEvaluatorStateHandler.class) .set(DriverServiceConfiguration.ON_CONTEXT_ACTIVE, ReefEventStateManager.ActiveContextStateHandler.class) .set(DriverServiceConfiguration.ON_TASK_RUNNING, ReefEventStateManager.TaskRunningStateHandler.class) .set(DriverServiceConfiguration.ON_DRIVER_STARTED, ReefEventStateManager.StartStateHandler.class) @@ -98,7 +99,8 @@ public final class HelloREEFHttp { */ public static LauncherStatus runHelloReef(final Configuration runtimeConf, final int timeOut) throws BindException, InjectionException { - final Configuration driverConf = Configurations.merge(HelloREEFHttp.getDriverConfiguration(), getHTTPConfiguration()); + final Configuration driverConf = + Configurations.merge(HelloREEFHttp.getDriverConfiguration(), getHTTPConfiguration()); return DriverLauncher.getLauncher(runtimeConf).run(driverConf, timeOut); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hellohttp/HttpServerShellCmdtHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hellohttp/HttpServerShellCmdtHandler.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hellohttp/HttpServerShellCmdtHandler.java index efb66c1..eba4854 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hellohttp/HttpServerShellCmdtHandler.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hellohttp/HttpServerShellCmdtHandler.java @@ -98,8 +98,11 @@ class HttpServerShellCmdtHandler implements HttpHandler { * @param response */ @Override - public final synchronized void onHttpRequest(final ParsedHttpRequest parsedHttpRequest, final HttpServletResponse response) throws IOException, ServletException { - LOG.log(Level.INFO, "HttpServeShellCmdtHandler in webserver onHttpRequest is called: {0}", parsedHttpRequest.getRequestUri()); + public final synchronized void onHttpRequest(final ParsedHttpRequest parsedHttpRequest, + final HttpServletResponse response) + throws IOException, ServletException { + LOG.log(Level.INFO, "HttpServeShellCmdtHandler in webserver onHttpRequest is called: {0}", + parsedHttpRequest.getRequestUri()); final Map<String, List<String>> queries = parsedHttpRequest.getQueryMap(); final String queryStr = parsedHttpRequest.getQueryString(); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hellohttp/HttpShellJobDriver.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hellohttp/HttpShellJobDriver.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hellohttp/HttpShellJobDriver.java index 27a63a2..55692ab 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hellohttp/HttpShellJobDriver.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hellohttp/HttpShellJobDriver.java @@ -101,7 +101,8 @@ public final class HttpShellJobDriver { * @param clientCallBackHandler */ @Inject - public HttpShellJobDriver(final EvaluatorRequestor requestor, final HttpServerShellCmdtHandler.ClientCallBackHandler clientCallBackHandler) { + public HttpShellJobDriver(final EvaluatorRequestor requestor, + final HttpServerShellCmdtHandler.ClientCallBackHandler clientCallBackHandler) { this.evaluatorRequestor = requestor; this.httpCallbackHandler = clientCallBackHandler; LOG.log(Level.FINE, "Instantiated 'HelloDriver'"); @@ -270,7 +271,8 @@ public final class HttpShellJobDriver { final class HttpClientCloseHandler implements EventHandler<Void> { @Override public void onNext(final Void aVoid) throws RuntimeException { - LOG.log(Level.INFO, "Received a close message from the client. You can put code here to properly close drivers and evaluators."); + LOG.log(Level.INFO, "Received a close message from the client. " + + "You can put code here to properly close drivers and evaluators."); for (final ActiveContext c : contexts.values()) { c.close(); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/Scheduler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/Scheduler.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/Scheduler.java index ebf59ff..5ab9fb3 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/Scheduler.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/Scheduler.java @@ -96,7 +96,8 @@ final class Scheduler { final TaskEntity task = getTask(taskId, taskQueue); if (task == null) { - final String message = new StringBuilder().append("Task with ID ").append(taskId).append(" is not found").toString(); + final String message = + new StringBuilder().append("Task with ID ").append(taskId).append(" is not found").toString(); return SchedulerResponse.NOT_FOUND(message); } else { taskQueue.remove(task); @@ -172,7 +173,8 @@ final class Scheduler { return SchedulerResponse.OK("Canceled: " + finished.toString()); } } - return SchedulerResponse.NOT_FOUND(new StringBuilder().append("Task with ID ").append(taskId).append(" is not found").toString()); + return SchedulerResponse.NOT_FOUND( + new StringBuilder().append("Task with ID ").append(taskId).append(" is not found").toString()); } /** http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/api/DataLoader.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/api/DataLoader.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/api/DataLoader.java index ef2779f..f384bae 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/api/DataLoader.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/api/DataLoader.java @@ -66,7 +66,8 @@ public class DataLoader { private static final Logger LOG = Logger.getLogger(DataLoader.class.getName()); - private final ConcurrentMap<String, Pair<Configuration, Configuration>> submittedDataEvalConfigs = new ConcurrentHashMap<>(); + private final ConcurrentMap<String, Pair<Configuration, Configuration>> submittedDataEvalConfigs = + new ConcurrentHashMap<>(); private final ConcurrentMap<String, Configuration> submittedComputeEvalConfigs = new ConcurrentHashMap<>(); private final BlockingQueue<Configuration> failedComputeEvalConfigs = new LinkedBlockingQueue<>(); private final BlockingQueue<Pair<Configuration, Configuration>> failedDataEvalConfigs = new LinkedBlockingQueue<>(); @@ -125,7 +126,8 @@ public class DataLoader { final Clock clock, final EvaluatorRequestor requestor, final DataLoadingService dataLoadingService, - @Parameter(DataLoadingRequestBuilder.DataLoadingComputeRequests.class) final Set<String> serializedComputeRequests, + @Parameter(DataLoadingRequestBuilder.DataLoadingComputeRequests.class) + final Set<String> serializedComputeRequests, @Parameter(DataLoadingRequestBuilder.DataLoadingDataRequests.class) final Set<String> serializedDataRequests) { // data requests should not be empty. This maintains previous functionality Validate.notEmpty(serializedDataRequests, "Should contain a data request object"); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/api/DataLoadingRequestBuilder.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/api/DataLoadingRequestBuilder.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/api/DataLoadingRequestBuilder.java index 380ef09..53e8433 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/api/DataLoadingRequestBuilder.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/data/loading/api/DataLoadingRequestBuilder.java @@ -272,12 +272,14 @@ public final class DataLoadingRequestBuilder public static final class NumberOfDesiredSplits implements Name<Integer> { } - @NamedParameter(short_name = "dataLoadingEvaluatorMemoryMB", default_value = DataLoadingEvaluatorMemoryMB.DEFAULT_DATA_MEMORY) + @NamedParameter(short_name = "dataLoadingEvaluatorMemoryMB", + default_value = DataLoadingEvaluatorMemoryMB.DEFAULT_DATA_MEMORY) public static final class DataLoadingEvaluatorMemoryMB implements Name<Integer> { static final String DEFAULT_DATA_MEMORY = "4096"; } - @NamedParameter(short_name = "dataLoadingEvaluatorCore", default_value = DataLoadingEvaluatorNumberOfCores.DEFAULT_DATA_CORES) + @NamedParameter(short_name = "dataLoadingEvaluatorCore", + default_value = DataLoadingEvaluatorNumberOfCores.DEFAULT_DATA_CORES) public static final class DataLoadingEvaluatorNumberOfCores implements Name<Integer> { static final String DEFAULT_DATA_CORES = "1"; } @@ -295,14 +297,16 @@ public final class DataLoadingRequestBuilder /** * Allows to specify a set of compute requests to send to the DataLoader. */ - @NamedParameter(doc = "Sets of compute requests to request to the DataLoader, i.e. evaluators requests that will not load data") + @NamedParameter(doc = "Sets of compute requests to request to the DataLoader, " + + "i.e. evaluators requests that will not load data") static final class DataLoadingComputeRequests implements Name<Set<String>> { } /** * Allows to specify a set of data requests to send to the DataLoader. */ - @NamedParameter(doc = "Sets of data requests to request to the DataLoader, i.e. evaluators requests that will load data") + @NamedParameter(doc = "Sets of data requests to request to the DataLoader, " + + "i.e. evaluators requests that will load data") static final class DataLoadingDataRequests implements Name<Set<String>> { }
