[REEF-410] Fix violations of LineLength checkstyle This addressed the issue by reformatting code to have all lines <= 120 characters.
JIRA: [REEF-410](https://issues.apache.org/jira/browse/REEF-410) Pull Request: This closes #288 Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/84ff5021 Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/84ff5021 Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/84ff5021 Branch: refs/heads/master Commit: 84ff5021cf17c1943ae38a051779c721e831b358 Parents: 4cca54b Author: Mariia Mykhailova <[email protected]> Authored: Wed Jul 8 16:13:44 2015 -0700 Committer: Markus Weimer <[email protected]> Committed: Thu Jul 9 17:10:52 2015 -0700 ---------------------------------------------------------------------- .../apache/reef/bridge/client/Constants.java | 9 ++- .../apache/reef/bridge/client/LocalClient.java | 9 ++- .../bridge/client/YarnJobSubmissionClient.java | 3 +- .../javabridge/AllocatedEvaluatorBridge.java | 9 ++- .../reef/javabridge/ClosedContextBridge.java | 3 +- .../javabridge/EvaluatorRequestorBridge.java | 7 +- .../reef/javabridge/FailedEvaluatorBridge.java | 6 +- .../reef/javabridge/FailedTaskBridge.java | 9 ++- .../reef/javabridge/SuspendedTaskBridge.java | 3 +- .../org/apache/reef/javabridge/Utilities.java | 4 +- .../reef/javabridge/generic/JobClient.java | 18 +++-- .../reef/javabridge/generic/JobDriver.java | 80 +++++++++++++------- .../reef/javabridge/generic/LaunchHeadless.java | 3 +- .../apache/reef/client/DriverConfiguration.java | 3 +- .../org/apache/reef/client/FailedRuntime.java | 3 +- .../org/apache/reef/driver/PreemptionEvent.java | 3 +- .../DriverJobSubmissionDirectory.java | 4 +- .../DriverRestartCompletedHandlers.java | 3 +- .../DriverRestartContextActiveHandlers.java | 3 +- .../driver/parameters/DriverRestartHandler.java | 3 +- .../DriverRestartTaskRunningHandlers.java | 3 +- .../parameters/EvaluatorAllocatedHandlers.java | 3 +- .../parameters/EvaluatorCompletedHandlers.java | 3 +- .../parameters/EvaluatorFailedHandlers.java | 3 +- .../evaluator/context/parameters/Services.java | 3 +- .../exception/evaluator/ServiceException.java | 3 +- .../io/WorkingDirectoryTempFileCreator.java | 3 +- .../common/client/JobSubmissionHelper.java | 3 +- .../common/client/REEFImplementation.java | 3 +- .../runtime/common/client/RunningJobsImpl.java | 9 ++- .../driver/DriverRuntimeStartHandler.java | 3 +- .../runtime/common/driver/DriverSingletons.java | 39 ++++++---- .../common/driver/DriverStartHandler.java | 6 +- .../common/driver/DriverStatusManager.java | 12 ++- .../common/driver/api/RuntimeParameters.java | 3 +- .../driver/catalog/ResourceCatalogImpl.java | 3 +- .../common/driver/client/ClientManager.java | 9 ++- .../common/driver/context/ContextFactory.java | 3 +- .../driver/context/ContextRepresenters.java | 6 +- ...efaultDriverRestartContextActiveHandler.java | 3 +- .../DefaultDriverRestartTaskRunningHandler.java | 3 +- .../evaluator/EvaluatorControlHandler.java | 6 +- .../EvaluatorHeartBeatSanityChecker.java | 3 +- .../evaluator/EvaluatorHeartbeatHandler.java | 6 +- .../driver/evaluator/EvaluatorManager.java | 27 ++++--- .../evaluator/EvaluatorManagerFactory.java | 10 ++- .../evaluator/EvaluatorMessageDispatcher.java | 51 ++++++++----- .../EvaluatorResourceManagerErrorHandler.java | 3 +- .../driver/evaluator/FailedEvaluatorImpl.java | 5 +- .../common/driver/idle/DriverIdleManager.java | 3 +- .../driver/idle/EventHandlerIdlenessSource.java | 6 +- .../driver/parameters/EvaluatorTimeout.java | 3 +- .../resourcemanager/ResourceManagerStatus.java | 3 +- .../resourcemanager/ResourceStatusHandler.java | 3 +- .../common/driver/task/RunningTaskImpl.java | 6 +- .../common/driver/task/TaskRepresenter.java | 3 +- .../evaluator/context/ContextRuntime.java | 6 +- .../evaluator/context/RootContextLauncher.java | 12 ++- .../defaults/DefaultContextStartHandler.java | 3 +- .../evaluator/task/TaskLifeCycleHandlers.java | 6 +- .../common/evaluator/task/TaskRuntime.java | 21 +++-- .../common/evaluator/task/TaskStatus.java | 3 +- .../launch/parameters/ErrorHandlerRID.java | 3 +- .../common/parameters/DeleteTempFiles.java | 3 +- .../runtime/common/utils/DispatchingEStage.java | 3 +- .../org/apache/reef/task/TaskMessageSource.java | 5 +- .../java/org/apache/reef/util/DeadlockInfo.java | 9 ++- .../org/apache/reef/util/logging/LogParser.java | 11 ++- .../reef/util/logging/LoggingScopeFactory.java | 15 ++-- .../src/main/resources/checkstyle.xml | 1 - .../apache/reef/examples/helloCLR/HelloCLR.java | 4 +- .../reef/examples/helloCLR/HelloDriver.java | 7 +- .../reef/examples/group/bgd/MasterTask.java | 3 +- .../reef/examples/group/bgd/SlaveTask.java | 3 +- .../group/bgd/parameters/LossFunctionType.java | 3 +- .../reef/examples/hello/HelloREEFMesos.java | 3 +- .../reef/examples/hello/HelloREEFYarn.java | 3 +- .../reef/examples/hello/HelloReefYarnTcp.java | 3 +- .../reef/examples/hellohttp/HelloREEFHttp.java | 6 +- .../hellohttp/HttpServerShellCmdtHandler.java | 7 +- .../examples/hellohttp/HttpShellJobDriver.java | 6 +- .../reef/examples/scheduler/Scheduler.java | 6 +- .../reef/io/data/loading/api/DataLoader.java | 6 +- .../loading/api/DataLoadingRequestBuilder.java | 12 ++- .../network/exception/ParentDeadException.java | 3 +- .../group/api/task/GroupCommNetworkHandler.java | 3 +- .../group/impl/GroupCommunicationMessage.java | 3 +- .../driver/CommunicationGroupDriverImpl.java | 75 +++++++++++------- .../network/group/impl/driver/FlatTopology.java | 9 ++- .../group/impl/driver/GroupCommDriverImpl.java | 11 ++- .../network/group/impl/driver/TaskNodeImpl.java | 64 +++++++++++----- .../group/impl/driver/TaskNodeStatusImpl.java | 6 +- .../impl/driver/TopologyUpdateWaitHandler.java | 9 ++- .../network/group/impl/driver/TreeTopology.java | 6 +- .../impl/task/CommGroupNetworkHandlerImpl.java | 12 ++- .../impl/task/CommunicationGroupClientImpl.java | 9 ++- .../group/impl/task/GroupCommClientImpl.java | 3 +- .../impl/task/GroupCommNetworkHandlerImpl.java | 3 +- .../group/impl/task/OperatorTopologyImpl.java | 43 +++++++---- .../impl/task/OperatorTopologyStructImpl.java | 41 +++++----- .../group/impl/utils/ConcurrentCountingMap.java | 3 +- .../reef/io/network/group/impl/utils/Utils.java | 4 +- .../reef/io/network/impl/NetworkService.java | 7 +- .../network/impl/NetworkServiceParameters.java | 6 +- .../reef/io/network/naming/NameClient.java | 3 +- .../io/network/naming/NameLookupClient.java | 3 +- .../io/network/naming/NameRegistryClient.java | 3 +- .../reef/io/network/naming/NameServerImpl.java | 3 +- .../io/network/naming/NamingCodecFactory.java | 6 +- .../NamingRegisterRequestCodec.java | 3 +- .../reef/poison/params/CrashProbability.java | 3 +- .../apache/reef/poison/params/CrashTimeout.java | 3 +- .../reef/runtime/hdinsight/cli/HDICLI.java | 12 ++- .../reef/runtime/hdinsight/cli/LogFetcher.java | 9 ++- .../runtime/hdinsight/cli/LogFileEntry.java | 3 +- .../client/HDInsightJobSubmissionHandler.java | 3 +- .../hdinsight/client/yarnrest/Constants.java | 3 +- .../client/yarnrest/HDInsightInstance.java | 3 +- .../local/client/LocalRuntimeConfiguration.java | 6 +- .../parameters/MaxNumberOfEvaluators.java | 3 +- .../local/client/parameters/RackNames.java | 3 +- .../runtime/local/process/RunnableProcess.java | 3 +- .../mesos/client/MesosJobSubmissionHandler.java | 3 +- .../runtime/mesos/driver/REEFEventHandlers.java | 12 ++- .../runtime/mesos/driver/REEFScheduler.java | 9 ++- .../runtime/mesos/evaluator/REEFExecutor.java | 3 +- .../runtime/yarn/YarnClasspathProvider.java | 19 +++-- .../yarn/client/YarnJobSubmissionHandler.java | 8 +- .../yarn/client/YarnSubmissionHelper.java | 3 +- .../JobSubmissionDirectoryProviderImpl.java | 3 +- .../runtime/yarn/driver/REEFEventHandlers.java | 12 ++- .../yarn/driver/YARNResourceLaunchHandler.java | 6 +- .../yarn/driver/YarnContainerManager.java | 44 +++++++---- .../yarn/driver/YarnResourceRequestHandler.java | 3 +- .../reef/runtime/yarn/util/YarnTypes.java | 3 +- .../main/java/org/apache/reef/tang/Aspect.java | 3 +- .../org/apache/reef/tang/Configuration.java | 12 ++- .../apache/reef/tang/ConfigurationBuilder.java | 3 +- .../reef/tang/JavaConfigurationBuilder.java | 6 +- .../main/java/org/apache/reef/tang/Tang.java | 10 ++- .../exceptions/NameResolutionException.java | 5 +- .../formats/AvroConfigurationSerializer.java | 15 ++-- .../reef/tang/formats/ConfigurationModule.java | 12 ++- .../formats/ConfigurationModuleBuilder.java | 24 ++++-- .../tang/formats/ConfigurationSerializer.java | 6 +- .../reef/tang/formats/ParameterParser.java | 6 +- .../ConfigurationBuilderImpl.java | 16 ++-- .../reef/tang/implementation/TangImpl.java | 7 +- .../implementation/java/ClassHierarchyImpl.java | 12 ++- .../tang/implementation/java/InjectorImpl.java | 22 ++++-- .../java/JavaConfigurationBuilderImpl.java | 16 ++-- .../implementation/java/JavaNodeFactory.java | 22 ++++-- .../protobuf/ProtocolBufferClassHierarchy.java | 10 ++- .../types/NamedParameterNodeImpl.java | 3 +- .../reef/tang/util/ReflectionUtilities.java | 3 +- .../java/org/apache/reef/tang/util/Tint.java | 45 ++++++----- .../reef/tang/util/ValidateConfiguration.java | 3 +- .../reef/wake/examples/p2p/Pull2Push.java | 3 +- .../wake/impl/DefaultIdentifierFactory.java | 3 +- .../IndependentIterationsThreadPoolStage.java | 3 +- .../apache/reef/wake/impl/WakeSharedPool.java | 17 +++-- .../apache/reef/wake/profiler/WakeProfiler.java | 12 ++- .../reef/wake/remote/RemoteConfiguration.java | 3 +- .../apache/reef/wake/remote/RemoteManager.java | 7 +- .../reef/wake/remote/RemoteManagerFactory.java | 12 ++- .../address/LegacyLocalAddressProvider.java | 3 +- .../DefaultRemoteManagerImplementation.java | 6 +- .../reef/wake/remote/impl/HandlerContainer.java | 3 +- .../reef/wake/remote/impl/MultiCodec.java | 6 +- .../remote/impl/OrderedRemoteReceiverStage.java | 17 +++-- .../wake/remote/impl/ProxyEventHandler.java | 6 +- .../wake/remote/impl/RemoteEventDecoder.java | 3 +- .../remote/impl/RemoteSenderEventHandler.java | 3 +- .../reef/wake/remote/transport/Transport.java | 3 +- .../netty/ChunkedReadWriteHandler.java | 18 +++-- .../netty/NettyMessagingTransport.java | 9 ++- .../reef/wake/time/runtime/RuntimeClock.java | 6 +- .../reef/webserver/EvaluatorListSerializer.java | 4 +- .../org/apache/reef/webserver/HttpHandler.java | 3 +- .../apache/reef/webserver/HttpServerImpl.java | 3 +- .../webserver/HttpServerReefEventHandler.java | 19 +++-- .../org/apache/reef/webserver/JettyHandler.java | 9 ++- .../reef/webserver/ReefEventStateManager.java | 3 +- 183 files changed, 1052 insertions(+), 538 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-bridge-client/src/main/java/org/apache/reef/bridge/client/Constants.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-bridge-client/src/main/java/org/apache/reef/bridge/client/Constants.java b/lang/java/reef-bridge-client/src/main/java/org/apache/reef/bridge/client/Constants.java index 8679c20..7bd9c1d 100644 --- a/lang/java/reef-bridge-client/src/main/java/org/apache/reef/bridge/client/Constants.java +++ b/lang/java/reef-bridge-client/src/main/java/org/apache/reef/bridge/client/Constants.java @@ -64,11 +64,14 @@ public final class Constants { .set(HttpHandlerConfiguration.HTTP_HANDLERS, HttpServerReefEventHandler.class) .build(), 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_DRIVER_RESTART_CONTEXT_ACTIVE, ReefEventStateManager.DrivrRestartActiveContextStateHandler.class) + .set(DriverServiceConfiguration.ON_DRIVER_RESTART_CONTEXT_ACTIVE, + ReefEventStateManager.DrivrRestartActiveContextStateHandler.class) .set(DriverServiceConfiguration.ON_TASK_RUNNING, ReefEventStateManager.TaskRunningStateHandler.class) - .set(DriverServiceConfiguration.ON_DRIVER_RESTART_TASK_RUNNING, ReefEventStateManager.DriverRestartTaskRunningStateHandler.class) + .set(DriverServiceConfiguration.ON_DRIVER_RESTART_TASK_RUNNING, + ReefEventStateManager.DriverRestartTaskRunningStateHandler.class) .set(DriverServiceConfiguration.ON_DRIVER_STARTED, ReefEventStateManager.StartStateHandler.class) .set(DriverServiceConfiguration.ON_DRIVER_STOP, ReefEventStateManager.StopStateHandler.class) .build() http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-bridge-client/src/main/java/org/apache/reef/bridge/client/LocalClient.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-bridge-client/src/main/java/org/apache/reef/bridge/client/LocalClient.java b/lang/java/reef-bridge-client/src/main/java/org/apache/reef/bridge/client/LocalClient.java index d599542..2d72965 100644 --- a/lang/java/reef-bridge-client/src/main/java/org/apache/reef/bridge/client/LocalClient.java +++ b/lang/java/reef-bridge-client/src/main/java/org/apache/reef/bridge/client/LocalClient.java @@ -55,7 +55,8 @@ public class LocalClient { final PreparedDriverFolderLauncher launcher, final REEFFileNames fileNames, final DriverConfigurationProvider driverConfigurationProvider, - @Parameter(DriverConfigurationProviders.class) final Set<ConfigurationProvider> configurationProviders) { + @Parameter(DriverConfigurationProviders.class) + final Set<ConfigurationProvider> configurationProviders) { this.configurationSerializer = configurationSerializer; this.launcher = launcher; this.fileNames = fileNames; @@ -74,7 +75,8 @@ public class LocalClient { } final Configuration driverConfiguration1 = driverConfigurationProvider - .getDriverConfiguration(jobFolder, CLIENT_REMOTE_ID, jobId, Constants.DRIVER_CONFIGURATION_WITH_HTTP_AND_NAMESERVER); + .getDriverConfiguration(jobFolder, CLIENT_REMOTE_ID, jobId, + Constants.DRIVER_CONFIGURATION_WITH_HTTP_AND_NAMESERVER); final ConfigurationBuilder configurationBuilder = Tang.Factory.getTang().newConfigurationBuilder(); for (final ConfigurationProvider configurationProvider : this.configurationProviders) { configurationBuilder.addConfiguration(configurationProvider.getConfiguration()); @@ -104,7 +106,8 @@ public class LocalClient { final int tcpTryCount = Integer.valueOf(args[5]); - final Configuration runtimeConfiguration = getRuntimeConfiguration(numberOfEvaluators, runtimeRootFolder, tcpBeginPort, tcpRangeCount, tcpTryCount); + final Configuration runtimeConfiguration = getRuntimeConfiguration(numberOfEvaluators, runtimeRootFolder, + tcpBeginPort, tcpRangeCount, tcpTryCount); final LocalClient client = Tang.Factory.getTang() .newInjector(runtimeConfiguration) http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-bridge-client/src/main/java/org/apache/reef/bridge/client/YarnJobSubmissionClient.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-bridge-client/src/main/java/org/apache/reef/bridge/client/YarnJobSubmissionClient.java b/lang/java/reef-bridge-client/src/main/java/org/apache/reef/bridge/client/YarnJobSubmissionClient.java index 6f9b922..7ab512d 100644 --- a/lang/java/reef-bridge-client/src/main/java/org/apache/reef/bridge/client/YarnJobSubmissionClient.java +++ b/lang/java/reef-bridge-client/src/main/java/org/apache/reef/bridge/client/YarnJobSubmissionClient.java @@ -72,7 +72,8 @@ public final class YarnJobSubmissionClient { this.classpath = classpath; } - private void addJVMConfiguration(final File driverFolder, final String jobId, final String jobSubmissionFolder) throws IOException { + private void addJVMConfiguration(final File driverFolder, final String jobId, final String jobSubmissionFolder) + throws IOException { final File driverConfigurationFile = new File(driverFolder, this.fileNames.getDriverConfigurationPath()); final Configuration driverConfiguration = Configurations.merge( Constants.DRIVER_CONFIGURATION_WITH_HTTP_AND_NAMESERVER, http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/AllocatedEvaluatorBridge.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/AllocatedEvaluatorBridge.java b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/AllocatedEvaluatorBridge.java index 8d6c441..8417d10 100644 --- a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/AllocatedEvaluatorBridge.java +++ b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/AllocatedEvaluatorBridge.java @@ -44,7 +44,8 @@ public class AllocatedEvaluatorBridge extends NativeBridge { nameServerInfo = serverInfo; } - public void submitContextAndTaskString(final String contextConfigurationString, final String taskConfigurationString) { + public void submitContextAndTaskString(final String contextConfigurationString, + final String taskConfigurationString) { if (contextConfigurationString.isEmpty()) { throw new RuntimeException("empty contextConfigurationString provided."); } @@ -79,7 +80,8 @@ public class AllocatedEvaluatorBridge extends NativeBridge { jallocatedEvaluator.submitContext(contextConfiguration); } - public void submitContextAndServiceString(final String contextConfigurationString, final String serviceConfigurationString) { + public void submitContextAndServiceString(final String contextConfigurationString, + final String serviceConfigurationString) { if (contextConfigurationString.isEmpty()) { throw new RuntimeException("empty contextConfigurationString provided."); } @@ -121,7 +123,8 @@ public class AllocatedEvaluatorBridge extends NativeBridge { servicetConfiguration = serializer.fromString(serviceConfigurationString, clrClassHierarchy); taskConfiguration = serializer.fromString(taskConfigurationString, clrClassHierarchy); } catch (final Exception e) { - final String message = "Unable to de-serialize CLR context or service or task configurations using class hierarchy."; + final String message = + "Unable to de-serialize CLR context or service or task configurations using class hierarchy."; LOG.log(Level.SEVERE, message, e); throw new RuntimeException(message, e); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/ClosedContextBridge.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/ClosedContextBridge.java b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/ClosedContextBridge.java index 65a7c8a..6aeaf53 100644 --- a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/ClosedContextBridge.java +++ b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/ClosedContextBridge.java @@ -36,7 +36,8 @@ public class ClosedContextBridge extends NativeBridge implements ClosedContext { private final String evaluatorId; private final EvaluatorDescriptor evaluatorDescriptor; - public ClosedContextBridge(final ClosedContext closedContext, final ActiveContextBridgeFactory activeContextBridgeFactory) { + public ClosedContextBridge(final ClosedContext closedContext, + final ActiveContextBridgeFactory activeContextBridgeFactory) { jcloseContext = closedContext; parentContext = activeContextBridgeFactory.getActiveContextBridge(closedContext.getParentContext()); contextId = closedContext.getId(); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/EvaluatorRequestorBridge.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/EvaluatorRequestorBridge.java b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/EvaluatorRequestorBridge.java index 779c936..42b6e57 100644 --- a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/EvaluatorRequestorBridge.java +++ b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/EvaluatorRequestorBridge.java @@ -36,7 +36,9 @@ public final class EvaluatorRequestorBridge extends NativeBridge { // of EvaluatorRequestorBridge private int clrEvaluatorsNumber; - public EvaluatorRequestorBridge(final EvaluatorRequestor evaluatorRequestor, final boolean isBlocked, final LoggingScopeFactory loggingScopeFactory) { + public EvaluatorRequestorBridge(final EvaluatorRequestor evaluatorRequestor, + final boolean isBlocked, + final LoggingScopeFactory loggingScopeFactory) { this.jevaluatorRequestor = evaluatorRequestor; this.clrEvaluatorsNumber = 0; this.isBlocked = isBlocked; @@ -45,7 +47,8 @@ public final class EvaluatorRequestorBridge extends NativeBridge { public void submit(final int evaluatorsNumber, final int memory, final int virtualCore, final String rack) { if (this.isBlocked) { - throw new RuntimeException("Cannot request additional Evaluator, this is probably because the Driver has crashed and restarted, and cannot ask for new container due to YARN-2433."); + throw new RuntimeException("Cannot request additional Evaluator, this is probably because " + + "the Driver has crashed and restarted, and cannot ask for new container due to YARN-2433."); } if (rack != null && !rack.isEmpty()) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/FailedEvaluatorBridge.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/FailedEvaluatorBridge.java b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/FailedEvaluatorBridge.java index 7ee9ee7..898f670 100644 --- a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/FailedEvaluatorBridge.java +++ b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/FailedEvaluatorBridge.java @@ -30,10 +30,12 @@ public class FailedEvaluatorBridge extends NativeBridge { private EvaluatorRequestorBridge evaluatorRequestorBridge; private String evaluatorId; - public FailedEvaluatorBridge(FailedEvaluator failedEvaluator, EvaluatorRequestor evaluatorRequestor, boolean blockedForAdditionalEvaluator, final LoggingScopeFactory loggingScopeFactory) { + public FailedEvaluatorBridge(FailedEvaluator failedEvaluator, EvaluatorRequestor evaluatorRequestor, + boolean blockedForAdditionalEvaluator, final LoggingScopeFactory loggingScopeFactory) { jfailedEvaluator = failedEvaluator; evaluatorId = failedEvaluator.getId(); - evaluatorRequestorBridge = new EvaluatorRequestorBridge(evaluatorRequestor, blockedForAdditionalEvaluator, loggingScopeFactory); + evaluatorRequestorBridge = + new EvaluatorRequestorBridge(evaluatorRequestor, blockedForAdditionalEvaluator, loggingScopeFactory); } public int getNewlyRequestedEvaluatorNumber() { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/FailedTaskBridge.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/FailedTaskBridge.java b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/FailedTaskBridge.java index 4d58b06..8ee081b 100644 --- a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/FailedTaskBridge.java +++ b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/FailedTaskBridge.java @@ -39,9 +39,12 @@ public final class FailedTaskBridge extends NativeBridge { } public String getFailedTaskString() { - final String description = jfailedTask.getDescription().isPresent() ? jfailedTask.getDescription().get().replace("=", "").replace(",", "") : ""; - final String cause = jfailedTask.getReason().isPresent() ? jfailedTask.getReason().get().toString().replace("=", "").replace(",", "") : ""; - final String data = jfailedTask.getData().isPresent() ? new String(jfailedTask.getData().get()).replace("=", "").replace(",", "") : ""; + final String description = jfailedTask.getDescription().isPresent() ? + jfailedTask.getDescription().get().replace("=", "").replace(",", "") : ""; + final String cause = jfailedTask.getReason().isPresent() ? + jfailedTask.getReason().get().toString().replace("=", "").replace(",", "") : ""; + final String data = jfailedTask.getData().isPresent() ? + new String(jfailedTask.getData().get()).replace("=", "").replace(",", "") : ""; // TODO: deserialize/serialize with proper Avro schema final String poorSerializedString = "Identifier=" + jfailedTask.getId().replace("=", "").replace(",", "") http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/SuspendedTaskBridge.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/SuspendedTaskBridge.java b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/SuspendedTaskBridge.java index 27b4a11..7cca512 100644 --- a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/SuspendedTaskBridge.java +++ b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/SuspendedTaskBridge.java @@ -28,7 +28,8 @@ public final class SuspendedTaskBridge extends NativeBridge implements Identifia private final String taskId; private final ActiveContextBridge jactiveContext; - public SuspendedTaskBridge(final SuspendedTask suspendedTask, final ActiveContextBridgeFactory activeContextBridgeFactory) { + public SuspendedTaskBridge(final SuspendedTask suspendedTask, + final ActiveContextBridgeFactory activeContextBridgeFactory) { jsuspendedTask = suspendedTask; taskId = suspendedTask.getId(); jactiveContext = activeContextBridgeFactory.getActiveContextBridge(jsuspendedTask.getActiveContext()); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/Utilities.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/Utilities.java b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/Utilities.java index 74c1549..2578cf2 100644 --- a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/Utilities.java +++ b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/Utilities.java @@ -54,7 +54,9 @@ public final class Utilities { public static String getEvaluatorDescriptorString(EvaluatorDescriptor evaluatorDescriptor) { InetSocketAddress socketAddress = evaluatorDescriptor.getNodeDescriptor().getInetSocketAddress(); - return "IP=" + socketAddress.getAddress() + ", Port=" + socketAddress.getPort() + ", HostName=" + socketAddress.getHostName() + ", Memory=" + evaluatorDescriptor.getMemory() + ", Core=" + evaluatorDescriptor.getNumberOfCores(); + return "IP=" + socketAddress.getAddress() + ", Port=" + socketAddress.getPort() + ", HostName=" + + socketAddress.getHostName() + ", Memory=" + evaluatorDescriptor.getMemory() + ", Core=" + + evaluatorDescriptor.getNumberOfCores(); } /** http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobClient.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobClient.java b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobClient.java index 02c0895..7c91742 100644 --- a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobClient.java +++ b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobClient.java @@ -136,11 +136,14 @@ public class JobClient { .build(); 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_DRIVER_RESTART_CONTEXT_ACTIVE, ReefEventStateManager.DrivrRestartActiveContextStateHandler.class) + .set(DriverServiceConfiguration.ON_DRIVER_RESTART_CONTEXT_ACTIVE, + ReefEventStateManager.DrivrRestartActiveContextStateHandler.class) .set(DriverServiceConfiguration.ON_TASK_RUNNING, ReefEventStateManager.TaskRunningStateHandler.class) - .set(DriverServiceConfiguration.ON_DRIVER_RESTART_TASK_RUNNING, ReefEventStateManager.DriverRestartTaskRunningStateHandler.class) + .set(DriverServiceConfiguration.ON_DRIVER_RESTART_TASK_RUNNING, + ReefEventStateManager.DriverRestartTaskRunningStateHandler.class) .set(DriverServiceConfiguration.ON_DRIVER_STARTED, ReefEventStateManager.StartStateHandler.class) .set(DriverServiceConfiguration.ON_DRIVER_STOP, ReefEventStateManager.StopStateHandler.class) .build(); @@ -165,7 +168,8 @@ public class JobClient { Path globalLibFile = Paths.get(NativeInterop.GLOBAL_LIBRARIES_FILENAME); if (!Files.exists(globalLibFile)) { - LOG.log(Level.FINE, "Cannot find global classpath file at: {0}, assume there is none.", globalLibFile.toAbsolutePath()); + LOG.log(Level.FINE, "Cannot find global classpath file at: {0}, assume there is none.", + globalLibFile.toAbsolutePath()); } else { String globalLibString = ""; try { @@ -180,7 +184,8 @@ public class JobClient { } } - this.driverConfiguration = Configurations.merge(this.driverConfigModule.build(), getHTTPConfiguration(), getNameServerConfiguration()); + this.driverConfiguration = Configurations.merge(this.driverConfigModule.build(), getHTTPConfiguration(), + getNameServerConfiguration()); } } @@ -201,7 +206,8 @@ public class JobClient { } else { File driverConfig = new File(System.getProperty("user.dir") + "/driver.config"); try { - new AvroConfigurationSerializer().toFile(Configurations.merge(this.driverConfiguration, clientConfig), driverConfig); + new AvroConfigurationSerializer().toFile(Configurations.merge(this.driverConfiguration, clientConfig), + driverConfig); LOG.log(Level.INFO, "Driver configuration file created at " + driverConfig.getAbsolutePath()); } catch (final IOException e) { throw new RuntimeException("Cannot create driver configuration file at " + driverConfig.getAbsolutePath()); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobDriver.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobDriver.java b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobDriver.java index 315c195..ca8fcb9 100644 --- a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobDriver.java +++ b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/JobDriver.java @@ -192,8 +192,10 @@ public final class JobDriver { LOG.log(Level.INFO, "StartTime: {0}", new Object[]{startTime}); String portNumber = httpServer == null ? null : Integer.toString((httpServer.getPort())); - EvaluatorRequestorBridge evaluatorRequestorBridge = new EvaluatorRequestorBridge(JobDriver.this.evaluatorRequestor, false, loggingScopeFactory); - long[] handlers = NativeInterop.CallClrSystemOnStartHandler(startTime.toString(), portNumber, evaluatorRequestorBridge); + EvaluatorRequestorBridge evaluatorRequestorBridge = + new EvaluatorRequestorBridge(JobDriver.this.evaluatorRequestor, false, loggingScopeFactory); + long[] handlers = + NativeInterop.CallClrSystemOnStartHandler(startTime.toString(), portNumber, evaluatorRequestorBridge); if (handlers != null) { if (handlers.length != NativeInterop.nHandlers) { throw new RuntimeException( @@ -215,13 +217,17 @@ public final class JobDriver { this.failedContextHandler = handlers[NativeInterop.Handlers.get(NativeInterop.FailedContextKey)]; this.contextMessageHandler = handlers[NativeInterop.Handlers.get(NativeInterop.ContextMessageKey)]; this.driverRestartHandler = handlers[NativeInterop.Handlers.get(NativeInterop.DriverRestartKey)]; - this.driverRestartActiveContextHandler = handlers[NativeInterop.Handlers.get(NativeInterop.DriverRestartActiveContextKey)]; - this.driverRestartRunningTaskHandler = handlers[NativeInterop.Handlers.get(NativeInterop.DriverRestartRunningTaskKey)]; + this.driverRestartActiveContextHandler = + handlers[NativeInterop.Handlers.get(NativeInterop.DriverRestartActiveContextKey)]; + this.driverRestartRunningTaskHandler = + handlers[NativeInterop.Handlers.get(NativeInterop.DriverRestartRunningTaskKey)]; } - try (final LoggingScope lp = this.loggingScopeFactory.getNewLoggingScope("setupBridge::ClrSystemHttpServerHandlerOnNext")) { + try (final LoggingScope lp = + this.loggingScopeFactory.getNewLoggingScope("setupBridge::ClrSystemHttpServerHandlerOnNext")) { final HttpServerEventBridge httpServerEventBridge = new HttpServerEventBridge("SPEC"); - NativeInterop.ClrSystemHttpServerHandlerOnNext(this.httpServerEventHandler, httpServerEventBridge, this.interopLogger); + NativeInterop.ClrSystemHttpServerHandlerOnNext(this.httpServerEventHandler, httpServerEventBridge, + this.interopLogger); final String specList = httpServerEventBridge.getUriSpecification(); LOG.log(Level.INFO, "Starting http server, getUriSpecification: {0}", specList); if (specList != null) { @@ -255,8 +261,10 @@ public final class JobDriver { if (JobDriver.this.allocatedEvaluatorHandler == 0) { throw new RuntimeException("Allocated Evaluator Handler not initialized by CLR."); } - AllocatedEvaluatorBridge allocatedEvaluatorBridge = new AllocatedEvaluatorBridge(eval, JobDriver.this.nameServerInfo); - NativeInterop.ClrSystemAllocatedEvaluatorHandlerOnNext(JobDriver.this.allocatedEvaluatorHandler, allocatedEvaluatorBridge, this.interopLogger); + AllocatedEvaluatorBridge allocatedEvaluatorBridge = + new AllocatedEvaluatorBridge(eval, JobDriver.this.nameServerInfo); + NativeInterop.ClrSystemAllocatedEvaluatorHandlerOnNext(JobDriver.this.allocatedEvaluatorHandler, + allocatedEvaluatorBridge, this.interopLogger); } } @@ -270,7 +278,8 @@ public final class JobDriver { throw new RuntimeException("Active Context Handler not initialized by CLR."); } ActiveContextBridge activeContextBridge = activeContextBridgeFactory.getActiveContextBridge(context); - NativeInterop.ClrSystemActiveContextHandlerOnNext(JobDriver.this.activeContextHandler, activeContextBridge, JobDriver.this.interopLogger); + NativeInterop.ClrSystemActiveContextHandlerOnNext(JobDriver.this.activeContextHandler, activeContextBridge, + JobDriver.this.interopLogger); } catch (final Exception ex) { LOG.log(Level.SEVERE, "Fail to submit task to active context"); context.close(); @@ -332,7 +341,8 @@ public final class JobDriver { } else { LOG.log(Level.INFO, "CLR CompletedTaskHandler handler set, handling things with CLR handler."); CompletedTaskBridge completedTaskBridge = new CompletedTaskBridge(task, activeContextBridgeFactory); - NativeInterop.ClrSystemCompletedTaskHandlerOnNext(JobDriver.this.completedTaskHandler, completedTaskBridge, JobDriver.this.interopLogger); + NativeInterop.ClrSystemCompletedTaskHandlerOnNext(JobDriver.this.completedTaskHandler, completedTaskBridge, + JobDriver.this.interopLogger); } } } @@ -385,11 +395,14 @@ public final class JobDriver { private void handleFailedEvaluatorInCLR(final FailedEvaluator eval) { final String message = "CLR FailedEvaluator handler set, handling things with CLR handler."; LOG.log(Level.INFO, message); - FailedEvaluatorBridge failedEvaluatorBridge = new FailedEvaluatorBridge(eval, JobDriver.this.evaluatorRequestor, JobDriver.this.isRestarted, loggingScopeFactory); - NativeInterop.ClrSystemFailedEvaluatorHandlerOnNext(JobDriver.this.failedEvaluatorHandler, failedEvaluatorBridge, JobDriver.this.interopLogger); + FailedEvaluatorBridge failedEvaluatorBridge = new FailedEvaluatorBridge(eval, JobDriver.this.evaluatorRequestor, + JobDriver.this.isRestarted, loggingScopeFactory); + NativeInterop.ClrSystemFailedEvaluatorHandlerOnNext(JobDriver.this.failedEvaluatorHandler, failedEvaluatorBridge, + JobDriver.this.interopLogger); int additionalRequestedEvaluatorNumber = failedEvaluatorBridge.getNewlyRequestedEvaluatorNumber(); if (additionalRequestedEvaluatorNumber > 0) { - LOG.log(Level.INFO, "number of additional evaluators requested after evaluator failure: " + additionalRequestedEvaluatorNumber); + LOG.log(Level.INFO, "number of additional evaluators requested after evaluator failure: " + + additionalRequestedEvaluatorNumber); } JobDriver.this.jobMessageObserver.sendMessageToClient(message.getBytes()); } @@ -414,7 +427,8 @@ public final class JobDriver { * process http request. */ @Override - public void onHttpRequest(final ParsedHttpRequest parsedHttpRequest, final HttpServletResponse response) throws IOException, ServletException { + public void onHttpRequest(final ParsedHttpRequest parsedHttpRequest, final HttpServletResponse response) + throws IOException, ServletException { LOG.log(Level.INFO, "HttpServerBridgeEventHandler onHttpRequest: {0}", parsedHttpRequest.getRequestUri()); try (final LoggingScope ls = loggingScopeFactory.httpRequest(parsedHttpRequest.getRequestUri())) { final AvroHttpSerializer httpSerializer = new AvroHttpSerializer(); @@ -426,7 +440,8 @@ public final class JobDriver { try { final HttpServerEventBridge httpServerEventBridge = new HttpServerEventBridge(requestBytes); - NativeInterop.ClrSystemHttpServerHandlerOnNext(JobDriver.this.httpServerEventHandler, httpServerEventBridge, JobDriver.this.interopLogger); + NativeInterop.ClrSystemHttpServerHandlerOnNext(JobDriver.this.httpServerEventHandler, httpServerEventBridge, + JobDriver.this.interopLogger); final String responseBody = new String(httpServerEventBridge.getQueryResponseData(), "UTF-8"); response.getWriter().println(responseBody); LOG.log(Level.INFO, "HttpServerBridgeEventHandler onHttpRequest received response: {0}", responseBody); @@ -451,7 +466,8 @@ public final class JobDriver { } try { FailedTaskBridge failedTaskBridge = new FailedTaskBridge(task, activeContextBridgeFactory); - NativeInterop.ClrSystemFailedTaskHandlerOnNext(JobDriver.this.failedTaskHandler, failedTaskBridge, JobDriver.this.interopLogger); + NativeInterop.ClrSystemFailedTaskHandlerOnNext(JobDriver.this.failedTaskHandler, failedTaskBridge, + JobDriver.this.interopLogger); } catch (final Exception ex) { LOG.log(Level.SEVERE, "Fail to invoke CLR failed task handler"); throw new RuntimeException(ex); @@ -472,7 +488,8 @@ public final class JobDriver { LOG.log(Level.INFO, "RunningTask will be handled by CLR handler. Task Id: {0}", task.getId()); try { final RunningTaskBridge runningTaskBridge = new RunningTaskBridge(task, activeContextBridgeFactory); - NativeInterop.ClrSystemRunningTaskHandlerOnNext(JobDriver.this.runningTaskHandler, runningTaskBridge, JobDriver.this.interopLogger); + NativeInterop.ClrSystemRunningTaskHandlerOnNext(JobDriver.this.runningTaskHandler, runningTaskBridge, + JobDriver.this.interopLogger); } catch (final Exception ex) { LOG.log(Level.WARNING, "Fail to invoke CLR running task handler"); throw new RuntimeException(ex); @@ -495,12 +512,16 @@ public final class JobDriver { if (JobDriver.this.clrBridgeSetup) { if (JobDriver.this.driverRestartRunningTaskHandler != 0) { LOG.log(Level.INFO, "CLR driver restart RunningTask handler implemented, now handle it in CLR."); - NativeInterop.ClrSystemDriverRestartRunningTaskHandlerOnNext(JobDriver.this.driverRestartRunningTaskHandler, new RunningTaskBridge(task, activeContextBridgeFactory)); + NativeInterop.ClrSystemDriverRestartRunningTaskHandlerOnNext( + JobDriver.this.driverRestartRunningTaskHandler, + new RunningTaskBridge(task, activeContextBridgeFactory)); } else { - LOG.log(Level.WARNING, "No CLR driver restart RunningTask handler implemented, done with DriverRestartRunningTaskHandler."); + LOG.log(Level.WARNING, "No CLR driver restart RunningTask handler implemented, " + + "done with DriverRestartRunningTaskHandler."); } } else { - LOG.log(Level.INFO, "Waiting for driver to complete restart process before checking out CLR driver restart RunningTaskHandler..."); + LOG.log(Level.INFO, "Waiting for driver to complete restart process " + + "before checking out CLR driver restart RunningTaskHandler..."); clock.scheduleAlarm(2000, this); } } @@ -524,12 +545,16 @@ public final class JobDriver { if (JobDriver.this.clrBridgeSetup) { if (JobDriver.this.driverRestartActiveContextHandler != 0) { LOG.log(Level.INFO, "CLR driver restart ActiveContext handler implemented, now handle it in CLR."); - NativeInterop.ClrSystemDriverRestartActiveContextHandlerOnNext(JobDriver.this.driverRestartActiveContextHandler, activeContextBridgeFactory.getActiveContextBridge(context)); + NativeInterop.ClrSystemDriverRestartActiveContextHandlerOnNext( + JobDriver.this.driverRestartActiveContextHandler, + activeContextBridgeFactory.getActiveContextBridge(context)); } else { - LOG.log(Level.WARNING, "No CLR driver restart ActiveContext handler implemented, done with DriverRestartActiveContextHandler."); + LOG.log(Level.WARNING, "No CLR driver restart ActiveContext handler implemented, " + + "done with DriverRestartActiveContextHandler."); } } else { - LOG.log(Level.INFO, "Waiting for driver to complete restart process before checking out CLR driver restart DriverRestartActiveContextHandler..."); + LOG.log(Level.INFO, "Waiting for driver to complete restart process " + + "before checking out CLR driver restart DriverRestartActiveContextHandler..."); clock.scheduleAlarm(2000, this); } } @@ -580,7 +605,8 @@ public final class JobDriver { public final class DriverRestartCompletedHandler implements EventHandler<DriverRestartCompleted> { @Override public void onNext(final DriverRestartCompleted driverRestartCompleted) { - LOG.log(Level.INFO, "Java DriverRestartCompleted event received at time [{0}]. ", driverRestartCompleted.getTimeStamp()); + LOG.log(Level.INFO, "Java DriverRestartCompleted event received at time [{0}]. ", + driverRestartCompleted.getTimeStamp()); try (final LoggingScope ls = loggingScopeFactory.driverRestartCompleted(driverRestartCompleted.getTimeStamp())) { if (JobDriver.this.driverRestartHandler != 0) { LOG.log(Level.INFO, "CLR driver restart handler implemented, now handle it in CLR."); @@ -617,7 +643,8 @@ public final class JobDriver { if (JobDriver.this.taskMessageHandler != 0) { TaskMessageBridge taskMessageBridge = new TaskMessageBridge(taskMessage); // if CLR implements the task message handler, handle the bytes in CLR handler - NativeInterop.ClrSystemTaskMessageHandlerOnNext(JobDriver.this.taskMessageHandler, taskMessage.get(), taskMessageBridge, JobDriver.this.interopLogger); + NativeInterop.ClrSystemTaskMessageHandlerOnNext(JobDriver.this.taskMessageHandler, taskMessage.get(), + taskMessageBridge, JobDriver.this.interopLogger); } //} } @@ -723,7 +750,8 @@ public final class JobDriver { ContextMessageBridge contextMessageBridge = new ContextMessageBridge(message); // if CLR implements the context message handler, handle it in CLR LOG.log(Level.INFO, "Handling the event of context message in CLR bridge."); - NativeInterop.ClrSystemContextMessageHandlerOnNext(JobDriver.this.contextMessageHandler, contextMessageBridge); + NativeInterop.ClrSystemContextMessageHandlerOnNext(JobDriver.this.contextMessageHandler, + contextMessageBridge); } } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/LaunchHeadless.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/LaunchHeadless.java b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/LaunchHeadless.java index 5559020..ef3fc15 100644 --- a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/LaunchHeadless.java +++ b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/generic/LaunchHeadless.java @@ -83,7 +83,8 @@ public final class LaunchHeadless { } driverConfigModule = result; - Configuration driverConfiguration = Configurations.merge(driverConfigModule.build(), JobClient.getHTTPConfiguration()); + Configuration driverConfiguration = + Configurations.merge(driverConfigModule.build(), JobClient.getHTTPConfiguration()); LOG.log(Level.INFO, "Running on YARN"); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/client/DriverConfiguration.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/client/DriverConfiguration.java b/lang/java/reef-common/src/main/java/org/apache/reef/client/DriverConfiguration.java index a5df237..40bdbd3 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/client/DriverConfiguration.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/client/DriverConfiguration.java @@ -200,7 +200,8 @@ public final class DriverConfiguration extends ConfigurationModuleBuilder { /** * Event handler for the event of driver restart completion, default to logging if not bound. */ - public static final OptionalImpl<EventHandler<DriverRestartCompleted>> ON_DRIVER_RESTART_COMPLETED = new OptionalImpl<>(); + public static final OptionalImpl<EventHandler<DriverRestartCompleted>> ON_DRIVER_RESTART_COMPLETED = + new OptionalImpl<>(); /** * ConfigurationModule to fill out to get a legal Driver Configuration. http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/client/FailedRuntime.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/client/FailedRuntime.java b/lang/java/reef-common/src/main/java/org/apache/reef/client/FailedRuntime.java index c7f7f9a..4f8de7a 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/client/FailedRuntime.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/client/FailedRuntime.java @@ -47,7 +47,8 @@ public final class FailedRuntime extends AbstractFailure { * @param error Error message as a protocol buffers object. */ public FailedRuntime(final RuntimeErrorProto error) { - super(error.getIdentifier(), error.getMessage(), Optional.<String>empty(), Optional.of(getThrowable(error)), Optional.<byte[]>empty()); + super(error.getIdentifier(), error.getMessage(), Optional.<String>empty(), Optional.of(getThrowable(error)), + Optional.<byte[]>empty()); } /** http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/driver/PreemptionEvent.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/driver/PreemptionEvent.java b/lang/java/reef-common/src/main/java/org/apache/reef/driver/PreemptionEvent.java index a536827..81bfa71 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/driver/PreemptionEvent.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/driver/PreemptionEvent.java @@ -41,7 +41,8 @@ public interface PreemptionEvent { /** * @return the Set of RunningEvaluators that the underlying resource manager is about to take away from the Driver. */ - // TODO: We need to have a set of things to present to the user as preempted. Probably a Set<String> with the Evaluator IDs. + // TODO: We need to have a set of things to present to the user as preempted. + // Probably a Set<String> with the Evaluator IDs. // public Set<RunningEvaluator> getToBePreemptedEvaluators(); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/DriverJobSubmissionDirectory.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/DriverJobSubmissionDirectory.java b/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/DriverJobSubmissionDirectory.java index fa975d0..b4348f2 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/DriverJobSubmissionDirectory.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/DriverJobSubmissionDirectory.java @@ -24,7 +24,9 @@ import org.apache.reef.tang.annotations.NamedParameter; /** * Job submission directory. */ -@NamedParameter(doc = "Job submission directory. This is the folder on the DFS used to stage the files for the Driver and subsequently for the Evaluators. It will be created if it doesn't exist yet.") +@NamedParameter(doc = "Job submission directory. " + + "This is the folder on the DFS used to stage the files for the Driver and subsequently for the Evaluators. " + + "It will be created if it doesn't exist yet.") public final class DriverJobSubmissionDirectory implements Name<String> { private DriverJobSubmissionDirectory() { } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/DriverRestartCompletedHandlers.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/DriverRestartCompletedHandlers.java b/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/DriverRestartCompletedHandlers.java index f9192cd..d65d0f5 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/DriverRestartCompletedHandlers.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/DriverRestartCompletedHandlers.java @@ -29,7 +29,8 @@ import java.util.Set; /** * Handler for event that all evaluators have checked back in after driver restart and that the restart is completed. */ -@NamedParameter(doc = "Handler for event of driver restart completion", default_classes = DefaultDriverRestartCompletedHandler.class) +@NamedParameter(doc = "Handler for event of driver restart completion", + default_classes = DefaultDriverRestartCompletedHandler.class) public final class DriverRestartCompletedHandlers implements Name<Set<EventHandler<DriverRestartCompleted>>> { private DriverRestartCompletedHandlers() { } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/DriverRestartContextActiveHandlers.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/DriverRestartContextActiveHandlers.java b/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/DriverRestartContextActiveHandlers.java index b127036..f6a0591 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/DriverRestartContextActiveHandlers.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/DriverRestartContextActiveHandlers.java @@ -29,7 +29,8 @@ import java.util.Set; /** * Handler for ActiveContext during a driver restart. */ -@NamedParameter(doc = "Handler for ActiveContext received during a driver restart", default_classes = DefaultDriverRestartContextActiveHandler.class) +@NamedParameter(doc = "Handler for ActiveContext received during a driver restart", + default_classes = DefaultDriverRestartContextActiveHandler.class) public final class DriverRestartContextActiveHandlers implements Name<Set<EventHandler<ActiveContext>>> { private DriverRestartContextActiveHandlers() { } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/DriverRestartHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/DriverRestartHandler.java b/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/DriverRestartHandler.java index dc4a9ed..a3021ee 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/DriverRestartHandler.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/DriverRestartHandler.java @@ -26,6 +26,7 @@ import org.apache.reef.wake.time.event.StartTime; /** * The StartTime event is routed to this EventHandler if there is a restart, instead of to DriverStartHandler. */ -@NamedParameter(doc = "The StartTime event is routed to this EventHandler if there is a restart, instead of to DriverStartHandler.") +@NamedParameter(doc = "The StartTime event is routed to this EventHandler if there is a restart, " + + "instead of to DriverStartHandler.") public final class DriverRestartHandler implements Name<EventHandler<StartTime>> { } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/DriverRestartTaskRunningHandlers.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/DriverRestartTaskRunningHandlers.java b/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/DriverRestartTaskRunningHandlers.java index 409eff1..30d39ae 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/DriverRestartTaskRunningHandlers.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/DriverRestartTaskRunningHandlers.java @@ -29,7 +29,8 @@ import java.util.Set; /** * Handler for RunningTask events during a Driver restart. */ -@NamedParameter(doc = "Handler for RunningTask events during a Driver restart.", default_classes = DefaultDriverRestartTaskRunningHandler.class) +@NamedParameter(doc = "Handler for RunningTask events during a Driver restart.", + default_classes = DefaultDriverRestartTaskRunningHandler.class) public final class DriverRestartTaskRunningHandlers implements Name<Set<EventHandler<RunningTask>>> { private DriverRestartTaskRunningHandlers() { } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/EvaluatorAllocatedHandlers.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/EvaluatorAllocatedHandlers.java b/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/EvaluatorAllocatedHandlers.java index 9751438..9961ffa 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/EvaluatorAllocatedHandlers.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/EvaluatorAllocatedHandlers.java @@ -29,7 +29,8 @@ import java.util.Set; /** * Called when an allocated evaluator is given to the client. */ -@NamedParameter(doc = "Called when an allocated evaluator is given to the client.", default_classes = DefaultEvaluatorAllocationHandler.class) +@NamedParameter(doc = "Called when an allocated evaluator is given to the client.", + default_classes = DefaultEvaluatorAllocationHandler.class) public final class EvaluatorAllocatedHandlers implements Name<Set<EventHandler<AllocatedEvaluator>>> { private EvaluatorAllocatedHandlers() { } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/EvaluatorCompletedHandlers.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/EvaluatorCompletedHandlers.java b/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/EvaluatorCompletedHandlers.java index 79df655..9b2b413 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/EvaluatorCompletedHandlers.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/EvaluatorCompletedHandlers.java @@ -29,7 +29,8 @@ import java.util.Set; /** * Called when an exception occurs on a running evaluator. */ -@NamedParameter(doc = "Called when an exception occurs on a running evaluator.", default_classes = DefaultEvaluatorCompletionHandler.class) +@NamedParameter(doc = "Called when an exception occurs on a running evaluator.", + default_classes = DefaultEvaluatorCompletionHandler.class) public final class EvaluatorCompletedHandlers implements Name<Set<EventHandler<CompletedEvaluator>>> { private EvaluatorCompletedHandlers() { } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/EvaluatorFailedHandlers.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/EvaluatorFailedHandlers.java b/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/EvaluatorFailedHandlers.java index c04ec91..f6dea90 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/EvaluatorFailedHandlers.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/driver/parameters/EvaluatorFailedHandlers.java @@ -29,7 +29,8 @@ import java.util.Set; /** * Called when an exception occurs on a running evaluator. */ -@NamedParameter(doc = "Called when an exception occurs on a running evaluator.", default_classes = DefaultEvaluatorFailureHandler.class) +@NamedParameter(doc = "Called when an exception occurs on a running evaluator.", + default_classes = DefaultEvaluatorFailureHandler.class) public final class EvaluatorFailedHandlers implements Name<Set<EventHandler<FailedEvaluator>>> { private EvaluatorFailedHandlers() { } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/evaluator/context/parameters/Services.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/evaluator/context/parameters/Services.java b/lang/java/reef-common/src/main/java/org/apache/reef/evaluator/context/parameters/Services.java index 8199e52..8da89e3 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/evaluator/context/parameters/Services.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/evaluator/context/parameters/Services.java @@ -28,7 +28,8 @@ import java.util.Set; /** * A set of classes to be instantiated and shared as singletons within this context and all child context. */ -@NamedParameter(doc = "A set of classes to be instantiated and shared as singletons within this context and all child context", +@NamedParameter(doc = "A set of classes to be instantiated and shared as singletons within this context " + + "and all child context", default_classes = ObjectInstantiationLogger.class) @Private public class Services implements Name<Set<Object>> { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/exception/evaluator/ServiceException.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/exception/evaluator/ServiceException.java b/lang/java/reef-common/src/main/java/org/apache/reef/exception/evaluator/ServiceException.java index d98ebc7..3f71b2f 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/exception/evaluator/ServiceException.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/exception/evaluator/ServiceException.java @@ -28,7 +28,8 @@ package org.apache.reef.exception.evaluator; * clauses. Use ServiceRuntimeException when implementing such interfaces.</li> * <li>If there is no good way for Task code to recover from the exception, throw * (and document) a subclass of ServiceRuntimeException</li> - * <li>Applications with generic, catch-all error handling should catch ServiceRuntimeException and ServiceException.</li> + * <li>Applications with generic, catch-all error handling + * should catch ServiceRuntimeException and ServiceException.</li> * <li>Applications with specific error handling logic (eg: ignoring/coping with a failed remote task) should catch * the subclass of ServiceRuntimeException / ServiceException thrown by the library they are using.</li> * </ul> http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/io/WorkingDirectoryTempFileCreator.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/io/WorkingDirectoryTempFileCreator.java b/lang/java/reef-common/src/main/java/org/apache/reef/io/WorkingDirectoryTempFileCreator.java index 75384b4..c51dfc6 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/io/WorkingDirectoryTempFileCreator.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/io/WorkingDirectoryTempFileCreator.java @@ -43,7 +43,8 @@ public final class WorkingDirectoryTempFileCreator implements TempFileCreator { this.tempFolderAsFile = new File("./reef/temp"); this.tempFolderAsFile.mkdirs(); this.tempFolderAsPath = this.tempFolderAsFile.toPath(); - LOG.log(Level.FINE, "Temporary files and folders will be created in [{0}]", this.tempFolderAsFile.getAbsolutePath()); + LOG.log(Level.FINE, "Temporary files and folders will be created in [{0}]", + this.tempFolderAsFile.getAbsolutePath()); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/JobSubmissionHelper.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/JobSubmissionHelper.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/JobSubmissionHelper.java index 67c96eb..0b6e354 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/JobSubmissionHelper.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/JobSubmissionHelper.java @@ -73,7 +73,8 @@ final class JobSubmissionHelper { * @throws InjectionException * @throws IOException */ - JobSubmissionEventImpl.Builder getJobSubmissionBuilder(final Configuration driverConfiguration) throws InjectionException, IOException { + JobSubmissionEventImpl.Builder getJobSubmissionBuilder(final Configuration driverConfiguration) + throws InjectionException, IOException { final Injector injector = Tang.Factory.getTang().newInjector(driverConfiguration); final JobSubmissionEventImpl.Builder jbuilder = JobSubmissionEventImpl.newBuilder() http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/REEFImplementation.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/REEFImplementation.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/REEFImplementation.java index a18533a..e7b5e81 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/REEFImplementation.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/REEFImplementation.java @@ -72,7 +72,8 @@ public final class REEFImplementation implements REEF { final ClientWireUp clientWireUp, final LoggingScopeFactory loggingScopeFactory, final REEFVersion reefVersion, - @Parameter(DriverConfigurationProviders.class) final Set<ConfigurationProvider> configurationProviders) { + @Parameter(DriverConfigurationProviders.class) + final Set<ConfigurationProvider> configurationProviders) { this.jobSubmissionHandler = jobSubmissionHandler; this.runningJobs = runningJobs; this.jobSubmissionHelper = jobSubmissionHelper; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/84ff5021/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/RunningJobsImpl.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/RunningJobsImpl.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/RunningJobsImpl.java index d22ae1e..0fea008 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/RunningJobsImpl.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/client/RunningJobsImpl.java @@ -48,7 +48,8 @@ final class RunningJobsImpl implements RunningJobs { @Inject RunningJobsImpl(final Injector injector, - @Parameter(ResourceManagerErrorHandler.class) final InjectionFuture<EventHandler<FailedRuntime>> failedRuntimeEventHandler) { + @Parameter(ResourceManagerErrorHandler.class) + final InjectionFuture<EventHandler<FailedRuntime>> failedRuntimeEventHandler) { this.injector = injector; this.failedRuntimeEventHandler = failedRuntimeEventHandler; LOG.log(Level.FINE, "Instantiated 'RunningJobImpl'"); @@ -71,7 +72,8 @@ final class RunningJobsImpl implements RunningJobs { if (status.getState() == ReefServiceProtos.State.INIT) { try { - final RunningJobImpl runningJob = this.newRunningJob(status.getIdentifier(), message.getIdentifier().toString()); + final RunningJobImpl runningJob = + this.newRunningJob(status.getIdentifier(), message.getIdentifier().toString()); this.put(runningJob); } catch (final BindException | InjectionException configError) { throw new RuntimeException("Configuration error for: " + status, configError); @@ -139,7 +141,8 @@ final class RunningJobsImpl implements RunningJobs { * @throws BindException * @throws InjectionException */ - private synchronized RunningJobImpl newRunningJob(final String jobIdentifier, final String remoteIdentifier) throws BindException, InjectionException { + private synchronized RunningJobImpl newRunningJob(final String jobIdentifier, final String remoteIdentifier) + throws BindException, InjectionException { final Injector child = this.injector.forkInjector(); child.bindVolatileParameter(REEFImplementation.DriverRemoteIdentifier.class, remoteIdentifier); child.bindVolatileParameter(DriverIdentifier.class, jobIdentifier); 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/DriverRuntimeStartHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/DriverRuntimeStartHandler.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/DriverRuntimeStartHandler.java index 20869f3..a5e7232 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/DriverRuntimeStartHandler.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/DriverRuntimeStartHandler.java @@ -71,7 +71,8 @@ final class DriverRuntimeStartHandler implements EventHandler<RuntimeStart> { public synchronized void onNext(final RuntimeStart runtimeStart) { LOG.log(Level.FINEST, "RuntimeStart: {0}", runtimeStart); - this.remoteManager.registerHandler(EvaluatorRuntimeProtocol.EvaluatorHeartbeatProto.class, evaluatorHeartbeatHandler); + this.remoteManager.registerHandler(EvaluatorRuntimeProtocol.EvaluatorHeartbeatProto.class, + evaluatorHeartbeatHandler); this.remoteManager.registerHandler(ReefServiceProtos.RuntimeErrorProto.class, evaluatorResourceManagerErrorHandler); this.resourceManagerStatus.setRunning(); this.driverStatusManager.onRunning(); 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/DriverSingletons.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/DriverSingletons.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/DriverSingletons.java index 8db275b..7b21f9a 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/DriverSingletons.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/DriverSingletons.java @@ -57,26 +57,39 @@ final class DriverSingletons { @Parameter(TaskSuspendedHandlers.class) final Set<EventHandler<SuspendedTask>> taskSuspendedEventHandlers, @Parameter(TaskMessageHandlers.class) final Set<EventHandler<TaskMessage>> taskMessageEventHandlers, @Parameter(TaskFailedHandlers.class) final Set<EventHandler<FailedTask>> taskExceptionEventHandlers, - @Parameter(EvaluatorAllocatedHandlers.class) final Set<EventHandler<AllocatedEvaluator>> evaluatorAllocatedEventHandlers, + @Parameter(EvaluatorAllocatedHandlers.class) + final Set<EventHandler<AllocatedEvaluator>> evaluatorAllocatedEventHandlers, @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 event handlers - @Parameter(ServiceContextActiveHandlers.class) final Set<EventHandler<ActiveContext>> serviceContextActiveEventHandlers, - @Parameter(ServiceContextClosedHandlers.class) final Set<EventHandler<ClosedContext>> serviceContextClosedEventHandlers, - @Parameter(ServiceContextFailedHandlers.class) final Set<EventHandler<FailedContext>> serviceContextFailedEventHandlers, - @Parameter(ServiceContextMessageHandlers.class) final Set<EventHandler<ContextMessage>> serviceContextMessageHandlers, - @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(ServiceContextActiveHandlers.class) + final Set<EventHandler<ActiveContext>> serviceContextActiveEventHandlers, + @Parameter(ServiceContextClosedHandlers.class) + final Set<EventHandler<ClosedContext>> serviceContextClosedEventHandlers, + @Parameter(ServiceContextFailedHandlers.class) + final Set<EventHandler<FailedContext>> serviceContextFailedEventHandlers, + @Parameter(ServiceContextMessageHandlers.class) + final Set<EventHandler<ContextMessage>> serviceContextMessageHandlers, + @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(ServiceTaskMessageHandlers.class) final Set<EventHandler<TaskMessage>> serviceTaskMessageEventHandlers, @Parameter(ServiceTaskFailedHandlers.class) final Set<EventHandler<FailedTask>> serviceTaskExceptionEventHandlers, - @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, // Client event handler - @Parameter(DriverRuntimeConfigurationOptions.JobControlHandler.class) final EventHandler<ClientRuntimeProtocol.JobControlProto> jobControlHandler, + @Parameter(DriverRuntimeConfigurationOptions.JobControlHandler.class) + final EventHandler<ClientRuntimeProtocol.JobControlProto> jobControlHandler, // Resource*Handlers - Should be invoked once // The YarnResourceLaunchHandler creates and uploads 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/DriverStartHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/DriverStartHandler.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/DriverStartHandler.java index 1343d6e..8193a44 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/DriverStartHandler.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/DriverStartHandler.java @@ -40,7 +40,8 @@ public final class DriverStartHandler implements EventHandler<StartTime> { private final DriverStatusManager driverStatusManager; @Inject - DriverStartHandler(@Parameter(org.apache.reef.driver.parameters.DriverStartHandler.class) final Set<EventHandler<StartTime>> startHandler, + DriverStartHandler(@Parameter(org.apache.reef.driver.parameters.DriverStartHandler.class) + final Set<EventHandler<StartTime>> startHandler, @Parameter(DriverRestartHandler.class) final EventHandler<StartTime> restartHandler, final DriverStatusManager driverStatusManager) { this.startHandlers = startHandler; @@ -51,7 +52,8 @@ public final class DriverStartHandler implements EventHandler<StartTime> { } @Inject - DriverStartHandler(@Parameter(org.apache.reef.driver.parameters.DriverStartHandler.class) final Set<EventHandler<StartTime>> startHandler, + DriverStartHandler(@Parameter(org.apache.reef.driver.parameters.DriverStartHandler.class) + final Set<EventHandler<StartTime>> startHandler, final DriverStatusManager driverStatusManager) { this.startHandlers = startHandler; this.restartHandler = Optional.empty(); 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/DriverStatusManager.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/DriverStatusManager.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/DriverStatusManager.java index b142b05..33f551f 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/DriverStatusManager.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/DriverStatusManager.java @@ -175,7 +175,8 @@ public final class DriverStatusManager { */ public synchronized void sendJobEndingMessageToClient(final Optional<Throwable> exception) { if (this.isNotShuttingDownOrFailing()) { - LOG.log(Level.SEVERE, "Sending message in a state different that SHUTTING_DOWN or FAILING. This is likely a illegal call to clock.close() at play. Current state: " + this.driverStatus); + LOG.log(Level.SEVERE, "Sending message in a state different that SHUTTING_DOWN or FAILING. " + + "This is likely a illegal call to clock.close() at play. Current state: " + this.driverStatus); } if (this.driverTerminationHasBeenCommunicatedToClient) { LOG.log(Level.SEVERE, ".sendJobEndingMessageToClient() called twice. Ignoring the second call"); @@ -188,7 +189,8 @@ public final class DriverStatusManager { LOG.log(Level.WARNING, "There was an exception during clock.close().", exception.get()); } if (this.shutdownCause.isPresent() && exception.isPresent()) { - LOG.log(Level.WARNING, "The driver is shutdown because of an exception (see above) and there was an exception during clock.close(). Only the first exception will be sent to the client"); + LOG.log(Level.WARNING, "The driver is shutdown because of an exception (see above) and there was " + + "an exception during clock.close(). Only the first exception will be sent to the client"); } if (this.shutdownCause.isPresent()) { @@ -231,14 +233,16 @@ public final class DriverStatusManager { */ public synchronized void setNumPreviousContainers(final int num) { if (this.numPreviousContainers >= 0) { - throw new IllegalStateException("Attempting to set the number of expected containers left from a previous container more than once."); + throw new IllegalStateException("Attempting to set the number of expected containers left " + + "from a previous container more than once."); } else { this.numPreviousContainers = num; } } /** - * @return the number of Evaluators from a previous Driver that have checked in with the Driver in a restart situation. + * @return the number of Evaluators from a previous Driver that have checked in with the Driver + * in a restart situation. */ public synchronized int getNumRecoveredContainers() { return this.numRecoveredContainers; 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/api/RuntimeParameters.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/api/RuntimeParameters.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/api/RuntimeParameters.java index 8b4aecc..7799e56 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/api/RuntimeParameters.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/api/RuntimeParameters.java @@ -34,7 +34,8 @@ import org.apache.reef.wake.EventHandler; @RuntimeAuthor public final class RuntimeParameters { - @NamedParameter(doc = "The resource allocation handler that stub runtimes send along allocated resources e.g., containers.") + @NamedParameter(doc = "The resource allocation handler that stub runtimes send along allocated resources " + + "e.g., containers.") public static final class ResourceAllocationHandler implements Name<EventHandler<ResourceAllocationEvent>> { } 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/catalog/ResourceCatalogImpl.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/catalog/ResourceCatalogImpl.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/catalog/ResourceCatalogImpl.java index 18a08e7..da540ba 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/catalog/ResourceCatalogImpl.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/catalog/ResourceCatalogImpl.java @@ -82,7 +82,8 @@ public final class ResourceCatalogImpl implements ResourceCatalog { } final RackDescriptorImpl rack = this.racks.get(rackName); final InetSocketAddress address = new InetSocketAddress(node.getHostName(), node.getPort()); - final NodeDescriptorImpl nodeDescriptor = new NodeDescriptorImpl(node.getIdentifier(), address, rack, node.getMemorySize()); + final NodeDescriptorImpl nodeDescriptor = new NodeDescriptorImpl(node.getIdentifier(), address, rack, + node.getMemorySize()); this.nodes.put(nodeDescriptor.getId(), nodeDescriptor); } } 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/client/ClientManager.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/client/ClientManager.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/client/ClientManager.java index 8c9454f..37686ca 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/client/ClientManager.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/client/ClientManager.java @@ -63,9 +63,12 @@ public final class ClientManager implements EventHandler<ClientRuntimeProtocol.J @Inject - ClientManager(@Parameter(ClientCloseHandlers.class) final InjectionFuture<Set<EventHandler<Void>>> clientCloseHandlers, - @Parameter(ClientCloseWithMessageHandlers.class) final InjectionFuture<Set<EventHandler<byte[]>>> clientCloseWithMessageHandlers, - @Parameter(ClientMessageHandlers.class) final InjectionFuture<Set<EventHandler<byte[]>>> clientMessageHandlers, + ClientManager(@Parameter(ClientCloseHandlers.class) + final InjectionFuture<Set<EventHandler<Void>>> clientCloseHandlers, + @Parameter(ClientCloseWithMessageHandlers.class) + final InjectionFuture<Set<EventHandler<byte[]>>> clientCloseWithMessageHandlers, + @Parameter(ClientMessageHandlers.class) + final InjectionFuture<Set<EventHandler<byte[]>>> clientMessageHandlers, @Parameter(ClientRemoteIdentifier.class) final String clientRID, final RemoteManager remoteManager, 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/context/ContextFactory.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/context/ContextFactory.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/context/ContextFactory.java index d6d358f..cd12401 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/context/ContextFactory.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/context/ContextFactory.java @@ -54,7 +54,8 @@ final class ContextFactory { @Inject ContextFactory(@Parameter(EvaluatorManager.EvaluatorIdentifier.class) final String evaluatorId, - @Parameter(EvaluatorManager.EvaluatorDescriptorName.class) final EvaluatorDescriptor evaluatorDescriptor, + @Parameter(EvaluatorManager.EvaluatorDescriptorName.class) + final EvaluatorDescriptor evaluatorDescriptor, final ConfigurationSerializer configurationSerializer, final ExceptionCodec exceptionCodec, final EvaluatorMessageDispatcher messageDispatcher,
