[REEF-408]: Fix violations of Indentation checkstyle This addressed the issue by adjusting indentation per checkstyle recommendations
JIRA: [REEF-408](https://issues.apache.org/jira/browse/REEF-408) Pull Request: This closes #277 Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/1c5926d3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/1c5926d3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/1c5926d3 Branch: refs/heads/master Commit: 1c5926d3609e5e6c8bb52e12227afc5321026b59 Parents: 9769fcb Author: Mariia Mykhailova <[email protected]> Authored: Mon Jul 6 15:40:05 2015 -0700 Committer: Markus Weimer <[email protected]> Committed: Mon Jul 6 16:26:28 2015 -0700 ---------------------------------------------------------------------- .../javabridge/EvaluatorRequestorBridge.java | 8 +- .../org/apache/reef/client/LauncherStatus.java | 12 +- .../apache/reef/driver/client/package-info.java | 3 +- .../java/org/apache/reef/io/package-info.java | 3 +- .../common/driver/DriverStatusManager.java | 46 +++---- .../common/driver/api/ResourceLaunchEvent.java | 10 +- .../common/driver/client/package-info.java | 3 +- .../driver/context/ContextRepresenters.java | 24 ++-- .../common/driver/context/package-info.java | 3 +- .../evaluator/AllocatedEvaluatorImpl.java | 12 +- .../driver/evaluator/EvaluatorManager.java | 26 ++-- .../evaluator/EvaluatorStatusManager.java | 76 +++++------ .../common/driver/evaluator/package-info.java | 3 +- .../resourcemanager/ResourceManagerStatus.java | 30 ++--- .../common/driver/task/TaskRepresenter.java | 34 ++--- .../common/driver/task/package-info.java | 3 +- .../common/evaluator/task/TaskStatus.java | 132 +++++++++--------- .../common/launch/JavaLaunchCommandBuilder.java | 88 ++++++------ .../src/main/resources/checkstyle.xml | 1 - .../reef/examples/group/bgd/SlaveTask.java | 68 +++++----- .../examples/group/broadcast/BroadcastREEF.java | 4 +- .../examples/group/broadcast/SlaveTask.java | 24 ++-- .../apache/reef/examples/hello/HelloREEF.java | 4 +- .../reef/examples/scheduler/Scheduler.java | 10 +- .../examples/scheduler/SchedulerDriver.java | 12 +- .../scheduler/SchedulerHttpHandler.java | 40 +++--- .../reef/examples/scheduler/SchedulerREEF.java | 24 ++-- .../examples/scheduler/SchedulerREEFYarn.java | 2 +- .../apache/reef/examples/suspend/Control.java | 10 +- .../examples/suspend/SuspendClientControl.java | 10 +- .../reef/examples/suspend/SuspendDriver.java | 46 +++---- .../group/impl/driver/TaskNodeStatusImpl.java | 52 +++---- .../network/group/impl/driver/TreeTopology.java | 20 +-- .../group/impl/task/OperatorTopologyImpl.java | 108 +++++++-------- .../impl/task/OperatorTopologyStructImpl.java | 28 ++-- .../reef/io/network/impl/NetworkService.java | 48 +++---- .../hdinsight/client/yarnrest/Commands.java | 42 +++--- .../hdinsight/client/yarnrest/Constants.java | 110 +++++++-------- .../hdinsight/client/yarnrest/Credentials.java | 90 ++++++------- .../local/client/parameters/RackNames.java | 4 +- .../process/ReefRunnableProcessObserver.java | 10 +- .../runtime/local/process/RunnableProcess.java | 28 ++-- .../runtime/mesos/driver/REEFScheduler.java | 44 +++--- .../runtime/mesos/evaluator/REEFExecutor.java | 12 +- .../mesos/util/MesosRemoteManagerCodec.java | 2 +- .../yarn/driver/YarnContainerManager.java | 38 +++--- .../reef/tang/formats/ConfigurationModule.java | 2 +- .../reef/tests/fail/driver/FailDriver.java | 42 +++--- .../org/apache/reef/tests/fail/task/Driver.java | 76 +++++------ .../DefaultRemoteManagerImplementation.java | 24 ++-- .../netty/NettyMessagingTransport.java | 48 +++---- .../webserver/HttpServerReefEventHandler.java | 134 +++++++++---------- 52 files changed, 870 insertions(+), 863 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1c5926d3/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 87e4008..779c936 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 @@ -56,10 +56,10 @@ public final class EvaluatorRequestorBridge extends NativeBridge { clrEvaluatorsNumber += evaluatorsNumber; final EvaluatorRequest request = EvaluatorRequest.newBuilder() - .setNumber(evaluatorsNumber) - .setMemory(memory) - .setNumberOfCores(virtualCore) - .build(); + .setNumber(evaluatorsNumber) + .setMemory(memory) + .setNumberOfCores(virtualCore) + .build(); LOG.log(Level.FINE, "submitting evaluator request {0}", request); jevaluatorRequestor.submit(request); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1c5926d3/lang/java/reef-common/src/main/java/org/apache/reef/client/LauncherStatus.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/client/LauncherStatus.java b/lang/java/reef-common/src/main/java/org/apache/reef/client/LauncherStatus.java index 3d59e36..299aa9e 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/client/LauncherStatus.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/client/LauncherStatus.java @@ -79,12 +79,12 @@ public final class LauncherStatus { */ public boolean isDone() { switch (this.state) { - case FAILED: - case COMPLETED: - case FORCE_CLOSED: - return true; - default: - return false; + case FAILED: + case COMPLETED: + case FORCE_CLOSED: + return true; + default: + return false; } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1c5926d3/lang/java/reef-common/src/main/java/org/apache/reef/driver/client/package-info.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/driver/client/package-info.java b/lang/java/reef-common/src/main/java/org/apache/reef/driver/client/package-info.java index 911bbe4..0859dcb 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/driver/client/package-info.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/driver/client/package-info.java @@ -20,6 +20,7 @@ * Representations of the Client (i.e. the job submitter) to a Driver. * Note that as of REEF 0.3, the client is optional and may not be available to a driver. */ -@DriverSide package org.apache.reef.driver.client; +@DriverSide +package org.apache.reef.driver.client; import org.apache.reef.annotations.audience.DriverSide; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1c5926d3/lang/java/reef-common/src/main/java/org/apache/reef/io/package-info.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/io/package-info.java b/lang/java/reef-common/src/main/java/org/apache/reef/io/package-info.java index 53fe025..c86b7ea 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/io/package-info.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/io/package-info.java @@ -19,6 +19,7 @@ /** * APIs for I/O in REEF: {@link org.apache.reef.io.Codec}s and {@link org.apache.reef.io.Serializer}s. */ -@Unstable package org.apache.reef.io; +@Unstable +package org.apache.reef.io; import org.apache.reef.annotations.Unstable; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1c5926d3/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 0724ff3..b142b05 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 @@ -77,33 +77,33 @@ public final class DriverStatusManager { */ private static boolean isLegalTransition(final DriverStatus from, final DriverStatus to) { switch (from) { - case PRE_INIT: - switch (to) { - case INIT: - return true; - default: - return false; - } + case PRE_INIT: + switch (to) { case INIT: - switch (to) { - case RUNNING: - return true; - default: - return false; - } + return true; + default: + return false; + } + case INIT: + switch (to) { case RUNNING: - switch (to) { - case SHUTTING_DOWN: - case FAILING: - return true; - default: - return false; - } - case FAILING: - case SHUTTING_DOWN: + return true; + default: return false; + } + case RUNNING: + switch (to) { + case SHUTTING_DOWN: + case FAILING: + return true; default: - throw new IllegalStateException("Unknown input state: " + from); + return false; + } + case FAILING: + case SHUTTING_DOWN: + return false; + default: + throw new IllegalStateException("Unknown input state: " + from); } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1c5926d3/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/api/ResourceLaunchEvent.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/api/ResourceLaunchEvent.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/api/ResourceLaunchEvent.java index 9c36a8b..735c9f9 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/api/ResourceLaunchEvent.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/api/ResourceLaunchEvent.java @@ -39,25 +39,25 @@ public interface ResourceLaunchEvent { /** * @return Id of the resource to launch the Evaluator on */ - String getIdentifier(); + String getIdentifier(); /** * @return Remote Id for the error handler */ - String getRemoteId(); + String getRemoteId(); /** * @return Evaluator configuration */ - Configuration getEvaluatorConf(); + Configuration getEvaluatorConf(); /** * @return Evaluator process to launch */ - EvaluatorProcess getProcess(); + EvaluatorProcess getProcess(); /** * @return List of libraries local to this Evaluator */ - Set<FileResource> getFileSet(); + Set<FileResource> getFileSet(); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1c5926d3/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/client/package-info.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/client/package-info.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/client/package-info.java index 1e56c6c..5739dc6 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/client/package-info.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/client/package-info.java @@ -20,6 +20,7 @@ * Objects representing the Client on the Driver. */ -@DriverSide package org.apache.reef.runtime.common.driver.client; +@DriverSide +package org.apache.reef.runtime.common.driver.client; import org.apache.reef.annotations.audience.DriverSide; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1c5926d3/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 b47da36..663c110 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 @@ -113,18 +113,18 @@ public final class ContextRepresenters { LOG.log(Level.FINER, "Processing context status message for context {0}", contextStatusProto.getContextId()); switch (contextStatusProto.getContextState()) { - case READY: - this.onContextReady(contextStatusProto, notifyClientOnNewActiveContext); - break; - case FAIL: - this.onContextFailed(contextStatusProto); - break; - case DONE: - this.onContextDone(contextStatusProto); - break; - default: - this.onUnknownContextStatus(contextStatusProto); - break; + case READY: + this.onContextReady(contextStatusProto, notifyClientOnNewActiveContext); + break; + case FAIL: + this.onContextFailed(contextStatusProto); + break; + case DONE: + this.onContextDone(contextStatusProto); + break; + default: + this.onUnknownContextStatus(contextStatusProto); + break; } LOG.log(Level.FINER, "Done processing context status message for context {0}", contextStatusProto.getContextId()); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1c5926d3/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/context/package-info.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/context/package-info.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/context/package-info.java index f1d794b..4fc6555 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/context/package-info.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/context/package-info.java @@ -20,7 +20,8 @@ * Implementations of Driver-Side representations of Contexts running on an Evaluator. */ @DriverSide -@Private package org.apache.reef.runtime.common.driver.context; +@Private +package org.apache.reef.runtime.common.driver.context; import org.apache.reef.annotations.audience.DriverSide; import org.apache.reef.annotations.audience.Private; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1c5926d3/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/AllocatedEvaluatorImpl.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/AllocatedEvaluatorImpl.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/AllocatedEvaluatorImpl.java index 5c8b7b2..d700bbc 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/AllocatedEvaluatorImpl.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/AllocatedEvaluatorImpl.java @@ -145,12 +145,12 @@ final class AllocatedEvaluatorImpl implements AllocatedEvaluator { @Deprecated public void setType(final EvaluatorType type) { switch (type) { - case CLR: - setProcess(clrProcessFactory.newEvaluatorProcess()); - break; - default: - setProcess(jvmProcessFactory.newEvaluatorProcess()); - break; + case CLR: + setProcess(clrProcessFactory.newEvaluatorProcess()); + break; + default: + setProcess(jvmProcessFactory.newEvaluatorProcess()); + break; } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1c5926d3/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 cb3c14a..0bd8314 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 @@ -367,19 +367,19 @@ public final class EvaluatorManager implements Identifiable, AutoCloseable { private synchronized void onEvaluatorStatusMessage(final ReefServiceProtos.EvaluatorStatusProto message) { switch (message.getState()) { - case DONE: - this.onEvaluatorDone(message); - break; - case FAILED: - this.onEvaluatorFailed(message); - break; - case INIT: - case KILLED: - case RUNNING: - case SUSPEND: - break; - default: - throw new RuntimeException("Unknown state: " + message.getState()); + case DONE: + this.onEvaluatorDone(message); + break; + case FAILED: + this.onEvaluatorFailed(message); + break; + case INIT: + case KILLED: + case RUNNING: + case SUSPEND: + break; + default: + throw new RuntimeException("Unknown state: " + message.getState()); } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1c5926d3/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorStatusManager.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorStatusManager.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorStatusManager.java index 51d40ec..3e44fda 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorStatusManager.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorStatusManager.java @@ -48,51 +48,51 @@ final class EvaluatorStatusManager { } switch(from) { - case ALLOCATED: { - switch(to) { - case SUBMITTED: - case DONE: - case FAILED: - case KILLED: - return true; - case RUNNING: - break; - default: - throw new RuntimeException("Unknown state: " + to); - } - } - case SUBMITTED: { - switch(to) { - case RUNNING: - case DONE: - case FAILED: - case KILLED: - return true; - case ALLOCATED: - break; - default: - throw new RuntimeException("Unknown state: " + to); - } + case ALLOCATED: { + switch(to) { + case SUBMITTED: + case DONE: + case FAILED: + case KILLED: + return true; + case RUNNING: + break; + default: + throw new RuntimeException("Unknown state: " + to); } - case RUNNING: { - switch(to) { - case DONE: - case FAILED: - case KILLED: - return true; - case ALLOCATED: - case SUBMITTED: - break; - default: - throw new RuntimeException("Unknown state: " + to); - } + } + case SUBMITTED: { + switch(to) { + case RUNNING: + case DONE: + case FAILED: + case KILLED: + return true; + case ALLOCATED: + break; + default: + throw new RuntimeException("Unknown state: " + to); } + } + case RUNNING: { + switch(to) { case DONE: case FAILED: case KILLED: + return true; + case ALLOCATED: + case SUBMITTED: break; default: - throw new RuntimeException("Unknown state: " + from); + throw new RuntimeException("Unknown state: " + to); + } + } + case DONE: + case FAILED: + case KILLED: + break; + default: + throw new RuntimeException("Unknown state: " + from); } LOG.warning("Illegal evaluator state transition from " + from + " to " + to + "."); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1c5926d3/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/package-info.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/package-info.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/package-info.java index 6737b5d..fcad278 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/package-info.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/package-info.java @@ -20,7 +20,8 @@ * Driver-Side representations of Evaluators. */ @DriverSide -@Private package org.apache.reef.runtime.common.driver.evaluator; +@Private +package org.apache.reef.runtime.common.driver.evaluator; import org.apache.reef.annotations.audience.DriverSide; import org.apache.reef.annotations.audience.Private; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1c5926d3/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 23d7d44..24c8e2f 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 @@ -71,21 +71,21 @@ public final class ResourceManagerStatus implements EventHandler<RuntimeStatusEv this.setState(runtimeStatusEvent.getState()); switch (newState) { - case FAILED: - this.onRMFailure(runtimeStatusEvent); - break; - case DONE: - this.onRMDone(runtimeStatusEvent); - break; - case RUNNING: - this.onRMRunning(runtimeStatusEvent); - break; - case INIT: - case SUSPEND: - case KILLED: - break; - default: - throw new RuntimeException("Unknown state: " + newState); + case FAILED: + this.onRMFailure(runtimeStatusEvent); + break; + case DONE: + this.onRMDone(runtimeStatusEvent); + break; + case RUNNING: + this.onRMRunning(runtimeStatusEvent); + break; + case INIT: + case SUSPEND: + case KILLED: + break; + default: + throw new RuntimeException("Unknown state: " + newState); } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1c5926d3/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 52119e3..1d71d72 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 @@ -91,23 +91,23 @@ public final class TaskRepresenter { } // Dispatch the message to the right method. switch (taskStatusProto.getState()) { - case INIT: - this.onTaskInit(taskStatusProto); - break; - case RUNNING: - this.onTaskRunning(taskStatusProto); - break; - case SUSPEND: - this.onTaskSuspend(taskStatusProto); - break; - case DONE: - this.onTaskDone(taskStatusProto); - break; - case FAILED: - this.onTaskFailed(taskStatusProto); - break; - default: - throw new IllegalStateException("Unknown task state: " + taskStatusProto.getState()); + case INIT: + this.onTaskInit(taskStatusProto); + break; + case RUNNING: + this.onTaskRunning(taskStatusProto); + break; + case SUSPEND: + this.onTaskSuspend(taskStatusProto); + break; + case DONE: + this.onTaskDone(taskStatusProto); + break; + case FAILED: + this.onTaskFailed(taskStatusProto); + break; + default: + throw new IllegalStateException("Unknown task state: " + taskStatusProto.getState()); } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1c5926d3/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/task/package-info.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/task/package-info.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/task/package-info.java index 644987a..a2e5a1c 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/task/package-info.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/task/package-info.java @@ -20,7 +20,8 @@ * Driver-Side representations of tasks. */ @Private -@DriverSide package org.apache.reef.runtime.common.driver.task; +@DriverSide +package org.apache.reef.runtime.common.driver.task; import org.apache.reef.annotations.audience.DriverSide; import org.apache.reef.annotations.audience.Private; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1c5926d3/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 11a63a5..50076bf 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 @@ -76,59 +76,59 @@ public final class TaskStatus { return to == State.INIT; } switch (from) { - case PRE_INIT: - switch (to) { - case INIT: - return true; - default: - return false; - } + case PRE_INIT: + switch (to) { case INIT: - switch (to) { - case RUNNING: - case FAILED: - case KILLED: - case DONE: - return true; - default: - return false; - } + return true; + default: + return false; + } + case INIT: + switch (to) { case RUNNING: - switch (to) { - case CLOSE_REQUESTED: - case SUSPEND_REQUESTED: - case FAILED: - case KILLED: - case DONE: - return true; - default: - return false; - } + case FAILED: + case KILLED: + case DONE: + return true; + default: + return false; + } + case RUNNING: + switch (to) { case CLOSE_REQUESTED: - switch (to) { - case FAILED: - case KILLED: - case DONE: - return true; - default: - return false; - } case SUSPEND_REQUESTED: - switch (to) { - case FAILED: - case KILLED: - case SUSPENDED: - return true; - default: - return false; - } - case FAILED: + case KILLED: case DONE: + return true; + default: + return false; + } + case CLOSE_REQUESTED: + switch (to) { + case FAILED: case KILLED: + case DONE: + return true; + default: return false; + } + case SUSPEND_REQUESTED: + switch (to) { + case FAILED: + case KILLED: + case SUSPENDED: + return true; default: return false; + } + + case FAILED: + case DONE: + case KILLED: + return false; + default: + return false; } } @@ -168,22 +168,22 @@ public final class TaskStatus { private ReefServiceProtos.State getProtoState() { switch (this.state) { - case INIT: - return ReefServiceProtos.State.INIT; - case CLOSE_REQUESTED: - case SUSPEND_REQUESTED: - case RUNNING: - return ReefServiceProtos.State.RUNNING; - case DONE: - return ReefServiceProtos.State.DONE; - case SUSPENDED: - return ReefServiceProtos.State.SUSPEND; - case FAILED: - return ReefServiceProtos.State.FAILED; - case KILLED: - return ReefServiceProtos.State.KILLED; - default: - throw new RuntimeException("Unknown state: " + this.state); + case INIT: + return ReefServiceProtos.State.INIT; + case CLOSE_REQUESTED: + case SUSPEND_REQUESTED: + case RUNNING: + return ReefServiceProtos.State.RUNNING; + case DONE: + return ReefServiceProtos.State.DONE; + case SUSPENDED: + return ReefServiceProtos.State.SUSPEND; + case FAILED: + return ReefServiceProtos.State.FAILED; + case KILLED: + return ReefServiceProtos.State.KILLED; + default: + throw new RuntimeException("Unknown state: " + this.state); } } @@ -254,13 +254,13 @@ public final class TaskStatus { boolean hasEnded() { switch (this.state) { - case DONE: - case SUSPENDED: - case FAILED: - case KILLED: - return true; - default: - return false; + case DONE: + case SUSPENDED: + case FAILED: + case KILLED: + return true; + default: + return false; } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1c5926d3/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/JavaLaunchCommandBuilder.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/JavaLaunchCommandBuilder.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/JavaLaunchCommandBuilder.java index 836e745..b9cb5e4 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/JavaLaunchCommandBuilder.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/launch/JavaLaunchCommandBuilder.java @@ -46,50 +46,50 @@ public final class JavaLaunchCommandBuilder implements LaunchCommandBuilder { public List<String> build() { return new ArrayList<String>() {{ - if (javaPath == null || javaPath.isEmpty()) { - add(DEFAULT_JAVA_PATH); - } else { - add(javaPath); - } - - add("-XX:PermSize=128m"); - add("-XX:MaxPermSize=128m"); - // Set Xmx based on am memory size - add("-Xmx" + megaBytes + "m"); - - if ((assertionsEnabled != null && assertionsEnabled) - || EnvironmentUtils.areAssertionsEnabled()) { - add("-ea"); - } - - if (classPath != null && !classPath.isEmpty()) { - add("-classpath"); - add(classPath); - } - - Launcher.propagateProperties(this, true, "proc_reef"); - Launcher.propagateProperties(this, false, - "java.util.logging.config.file", "java.util.logging.config.class"); - - add(Launcher.class.getName()); - - add("-" + ErrorHandlerRID.SHORT_NAME); - add(errorHandlerRID); - add("-" + LaunchID.SHORT_NAME); - add(launchID); - add("-" + ClockConfigurationPath.SHORT_NAME); - add(evaluatorConfigurationPath); - - if (stdoutPath != null && !stdoutPath.isEmpty()) { - add("1>"); - add(stdoutPath); - } - - if (stderrPath != null && !stderrPath.isEmpty()) { - add("2>"); - add(stderrPath); - } - }}; + if (javaPath == null || javaPath.isEmpty()) { + add(DEFAULT_JAVA_PATH); + } else { + add(javaPath); + } + + add("-XX:PermSize=128m"); + add("-XX:MaxPermSize=128m"); + // Set Xmx based on am memory size + add("-Xmx" + megaBytes + "m"); + + if ((assertionsEnabled != null && assertionsEnabled) + || EnvironmentUtils.areAssertionsEnabled()) { + add("-ea"); + } + + if (classPath != null && !classPath.isEmpty()) { + add("-classpath"); + add(classPath); + } + + Launcher.propagateProperties(this, true, "proc_reef"); + Launcher.propagateProperties(this, false, + "java.util.logging.config.file", "java.util.logging.config.class"); + + add(Launcher.class.getName()); + + add("-" + ErrorHandlerRID.SHORT_NAME); + add(errorHandlerRID); + add("-" + LaunchID.SHORT_NAME); + add(launchID); + add("-" + ClockConfigurationPath.SHORT_NAME); + add(evaluatorConfigurationPath); + + if (stdoutPath != null && !stdoutPath.isEmpty()) { + add("1>"); + add(stdoutPath); + } + + if (stderrPath != null && !stderrPath.isEmpty()) { + add("2>"); + add(stderrPath); + } + }}; } @Override http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1c5926d3/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 5d2be9f..ca6d8c2 100644 --- a/lang/java/reef-common/src/main/resources/checkstyle.xml +++ b/lang/java/reef-common/src/main/resources/checkstyle.xml @@ -209,7 +209,6 @@ <module name="Indentation"> <property name="basicOffset" value="2"/> <property name="caseIndent" value="0"/> - <property name="severity" value="warning"/> </module> <module name="TodoComment"> <property name="severity" value="warning"/> http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1c5926d3/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 1aea74d..3d18f8c 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 @@ -98,42 +98,42 @@ public class SlaveTask implements Task { final ControlMessages controlMessage = controlMessageBroadcaster.receive(); switch (controlMessage) { - case Stop: - repeat = false; - break; - - case ComputeGradientWithModel: - failPerhaps(); - this.model = modelBroadcaster.receive(); - lossAndGradientReducer.send(computeLossAndGradient()); - break; - - case ComputeGradientWithMinEta: - failPerhaps(); - final double minEta = minEtaBroadcaster.receive(); + case Stop: + repeat = false; + break; + + case ComputeGradientWithModel: + failPerhaps(); + this.model = modelBroadcaster.receive(); + lossAndGradientReducer.send(computeLossAndGradient()); + break; + + case ComputeGradientWithMinEta: + failPerhaps(); + final double minEta = minEtaBroadcaster.receive(); assert (descentDirection != null); - this.descentDirection.scale(minEta); + this.descentDirection.scale(minEta); assert (model != null); - this.model.add(descentDirection); - lossAndGradientReducer.send(computeLossAndGradient()); - break; - - case DoLineSearch: - failPerhaps(); - this.descentDirection = descentDirectionBroadcaster.receive(); - lineSearchEvaluationsReducer.send(lineSearchEvals()); - break; - - case DoLineSearchWithModel: - failPerhaps(); - final Pair<Vector, Vector> modelAndDescentDir = modelAndDescentDirectionBroadcaster.receive(); - this.model = modelAndDescentDir.first; - this.descentDirection = modelAndDescentDir.second; - lineSearchEvaluationsReducer.send(lineSearchEvals()); - break; - - default: - break; + this.model.add(descentDirection); + lossAndGradientReducer.send(computeLossAndGradient()); + break; + + case DoLineSearch: + failPerhaps(); + this.descentDirection = descentDirectionBroadcaster.receive(); + lineSearchEvaluationsReducer.send(lineSearchEvals()); + break; + + case DoLineSearchWithModel: + failPerhaps(); + final Pair<Vector, Vector> modelAndDescentDir = modelAndDescentDirectionBroadcaster.receive(); + this.model = modelAndDescentDir.first; + this.descentDirection = modelAndDescentDir.second; + lineSearchEvaluationsReducer.send(lineSearchEvals()); + break; + + default: + break; } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1c5926d3/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/broadcast/BroadcastREEF.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/broadcast/BroadcastREEF.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/broadcast/BroadcastREEF.java index 31a78ae..618b821 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/broadcast/BroadcastREEF.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/broadcast/BroadcastREEF.java @@ -149,6 +149,6 @@ public final class BroadcastREEF { /** * Empty private constructor to prohibit instantiation of utility class. */ - private BroadcastREEF() { - } + private BroadcastREEF() { + } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1c5926d3/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/broadcast/SlaveTask.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/broadcast/SlaveTask.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/broadcast/SlaveTask.java index 7323711..dd3f1ec 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/broadcast/SlaveTask.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/broadcast/SlaveTask.java @@ -55,20 +55,20 @@ public class SlaveTask implements Task { while (!stop) { final ControlMessages controlMessage = controlMessageBroadcaster.receive(); switch (controlMessage) { - case Stop: - stop = true; - break; + case Stop: + stop = true; + break; - case ReceiveModel: - modelBroadcaster.receive(); - if (Math.random() < 0.1) { - throw new RuntimeException("Simulated Failure"); - } - modelReceiveAckReducer.send(true); - break; + case ReceiveModel: + modelBroadcaster.receive(); + if (Math.random() < 0.1) { + throw new RuntimeException("Simulated Failure"); + } + modelReceiveAckReducer.send(true); + break; - default: - break; + default: + break; } } return null; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1c5926d3/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hello/HelloREEF.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hello/HelloREEF.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hello/HelloREEF.java index 9a9f6ac..bd1d904 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hello/HelloREEF.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/hello/HelloREEF.java @@ -82,6 +82,6 @@ public final class HelloREEF { /** * Empty private constructor to prohibit instantiation of utility class. */ - private HelloREEF() { - } + private HelloREEF() { + } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1c5926d3/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 637da1e..ebf59ff 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 @@ -72,12 +72,12 @@ final class Scheduler { final String command = task.getCommand(); final Configuration taskConf = TaskConfiguration.CONF - .set(TaskConfiguration.TASK, ShellTask.class) - .set(TaskConfiguration.IDENTIFIER, taskId.toString()) - .build(); + .set(TaskConfiguration.TASK, ShellTask.class) + .set(TaskConfiguration.IDENTIFIER, taskId.toString()) + .build(); final Configuration commandConf = Tang.Factory.getTang().newConfigurationBuilder() - .bindNamedParameter(Command.class, command) - .build(); + .bindNamedParameter(Command.class, command) + .build(); final Configuration merged = Configurations.merge(taskConf, commandConf); context.submitTask(merged); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1c5926d3/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/SchedulerDriver.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/SchedulerDriver.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/SchedulerDriver.java index 6753c48..13b40fe 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/SchedulerDriver.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/SchedulerDriver.java @@ -112,8 +112,8 @@ public final class SchedulerDriver { } evaluator.submitContext(ContextConfiguration.CONF - .set(ContextConfiguration.IDENTIFIER, "SchedulerContext") - .build()); + .set(ContextConfiguration.IDENTIFIER, "SchedulerContext") + .build()); } } @@ -260,7 +260,7 @@ public final class SchedulerDriver { if (scheduler.hasPendingTasks()) { final int nToRequest = - Math.min(scheduler.getNumPendingTasks(), nMaxEval - nActiveEval) - nRequestedEval; + Math.min(scheduler.getNumPendingTasks(), nMaxEval - nActiveEval) - nRequestedEval; requestEvaluator(nToRequest); } return SchedulerResponse.OK("You can use evaluators up to " + nMaxEval + " evaluators."); @@ -279,9 +279,9 @@ public final class SchedulerDriver { synchronized (SchedulerDriver.this) { nRequestedEval += numToRequest; requestor.submit(EvaluatorRequest.newBuilder() - .setMemory(32) - .setNumber(numToRequest) - .build()); + .setMemory(32) + .setNumber(numToRequest) + .build()); } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1c5926d3/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/SchedulerHttpHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/SchedulerHttpHandler.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/SchedulerHttpHandler.java index 037d202..ac220da 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/SchedulerHttpHandler.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/SchedulerHttpHandler.java @@ -72,26 +72,26 @@ final class SchedulerHttpHandler implements HttpHandler { final SchedulerResponse result; switch (target) { - case "list": - result = schedulerDriver.get().getList(); - break; - case "clear": - result = schedulerDriver.get().clearList(); - break; - case "status": - result = schedulerDriver.get().getTaskStatus(queryMap.get("id")); - break; - case "submit": - result = schedulerDriver.get().submitCommands(queryMap.get("cmd")); - break; - case "cancel": - result = schedulerDriver.get().cancelTask(queryMap.get("id")); - break; - case "max-eval": - result = schedulerDriver.get().setMaxEvaluators(queryMap.get("num")); - break; - default: - result = SchedulerResponse.NOT_FOUND("Unsupported operation"); + case "list": + result = schedulerDriver.get().getList(); + break; + case "clear": + result = schedulerDriver.get().clearList(); + break; + case "status": + result = schedulerDriver.get().getTaskStatus(queryMap.get("id")); + break; + case "submit": + result = schedulerDriver.get().submitCommands(queryMap.get("cmd")); + break; + case "cancel": + result = schedulerDriver.get().cancelTask(queryMap.get("id")); + break; + case "max-eval": + result = schedulerDriver.get().setMaxEvaluators(queryMap.get("num")); + break; + default: + result = SchedulerResponse.NOT_FOUND("Unsupported operation"); } // Send response to the http client http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1c5926d3/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/SchedulerREEF.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/SchedulerREEF.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/SchedulerREEF.java index f173cae..c0197f3 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/SchedulerREEF.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/SchedulerREEF.java @@ -48,7 +48,7 @@ public final class SchedulerREEF { * or false to allocate/close for each iteration */ @NamedParameter(doc = "Whether or not to reuse evaluators", - short_name = "retain", default_value = "true") + short_name = "retain", default_value = "true") public static final class Retain implements Name<Boolean> { } @@ -57,8 +57,8 @@ public final class SchedulerREEF { */ private static Configuration getHttpConf() { final Configuration httpHandlerConf = HttpHandlerConfiguration.CONF - .set(HttpHandlerConfiguration.HTTP_HANDLERS, SchedulerHttpHandler.class) - .build(); + .set(HttpHandlerConfiguration.HTTP_HANDLERS, SchedulerHttpHandler.class) + .build(); return httpHandlerConf; } @@ -67,13 +67,13 @@ public final class SchedulerREEF { */ private static Configuration getDriverConf() { final Configuration driverConf = DriverConfiguration.CONF - .set(DriverConfiguration.GLOBAL_LIBRARIES, EnvironmentUtils.getClassLocation(SchedulerDriver.class)) - .set(DriverConfiguration.DRIVER_IDENTIFIER, "TaskScheduler") - .set(DriverConfiguration.ON_DRIVER_STARTED, SchedulerDriver.StartHandler.class) - .set(DriverConfiguration.ON_EVALUATOR_ALLOCATED, SchedulerDriver.EvaluatorAllocatedHandler.class) - .set(DriverConfiguration.ON_CONTEXT_ACTIVE, SchedulerDriver.ActiveContextHandler.class) - .set(DriverConfiguration.ON_TASK_COMPLETED, SchedulerDriver.CompletedTaskHandler.class) - .build(); + .set(DriverConfiguration.GLOBAL_LIBRARIES, EnvironmentUtils.getClassLocation(SchedulerDriver.class)) + .set(DriverConfiguration.DRIVER_IDENTIFIER, "TaskScheduler") + .set(DriverConfiguration.ON_DRIVER_STARTED, SchedulerDriver.StartHandler.class) + .set(DriverConfiguration.ON_EVALUATOR_ALLOCATED, SchedulerDriver.EvaluatorAllocatedHandler.class) + .set(DriverConfiguration.ON_CONTEXT_ACTIVE, SchedulerDriver.ActiveContextHandler.class) + .set(DriverConfiguration.ON_TASK_COMPLETED, SchedulerDriver.CompletedTaskHandler.class) + .build(); return driverConf; } @@ -106,8 +106,8 @@ public final class SchedulerREEF { */ public static void main(String[] args) throws InjectionException, IOException, ParseException { final Configuration runtimeConfiguration = LocalRuntimeConfiguration.CONF - .set(LocalRuntimeConfiguration.MAX_NUMBER_OF_EVALUATORS, MAX_NUMBER_OF_EVALUATORS) - .build(); + .set(LocalRuntimeConfiguration.MAX_NUMBER_OF_EVALUATORS, MAX_NUMBER_OF_EVALUATORS) + .build(); runTaskScheduler(runtimeConfiguration, args); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1c5926d3/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/SchedulerREEFYarn.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/SchedulerREEFYarn.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/SchedulerREEFYarn.java index 46048ac..b14ad56 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/SchedulerREEFYarn.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/scheduler/SchedulerREEFYarn.java @@ -40,7 +40,7 @@ public final class SchedulerREEFYarn { public static void main(String[] args) throws InjectionException, IOException, ParseException { final Configuration runtimeConfiguration = - YarnClientConfiguration.CONF.build(); + YarnClientConfiguration.CONF.build(); runTaskScheduler(runtimeConfiguration, args); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1c5926d3/lang/java/reef-examples/src/main/java/org/apache/reef/examples/suspend/Control.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/suspend/Control.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/suspend/Control.java index 94a0be8..42644c9 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/suspend/Control.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/suspend/Control.java @@ -84,11 +84,11 @@ public final class Control { final EStage<TransportEvent> stage = new ThreadPoolStage<>("suspend-control-client", new LoggingEventHandler<TransportEvent>(), 1, new EventHandler<Throwable>() { - @Override - public void onNext(final Throwable throwable) { - throw new RuntimeException(throwable); - } - }); + @Override + public void onNext(final Throwable throwable) { + throw new RuntimeException(throwable); + } + }); try (final Transport transport = tpFactory.newInstance("localhost", 0, stage, stage, 1, 10000)) { final Link link = transport.open(new InetSocketAddress("localhost", this.port), codec, null); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1c5926d3/lang/java/reef-examples/src/main/java/org/apache/reef/examples/suspend/SuspendClientControl.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/suspend/SuspendClientControl.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/suspend/SuspendClientControl.java index 58d314e..28f0b0d 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/suspend/SuspendClientControl.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/suspend/SuspendClientControl.java @@ -55,11 +55,11 @@ public class SuspendClientControl implements AutoCloseable { final EStage<TransportEvent> stage = new ThreadPoolStage<>( "suspend-control-server", new ControlMessageHandler(), 1, new EventHandler<Throwable>() { - @Override - public void onNext(final Throwable throwable) { - throw new RuntimeException(throwable); - } - }); + @Override + public void onNext(final Throwable throwable) { + throw new RuntimeException(throwable); + } + }); this.transport = tpFactory.newInstance("localhost", port, stage, stage, 1, 10000); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1c5926d3/lang/java/reef-examples/src/main/java/org/apache/reef/examples/suspend/SuspendDriver.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/suspend/SuspendDriver.java b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/suspend/SuspendDriver.java index 538d527..a6ab268 100644 --- a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/suspend/SuspendDriver.java +++ b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/suspend/SuspendDriver.java @@ -277,39 +277,39 @@ public class SuspendDriver { switch (command) { - case "suspend": { - final RunningTask task = runningTasks.get(taskId); - if (task != null) { - task.suspend(); - } else { - throw new IllegalArgumentException("Suspend: Task not found: " + taskId); - } - break; + case "suspend": { + final RunningTask task = runningTasks.get(taskId); + if (task != null) { + task.suspend(); + } else { + throw new IllegalArgumentException("Suspend: Task not found: " + taskId); } + break; + } - case "resume": { - final SuspendedTask suspendedTask; + case "resume": { + final SuspendedTask suspendedTask; synchronized (suspendedTasks) { - suspendedTask = suspendedTasks.remove(taskId); - } - if (suspendedTask != null) { - try { - suspendedTask.getActiveContext().submitTask(TaskConfiguration.CONF + suspendedTask = suspendedTasks.remove(taskId); + } + if (suspendedTask != null) { + try { + suspendedTask.getActiveContext().submitTask(TaskConfiguration.CONF .set(TaskConfiguration.IDENTIFIER, taskId) .set(TaskConfiguration.MEMENTO, DatatypeConverter.printBase64Binary(suspendedTask.get())) .build()); - } catch (final BindException e) { - throw new RuntimeException(e); - } - } else { - throw new IllegalArgumentException("Resume: Task not found: " + taskId); + } catch (final BindException e) { + throw new RuntimeException(e); } - break; + } else { + throw new IllegalArgumentException("Resume: Task not found: " + taskId); } + break; + } - default: - throw new IllegalArgumentException("Bad command: " + command); + default: + throw new IllegalArgumentException("Bad command: " + command); } } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1c5926d3/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TaskNodeStatusImpl.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TaskNodeStatusImpl.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TaskNodeStatusImpl.java index 18e4918..de3dbf7 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TaskNodeStatusImpl.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TaskNodeStatusImpl.java @@ -65,16 +65,16 @@ public class TaskNodeStatusImpl implements TaskNodeStatus { private Type getAckedMsg(final Type msgType) { switch (msgType) { - case ParentAdded: - return Type.ParentAdd; - case ChildAdded: - return Type.ChildAdd; - case ParentRemoved: - return Type.ParentDead; - case ChildRemoved: - return Type.ChildDead; - default: - return msgType; + case ParentAdded: + return Type.ParentAdd; + case ChildAdded: + return Type.ChildAdd; + case ParentRemoved: + return Type.ParentDead; + case ChildRemoved: + return Type.ChildDead; + default: + return msgType; } } @@ -152,24 +152,24 @@ public class TaskNodeStatusImpl implements TaskNodeStatus { final Type msgAcked = getAckedMsg(msgType); final String sourceId = gcm.getDestid(); switch (msgType) { - case TopologySetup: + case TopologySetup: synchronized (topoUpdateStageLock) { - if (!updatingTopo.compareAndSet(true, false)) { - LOG.fine(getQualifiedName() + "Was expecting updateTopo to be true but it was false"); - } - topoUpdateStageLock.notifyAll(); - } - break; - case ParentAdded: - case ChildAdded: - case ParentRemoved: - case ChildRemoved: - processNeighborAcks(gcm, msgType, msgAcked, sourceId); - break; + if (!updatingTopo.compareAndSet(true, false)) { + LOG.fine(getQualifiedName() + "Was expecting updateTopo to be true but it was false"); + } + topoUpdateStageLock.notifyAll(); + } + break; + case ParentAdded: + case ChildAdded: + case ParentRemoved: + case ChildRemoved: + processNeighborAcks(gcm, msgType, msgAcked, sourceId); + break; - default: - LOG.fine(getQualifiedName() + "Non ACK msg " + gcm.getType() + " for " + gcm.getDestid() + " unexpected"); - break; + default: + LOG.fine(getQualifiedName() + "Non ACK msg " + gcm.getType() + " for " + gcm.getDestid() + " unexpected"); + break; } LOG.exiting("TaskNodeStatusImpl", "processMsg", getQualifiedName()); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1c5926d3/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TreeTopology.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TreeTopology.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TreeTopology.java index 780a02d..f0366ec 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TreeTopology.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/driver/TreeTopology.java @@ -273,16 +273,16 @@ public class TreeTopology implements Topology { public void onReceiptOfMessage(final GroupCommunicationMessage msg) { LOG.entering("TreeTopology", "onReceiptOfMessage", new Object[]{getQualifiedName(), msg}); switch (msg.getType()) { - case TopologyChanges: - onTopologyChanges(msg); - break; - case UpdateTopology: - onUpdateTopology(msg); - break; - - default: - nodes.get(msg.getSrcid()).onReceiptOfAcknowledgement(msg); - break; + case TopologyChanges: + onTopologyChanges(msg); + break; + case UpdateTopology: + onUpdateTopology(msg); + break; + + default: + nodes.get(msg.getSrcid()).onReceiptOfAcknowledgement(msg); + break; } LOG.exiting("TreeTopology", "onReceiptOfMessage", getQualifiedName() + msg); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1c5926d3/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/OperatorTopologyImpl.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/OperatorTopologyImpl.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/OperatorTopologyImpl.java index 50faa82..a5c6baa 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/OperatorTopologyImpl.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/OperatorTopologyImpl.java @@ -123,43 +123,43 @@ public class OperatorTopologyImpl implements OperatorTopology { if (isMsgVersionOk(msg)) { try { switch (msg.getType()) { - case UpdateTopology: - updatingTopo.set(true); - baseTopologyUpdateStage.onNext(msg); - topologyLockAquired.awaitAndReset(1); - LOG.finest(getQualifiedName() + "topoLockAquired CDL released. Resetting it to new CDL"); - sendAckToDriver(msg); - break; - - case TopologySetup: - LOG.finest(getQualifiedName() + "Adding to deltas queue"); - deltas.put(msg); - break; - - case ParentAdd: - case ChildAdd: - LOG.finest(getQualifiedName() + "Adding to deltas queue"); - deltas.put(msg); - break; - - case ParentDead: - case ChildDead: - LOG.finest(getQualifiedName() + "Adding to deltas queue"); - deltas.put(msg); - - LOG.finest(getQualifiedName() + "Adding to deletionDeltas queue"); - deletionDeltas.put(msg); - - if (effectiveTopology != null) { - LOG.finest(getQualifiedName() + "Adding as data msg to non-null effective topology struct"); - effectiveTopology.addAsData(msg); - } else { - LOG.fine(getQualifiedName() + "Received a death message before effective topology was setup. CAUTION"); - } - break; - - default: - dataHandlingStage.onNext(msg); + case UpdateTopology: + updatingTopo.set(true); + baseTopologyUpdateStage.onNext(msg); + topologyLockAquired.awaitAndReset(1); + LOG.finest(getQualifiedName() + "topoLockAquired CDL released. Resetting it to new CDL"); + sendAckToDriver(msg); + break; + + case TopologySetup: + LOG.finest(getQualifiedName() + "Adding to deltas queue"); + deltas.put(msg); + break; + + case ParentAdd: + case ChildAdd: + LOG.finest(getQualifiedName() + "Adding to deltas queue"); + deltas.put(msg); + break; + + case ParentDead: + case ChildDead: + LOG.finest(getQualifiedName() + "Adding to deltas queue"); + deltas.put(msg); + + LOG.finest(getQualifiedName() + "Adding to deletionDeltas queue"); + deletionDeltas.put(msg); + + if (effectiveTopology != null) { + LOG.finest(getQualifiedName() + "Adding as data msg to non-null effective topology struct"); + effectiveTopology.addAsData(msg); + } else { + LOG.fine(getQualifiedName() + "Received a death message before effective topology was setup. CAUTION"); + } + break; + + default: + dataHandlingStage.onNext(msg); } } catch (final InterruptedException e) { throw new RuntimeException("InterruptedException while trying to put ctrl msg into delta queue", e); @@ -323,28 +323,28 @@ public class OperatorTopologyImpl implements OperatorTopology { if (msg.hasVersion()) { final int srcVersion = msg.getSrcVersion(); switch (msg.getType()) { - case UpdateTopology: - sender.send(Utils.bldVersionedGCM(groupName, operName, ReefNetworkGroupCommProtos.GroupCommMessage.Type.TopologySetup, selfId, this.version, driverId, + case UpdateTopology: + sender.send(Utils.bldVersionedGCM(groupName, operName, ReefNetworkGroupCommProtos.GroupCommMessage.Type.TopologySetup, selfId, this.version, driverId, srcVersion, Utils.EMPTY_BYTE_ARR)); - break; - case ParentAdd: - sender.send(Utils.bldVersionedGCM(groupName, operName, ReefNetworkGroupCommProtos.GroupCommMessage.Type.ParentAdded, selfId, this.version, srcId, + break; + case ParentAdd: + sender.send(Utils.bldVersionedGCM(groupName, operName, ReefNetworkGroupCommProtos.GroupCommMessage.Type.ParentAdded, selfId, this.version, srcId, srcVersion, Utils.EMPTY_BYTE_ARR), driverId); - break; - case ParentDead: - sender.send(Utils.bldVersionedGCM(groupName, operName, ReefNetworkGroupCommProtos.GroupCommMessage.Type.ParentRemoved, selfId, this.version, srcId, + break; + case ParentDead: + sender.send(Utils.bldVersionedGCM(groupName, operName, ReefNetworkGroupCommProtos.GroupCommMessage.Type.ParentRemoved, selfId, this.version, srcId, srcVersion, Utils.EMPTY_BYTE_ARR), driverId); - break; - case ChildAdd: - sender.send(Utils.bldVersionedGCM(groupName, operName, ReefNetworkGroupCommProtos.GroupCommMessage.Type.ChildAdded, selfId, this.version, srcId, + break; + case ChildAdd: + sender.send(Utils.bldVersionedGCM(groupName, operName, ReefNetworkGroupCommProtos.GroupCommMessage.Type.ChildAdded, selfId, this.version, srcId, srcVersion, Utils.EMPTY_BYTE_ARR), driverId); - break; - case ChildDead: - sender.send(Utils.bldVersionedGCM(groupName, operName, ReefNetworkGroupCommProtos.GroupCommMessage.Type.ChildRemoved, selfId, this.version, srcId, + break; + case ChildDead: + sender.send(Utils.bldVersionedGCM(groupName, operName, ReefNetworkGroupCommProtos.GroupCommMessage.Type.ChildRemoved, selfId, this.version, srcId, srcVersion, Utils.EMPTY_BYTE_ARR), driverId); - break; - default: - throw new RuntimeException("Received a non control message for acknowledgement"); + break; + default: + throw new RuntimeException("Received a non control message for acknowledgement"); } } else { throw new RuntimeException(getQualifiedName() + "Ack Sender can only deal with versioned msgs"); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1c5926d3/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/OperatorTopologyStructImpl.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/OperatorTopologyStructImpl.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/OperatorTopologyStructImpl.java index c0b3c10..90d3b7c 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/OperatorTopologyStructImpl.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/group/impl/task/OperatorTopologyStructImpl.java @@ -397,20 +397,20 @@ public class OperatorTopologyStructImpl implements OperatorTopologyStruct { LOG.finest(getQualifiedName() + "Before update: parent=" + ((parent != null) ? parent.getId() : "NULL")); LOG.finest(getQualifiedName() + "Before update: children=" + children); switch (msg.getType()) { - case ParentAdd: - updateParentAdd(srcId, srcVersion); - break; - case ParentDead: - updateParentDead(srcId, srcVersion); - break; - case ChildAdd: - updateChildAdd(srcId, srcVersion); - break; - case ChildDead: - updateChildDead(srcId, srcVersion); - break; - default: - throw new RuntimeException("Received a non control message in update"); + case ParentAdd: + updateParentAdd(srcId, srcVersion); + break; + case ParentDead: + updateParentDead(srcId, srcVersion); + break; + case ChildAdd: + updateChildAdd(srcId, srcVersion); + break; + case ChildDead: + updateChildDead(srcId, srcVersion); + break; + default: + throw new RuntimeException("Received a non control message in update"); } LOG.finest(getQualifiedName() + "After update: parent=" + ((parent != null) ? parent.getId() : "NULL")); LOG.finest(getQualifiedName() + "After update: children=" + children); http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1c5926d3/lang/java/reef-io/src/main/java/org/apache/reef/io/network/impl/NetworkService.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/impl/NetworkService.java b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/impl/NetworkService.java index 1e3887e..db9e740 100644 --- a/lang/java/reef-io/src/main/java/org/apache/reef/io/network/impl/NetworkService.java +++ b/lang/java/reef-io/src/main/java/org/apache/reef/io/network/impl/NetworkService.java @@ -186,33 +186,33 @@ public final class NetworkService<T> implements Stage, ConnectionFactory<T> { this.nameServiceRegisteringStage = new SingleThreadStage<>( "NameServiceRegisterer", new EventHandler<Tuple<Identifier, InetSocketAddress>>() { - @Override - public void onNext(final Tuple<Identifier, InetSocketAddress> tuple) { - try { - nameResolver.register(tuple.getKey(), tuple.getValue()); - LOG.log(Level.FINEST, "Registered {0} with nameservice", tuple.getKey()); - } catch (final Exception ex) { - final String msg = "Unable to register " + tuple.getKey() + "with name service"; - LOG.log(Level.WARNING, msg, ex); - throw new RuntimeException(msg, ex); - } - } - }, 5); + @Override + public void onNext(final Tuple<Identifier, InetSocketAddress> tuple) { + try { + nameResolver.register(tuple.getKey(), tuple.getValue()); + LOG.log(Level.FINEST, "Registered {0} with nameservice", tuple.getKey()); + } catch (final Exception ex) { + final String msg = "Unable to register " + tuple.getKey() + "with name service"; + LOG.log(Level.WARNING, msg, ex); + throw new RuntimeException(msg, ex); + } + } + }, 5); this.nameServiceUnregisteringStage = new SingleThreadStage<>( "NameServiceRegisterer", new EventHandler<Identifier>() { - @Override - public void onNext(final Identifier id) { - try { - nameResolver.unregister(id); - LOG.log(Level.FINEST, "Unregistered {0} with nameservice", id); - } catch (final Exception ex) { - final String msg = "Unable to unregister " + id + " with name service"; - LOG.log(Level.WARNING, msg, ex); - throw new RuntimeException(msg, ex); - } - } - }, 5); + @Override + public void onNext(final Identifier id) { + try { + nameResolver.unregister(id); + LOG.log(Level.FINEST, "Unregistered {0} with nameservice", id); + } catch (final Exception ex) { + final String msg = "Unable to unregister " + id + " with name service"; + LOG.log(Level.WARNING, msg, ex); + throw new RuntimeException(msg, ex); + } + } + }, 5); } public void registerId(final Identifier id) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1c5926d3/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/Commands.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/Commands.java b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/Commands.java index 3cae81e..0dec2b4 100644 --- a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/Commands.java +++ b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/Commands.java @@ -33,34 +33,34 @@ import java.io.StringWriter; */ public final class Commands { - public static final String DEFAULT_COMMAND = ""; + public static final String DEFAULT_COMMAND = ""; - private static final String COMMANDS = "commands"; - private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); + private static final String COMMANDS = "commands"; + private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); - private String command = DEFAULT_COMMAND; + private String command = DEFAULT_COMMAND; - @JsonProperty(Constants.COMMAND) + @JsonProperty(Constants.COMMAND) @JsonSerialize(include = JsonSerialize.Inclusion.NON_EMPTY) public String getCommand() { - return this.command; - } + return this.command; + } - public void setCommand(final String command) { - this.command = command; - } + public void setCommand(final String command) { + this.command = command; + } - @Override + @Override public String toString() { - StringWriter writer = new StringWriter(); - String objectString; - try { - OBJECT_MAPPER.writeValue(writer, this); - objectString = writer.toString(); - } catch (IOException e) { - return null; - } - - return COMMANDS + objectString; + StringWriter writer = new StringWriter(); + String objectString; + try { + OBJECT_MAPPER.writeValue(writer, this); + objectString = writer.toString(); + } catch (IOException e) { + return null; } + + return COMMANDS + objectString; + } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1c5926d3/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/Constants.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/Constants.java b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/Constants.java index ca61619..6782451 100644 --- a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/Constants.java +++ b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/Constants.java @@ -25,60 +25,60 @@ package org.apache.reef.runtime.hdinsight.client.yarnrest; * https://hadoop.apache.org/docs/r2.6.0/hadoop-yarn/hadoop-yarn-site/ResourceManagerRest.html */ public final class Constants { - public static final String ID = "id"; - public static final String MAXIMUM_RESOURCE_CAPABILITY = "maximum-resource-capability"; - public static final String APPLICATION_ID = "application-id"; - public static final String APPLICATION_NAME = "application-name"; - public static final String UNMANAGED_AM = "unmanaged-AM"; - public static final String MAX_APP_ATTEMPTS = "max-app-attempts"; - public static final String APPLICATION_TYPE = "application-type"; - public static final String AM_CONTAINER_SPEC = "am-container-spec"; - public static final String KEEP_CONTAINERS_ACROSS_APPLICATION_ATTEMPTS = "keep-containers-across-application-attempts"; - public static final String APPLICATION_TAGS = "application-tags"; - public static final String QUEUE = "queue"; - public static final String RESOURCE = "resource"; - public static final String PRIORITY = "priority"; - public static final String LOCAL_RESOURCES = "local-resources"; - public static final String ENVIRONMENT = "environment"; - public static final String COMMANDS = "commands"; - public static final String COMMAND = "command"; - public static final String ENTRY = "entry"; - public static final String KEY = "key"; - public static final String VALUE = "value"; - public static final String APPLICATION_ACLS = "application-acls"; - public static final String SERVICE_DATA = "service-data"; - public static final String CREDENTIALS = "credentials"; - public static final String SECRETS = "secrets"; - public static final String TOKENS = "tokens"; - public static final String TYPE = "type"; - public static final String VISIBILITY = "visibility"; - public static final String SIZE = "size"; - public static final String TIMESTAMP = "timestamp"; - public static final String MEMORY = "memory"; - public static final String VCORES = "vCores"; - public static final String APPS = "apps"; - public static final String APP = "app"; - public static final String FINISHED_TIME = "finishedTime"; - public static final String AM_CONTAINER_LOGS = "amContainerLogs"; - public static final String TRACKING_UI = "trackingUI"; - public static final String RESPONSE_APPLICATION_TYPE = "applicationType"; - public static final String STATE = "state"; - public static final String USER = "user"; - public static final String CLUSTER_ID = "clusterId"; - public static final String FINAL_STATUS = "finalStatus"; - public static final String AM_HOST_HTTP_ADDRESS = "amHostHttpAddress"; - public static final String PROGRESS = "progress"; - public static final String NAME = "name"; - public static final String STARTED_TIME = "startedTime"; - public static final String ELAPSED_TIME = "elapsedTime"; - public static final String DIAGNOSTICS = "diagnostics"; - public static final String TRACKING_URL = "trackingUrl"; - public static final String ALLOCATED_MB = "allocatedMB"; - public static final String ALLOCATED_VCORES = "allocatedVCores"; - public static final String RUNNING_CONTAINERS = "runningContainers"; - public static final String MEMORY_SECONDS = "memorySeconds"; - public static final String VCORE_SECONDS = "vcoreSeconds"; + public static final String ID = "id"; + public static final String MAXIMUM_RESOURCE_CAPABILITY = "maximum-resource-capability"; + public static final String APPLICATION_ID = "application-id"; + public static final String APPLICATION_NAME = "application-name"; + public static final String UNMANAGED_AM = "unmanaged-AM"; + public static final String MAX_APP_ATTEMPTS = "max-app-attempts"; + public static final String APPLICATION_TYPE = "application-type"; + public static final String AM_CONTAINER_SPEC = "am-container-spec"; + public static final String KEEP_CONTAINERS_ACROSS_APPLICATION_ATTEMPTS = "keep-containers-across-application-attempts"; + public static final String APPLICATION_TAGS = "application-tags"; + public static final String QUEUE = "queue"; + public static final String RESOURCE = "resource"; + public static final String PRIORITY = "priority"; + public static final String LOCAL_RESOURCES = "local-resources"; + public static final String ENVIRONMENT = "environment"; + public static final String COMMANDS = "commands"; + public static final String COMMAND = "command"; + public static final String ENTRY = "entry"; + public static final String KEY = "key"; + public static final String VALUE = "value"; + public static final String APPLICATION_ACLS = "application-acls"; + public static final String SERVICE_DATA = "service-data"; + public static final String CREDENTIALS = "credentials"; + public static final String SECRETS = "secrets"; + public static final String TOKENS = "tokens"; + public static final String TYPE = "type"; + public static final String VISIBILITY = "visibility"; + public static final String SIZE = "size"; + public static final String TIMESTAMP = "timestamp"; + public static final String MEMORY = "memory"; + public static final String VCORES = "vCores"; + public static final String APPS = "apps"; + public static final String APP = "app"; + public static final String FINISHED_TIME = "finishedTime"; + public static final String AM_CONTAINER_LOGS = "amContainerLogs"; + public static final String TRACKING_UI = "trackingUI"; + public static final String RESPONSE_APPLICATION_TYPE = "applicationType"; + public static final String STATE = "state"; + public static final String USER = "user"; + public static final String CLUSTER_ID = "clusterId"; + public static final String FINAL_STATUS = "finalStatus"; + public static final String AM_HOST_HTTP_ADDRESS = "amHostHttpAddress"; + public static final String PROGRESS = "progress"; + public static final String NAME = "name"; + public static final String STARTED_TIME = "startedTime"; + public static final String ELAPSED_TIME = "elapsedTime"; + public static final String DIAGNOSTICS = "diagnostics"; + public static final String TRACKING_URL = "trackingUrl"; + public static final String ALLOCATED_MB = "allocatedMB"; + public static final String ALLOCATED_VCORES = "allocatedVCores"; + public static final String RUNNING_CONTAINERS = "runningContainers"; + public static final String MEMORY_SECONDS = "memorySeconds"; + public static final String VCORE_SECONDS = "vcoreSeconds"; - private Constants() { - } + private Constants() { + } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1c5926d3/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/Credentials.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/Credentials.java b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/Credentials.java index e35a794..32d4bcd 100644 --- a/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/Credentials.java +++ b/lang/java/reef-runtime-hdinsight/src/main/java/org/apache/reef/runtime/hdinsight/client/yarnrest/Credentials.java @@ -36,66 +36,66 @@ import java.util.Map; */ public class Credentials { - private static final String CREDENTIALS = "credentials"; - private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); + private static final String CREDENTIALS = "credentials"; + private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); - private Map<String, List<StringEntry>> tokens = new HashMap<>(); - private Map<String, List<StringEntry>> secrets = new HashMap<>(); + private Map<String, List<StringEntry>> tokens = new HashMap<>(); + private Map<String, List<StringEntry>> secrets = new HashMap<>(); - public Credentials() { - this.tokens.put(Constants.ENTRY, new ArrayList<StringEntry>()); - this.secrets.put(Constants.ENTRY, new ArrayList<StringEntry>()); - } + public Credentials() { + this.tokens.put(Constants.ENTRY, new ArrayList<StringEntry>()); + this.secrets.put(Constants.ENTRY, new ArrayList<StringEntry>()); + } - public Credentials addSecret(String key, String value) { - if (!this.secrets.containsKey(Constants.ENTRY)) { - this.secrets.put(Constants.ENTRY, new ArrayList<StringEntry>()); - } - this.secrets.get(Constants.ENTRY).add(new StringEntry(key, value)); - return this; + public Credentials addSecret(String key, String value) { + if (!this.secrets.containsKey(Constants.ENTRY)) { + this.secrets.put(Constants.ENTRY, new ArrayList<StringEntry>()); } + this.secrets.get(Constants.ENTRY).add(new StringEntry(key, value)); + return this; + } - public Credentials addToken(String key, String value) { - if (!this.tokens.containsKey(Constants.ENTRY)) { - this.tokens.put(Constants.ENTRY, new ArrayList<StringEntry>()); - } - this.tokens.get(Constants.ENTRY).add(new StringEntry(key, value)); - return this; + public Credentials addToken(String key, String value) { + if (!this.tokens.containsKey(Constants.ENTRY)) { + this.tokens.put(Constants.ENTRY, new ArrayList<StringEntry>()); } + this.tokens.get(Constants.ENTRY).add(new StringEntry(key, value)); + return this; + } - @JsonProperty(Constants.SECRETS) + @JsonProperty(Constants.SECRETS) @JsonSerialize(include = JsonSerialize.Inclusion.NON_DEFAULT) public Map<String, List<StringEntry>> getSecrets() { - return this.secrets; - } + return this.secrets; + } - public Credentials setSecrets(final Map<String, List<StringEntry>> secrets) { - this.secrets = secrets; - return this; - } + public Credentials setSecrets(final Map<String, List<StringEntry>> secrets) { + this.secrets = secrets; + return this; + } - @JsonProperty(Constants.TOKENS) + @JsonProperty(Constants.TOKENS) @JsonSerialize(include = JsonSerialize.Inclusion.NON_DEFAULT) public Map<String, List<StringEntry>> getTokens() { - return this.tokens; - } + return this.tokens; + } - public Credentials setTokens(final Map<String, List<StringEntry>> tokens) { - this.tokens = tokens; - return this; - } + public Credentials setTokens(final Map<String, List<StringEntry>> tokens) { + this.tokens = tokens; + return this; + } - @Override + @Override public String toString() { - StringWriter writer = new StringWriter(); - String objectString; - try { - OBJECT_MAPPER.writeValue(writer, this); - objectString = writer.toString(); - } catch (IOException e) { - return null; - } - - return CREDENTIALS + objectString; + StringWriter writer = new StringWriter(); + String objectString; + try { + OBJECT_MAPPER.writeValue(writer, this); + objectString = writer.toString(); + } catch (IOException e) { + return null; } + + return CREDENTIALS + objectString; + } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/1c5926d3/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/parameters/RackNames.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/parameters/RackNames.java b/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/parameters/RackNames.java index e070d58..04051c2 100644 --- a/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/parameters/RackNames.java +++ b/lang/java/reef-runtime-local/src/main/java/org/apache/reef/runtime/local/client/parameters/RackNames.java @@ -28,6 +28,6 @@ import java.util.Set; */ @NamedParameter(short_name = "racks", doc = "The name of the racks the containers will be placed on", default_values = {RackNames.DEFAULT_RACK_NAME}) public final class RackNames implements Name<Set<String>> { - private RackNames() {} - public static final String DEFAULT_RACK_NAME = "/default-rack"; + private RackNames() {} + public static final String DEFAULT_RACK_NAME = "/default-rack"; }
