Repository: incubator-myriad Updated Branches: refs/heads/master c47dc2359 -> df7d05c86
http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/df7d05c8/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/yarn/RMNodeEventHandler.java ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/yarn/RMNodeEventHandler.java b/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/yarn/RMNodeEventHandler.java index 1a63553..c369a4d 100644 --- a/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/yarn/RMNodeEventHandler.java +++ b/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/yarn/RMNodeEventHandler.java @@ -18,10 +18,10 @@ */ package org.apache.myriad.scheduler.yarn; -import org.apache.myriad.scheduler.yarn.interceptor.YarnSchedulerInterceptor; import org.apache.hadoop.yarn.event.EventHandler; import org.apache.hadoop.yarn.server.resourcemanager.RMContext; import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNodeEvent; +import org.apache.myriad.scheduler.yarn.interceptor.YarnSchedulerInterceptor; /** * Passes the {@link RMNodeEvent} events into the {@link YarnSchedulerInterceptor}. http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/df7d05c8/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/yarn/interceptor/BaseInterceptor.java ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/yarn/interceptor/BaseInterceptor.java b/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/yarn/interceptor/BaseInterceptor.java index ba4dec3..50b5b03 100644 --- a/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/yarn/interceptor/BaseInterceptor.java +++ b/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/yarn/interceptor/BaseInterceptor.java @@ -18,6 +18,7 @@ */ package org.apache.myriad.scheduler.yarn.interceptor; +import java.io.IOException; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.yarn.api.records.NodeId; import org.apache.hadoop.yarn.server.resourcemanager.RMContext; @@ -25,8 +26,6 @@ import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNodeEvent; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.AbstractYarnScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.SchedulerEvent; -import java.io.IOException; - /** * A no-op interceptor whose sole purpose is to serve as a base class * for other interceptors. Child interceptors can selectively override the http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/df7d05c8/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/yarn/interceptor/CompositeInterceptor.java ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/yarn/interceptor/CompositeInterceptor.java b/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/yarn/interceptor/CompositeInterceptor.java index 0bf1616..6ac7af7 100644 --- a/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/yarn/interceptor/CompositeInterceptor.java +++ b/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/yarn/interceptor/CompositeInterceptor.java @@ -20,6 +20,8 @@ package org.apache.myriad.scheduler.yarn.interceptor; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Maps; +import java.io.IOException; +import java.util.Map; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.yarn.api.records.NodeId; import org.apache.hadoop.yarn.server.resourcemanager.RMContext; @@ -30,13 +32,9 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.NodeRemoved import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.NodeResourceUpdateSchedulerEvent; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.NodeUpdateSchedulerEvent; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.SchedulerEvent; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; -import java.util.Map; - /** * An interceptor that wraps other interceptors. The Myriad{Fair,Capacity,Fifo}Scheduler classes * instantiate this class and allow interception of the Yarn scheduler events/method calls. http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/df7d05c8/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/yarn/interceptor/MyriadInitializationInterceptor.java ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/yarn/interceptor/MyriadInitializationInterceptor.java b/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/yarn/interceptor/MyriadInitializationInterceptor.java index fa3e690..150f9fd 100644 --- a/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/yarn/interceptor/MyriadInitializationInterceptor.java +++ b/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/yarn/interceptor/MyriadInitializationInterceptor.java @@ -18,16 +18,14 @@ */ package org.apache.myriad.scheduler.yarn.interceptor; -import org.apache.myriad.Main; +import java.io.IOException; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.yarn.server.resourcemanager.RMContext; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.AbstractYarnScheduler; - +import org.apache.myriad.Main; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; - /** * Responsible for intializing myriad. */ http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/df7d05c8/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/yarn/interceptor/YarnSchedulerInterceptor.java ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/yarn/interceptor/YarnSchedulerInterceptor.java b/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/yarn/interceptor/YarnSchedulerInterceptor.java index 92a4b0f..2cda0d3 100644 --- a/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/yarn/interceptor/YarnSchedulerInterceptor.java +++ b/myriad-scheduler/src/main/java/org/apache/myriad/scheduler/yarn/interceptor/YarnSchedulerInterceptor.java @@ -18,6 +18,7 @@ */ package org.apache.myriad.scheduler.yarn.interceptor; +import java.io.IOException; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.yarn.api.records.NodeId; import org.apache.hadoop.yarn.server.resourcemanager.RMContext; @@ -27,8 +28,6 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.AbstractYarnSched import org.apache.hadoop.yarn.server.resourcemanager.scheduler.YarnScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.SchedulerEvent; -import java.io.IOException; - /** * Allows interception of YARN's scheduler events (or methods). */ http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/df7d05c8/myriad-scheduler/src/main/java/org/apache/myriad/state/Cluster.java ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/main/java/org/apache/myriad/state/Cluster.java b/myriad-scheduler/src/main/java/org/apache/myriad/state/Cluster.java index 07604bc..a5ccca7 100644 --- a/myriad-scheduler/src/main/java/org/apache/myriad/state/Cluster.java +++ b/myriad-scheduler/src/main/java/org/apache/myriad/state/Cluster.java @@ -19,7 +19,6 @@ package org.apache.myriad.state; import com.google.gson.Gson; - import java.util.Collection; import java.util.HashSet; import java.util.UUID; http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/df7d05c8/myriad-scheduler/src/main/java/org/apache/myriad/state/MyriadState.java ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/main/java/org/apache/myriad/state/MyriadState.java b/myriad-scheduler/src/main/java/org/apache/myriad/state/MyriadState.java index cc1a10f..2f99720 100644 --- a/myriad-scheduler/src/main/java/org/apache/myriad/state/MyriadState.java +++ b/myriad-scheduler/src/main/java/org/apache/myriad/state/MyriadState.java @@ -19,13 +19,11 @@ package org.apache.myriad.state; import com.google.protobuf.InvalidProtocolBufferException; - +import java.util.concurrent.ExecutionException; import org.apache.mesos.Protos; import org.apache.mesos.state.State; import org.apache.mesos.state.Variable; -import java.util.concurrent.ExecutionException; - /** * Model that represents the state of Myriad */ http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/df7d05c8/myriad-scheduler/src/main/java/org/apache/myriad/state/NodeTask.java ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/main/java/org/apache/myriad/state/NodeTask.java b/myriad-scheduler/src/main/java/org/apache/myriad/state/NodeTask.java index f5822e9..3a4ee56 100644 --- a/myriad-scheduler/src/main/java/org/apache/myriad/state/NodeTask.java +++ b/myriad-scheduler/src/main/java/org/apache/myriad/state/NodeTask.java @@ -19,12 +19,13 @@ package org.apache.myriad.state; import com.fasterxml.jackson.annotation.JsonProperty; -import java.util.List; -import org.apache.myriad.scheduler.ServiceResourceProfile; import com.google.inject.Inject; - +import java.util.List; import org.apache.mesos.Protos; import org.apache.mesos.Protos.Attribute; +import org.apache.myriad.scheduler.ServiceResourceProfile; +import org.apache.myriad.scheduler.TaskUtils; +import org.apache.myriad.scheduler.constraints.Constraint; /** * Represents a task to be launched by the executor @@ -42,16 +43,16 @@ public class NodeTask { private ServiceResourceProfile serviceresourceProfile; @Inject - org.apache.myriad.scheduler.TaskUtils taskUtils; + TaskUtils taskUtils; /** * Mesos executor for this node. */ private Protos.ExecutorInfo executorInfo; - private org.apache.myriad.scheduler.constraints.Constraint constraint; + private Constraint constraint; private List<Attribute> slaveAttributes; - public NodeTask(ServiceResourceProfile profile, org.apache.myriad.scheduler.constraints.Constraint constraint) { + public NodeTask(ServiceResourceProfile profile, Constraint constraint) { this.serviceresourceProfile = profile; this.hostname = ""; this.constraint = constraint; @@ -65,7 +66,7 @@ public class NodeTask { this.slaveId = slaveId; } - public org.apache.myriad.scheduler.constraints.Constraint getConstraint() { + public Constraint getConstraint() { return constraint; } http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/df7d05c8/myriad-scheduler/src/main/java/org/apache/myriad/state/SchedulerState.java ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/main/java/org/apache/myriad/state/SchedulerState.java b/myriad-scheduler/src/main/java/org/apache/myriad/state/SchedulerState.java index fe3fd67..0e2a18e 100644 --- a/myriad-scheduler/src/main/java/org/apache/myriad/state/SchedulerState.java +++ b/myriad-scheduler/src/main/java/org/apache/myriad/state/SchedulerState.java @@ -18,10 +18,7 @@ */ package org.apache.myriad.state; -import org.apache.myriad.scheduler.ServiceResourceProfile; -import org.apache.myriad.state.utils.StoreContext; import com.google.common.collect.Sets; - import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -33,10 +30,11 @@ import java.util.Set; import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; import java.util.regex.Pattern; - import org.apache.commons.collections.CollectionUtils; import org.apache.mesos.Protos; import org.apache.mesos.Protos.SlaveID; +import org.apache.myriad.scheduler.ServiceResourceProfile; +import org.apache.myriad.state.utils.StoreContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -72,10 +70,12 @@ public class SchedulerState { return; } for (NodeTask node : nodes) { - Protos.TaskID taskId = Protos.TaskID.newBuilder().setValue(String.format("%s.%s.%s", node.getTaskPrefix(), node.getProfile().getName(), UUID.randomUUID())).build(); + Protos.TaskID taskId = Protos.TaskID.newBuilder().setValue(String.format("%s.%s.%s", node.getTaskPrefix(), + node.getProfile().getName(), UUID.randomUUID())).build(); addTask(taskId, node); SchedulerStateForType taskState = this.statesForTaskType.get(node.getTaskPrefix()); - LOGGER.info("Marked taskId {} pending, size of pending queue for {} is: {}", taskId.getValue(), node.getTaskPrefix(), (taskState == null ? 0 : taskState.getPendingTaskIds().size())); + LOGGER.info("Marked taskId {} pending, size of pending queue for {} is: {}", taskId.getValue(), node.getTaskPrefix(), + (taskState == null ? 0 : taskState.getPendingTaskIds().size())); makeTaskPending(taskId); } @@ -369,7 +369,8 @@ public class SchedulerState { } try { - StoreContext sc = new StoreContext(frameworkId, tasks, getPendingTaskIds(), getStagingTaskIds(), getActiveTaskIds(), getLostTaskIds(), getKillableTasks()); + StoreContext sc = new StoreContext(frameworkId, tasks, getPendingTaskIds(), getStagingTaskIds(), getActiveTaskIds(), + getLostTaskIds(), getKillableTasks()); stateStore.storeMyriadState(sc); } catch (Exception e) { LOGGER.error("Failed to update scheduler state to state store", e); @@ -393,10 +394,10 @@ public class SchedulerState { convertToThis(TaskState.LOST, sc.getLostTasks()); convertToThis(TaskState.KILLABLE, sc.getKillableTasks()); LOGGER.info("Loaded Myriad state from state store successfully."); - LOGGER.debug("State Store state includes " + - "frameworkId: {}, pending tasks count: {}, staging tasks count: {} " + - "active tasks count: {}, lost tasks count: {}, " + - "and killable tasks count: {}", frameworkId.getValue(), this.getPendingTaskIds().size(), this.getStagingTaskIds().size(), this.getActiveTaskIds().size(), this.getLostTaskIds().size(), this.getKillableTasks().size()); + LOGGER.debug("State Store state includes frameworkId: {}, pending tasks count: {}, staging tasks count: {} " + + "active tasks count: {}, lost tasks count: {}, and killable tasks count: {}", frameworkId.getValue(), + this.getPendingTaskIds().size(), this.getStagingTaskIds().size(), this.getActiveTaskIds().size(), + this.getLostTaskIds().size(), this.getKillableTasks().size()); } } catch (Exception e) { LOGGER.error("Failed to read scheduler state from state store", e); http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/df7d05c8/myriad-scheduler/src/main/java/org/apache/myriad/state/utils/ByteBufferSupport.java ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/main/java/org/apache/myriad/state/utils/ByteBufferSupport.java b/myriad-scheduler/src/main/java/org/apache/myriad/state/utils/ByteBufferSupport.java index 9fb2490..b473b9e 100644 --- a/myriad-scheduler/src/main/java/org/apache/myriad/state/utils/ByteBufferSupport.java +++ b/myriad-scheduler/src/main/java/org/apache/myriad/state/utils/ByteBufferSupport.java @@ -19,24 +19,22 @@ package org.apache.myriad.state.utils; -import org.apache.myriad.scheduler.constraints.Constraint; -import org.apache.myriad.scheduler.constraints.Constraint.Type; -import org.apache.myriad.scheduler.constraints.LikeConstraint; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.protobuf.GeneratedMessage; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.ArrayList; import java.util.List; - import org.apache.commons.lang3.StringUtils; import org.apache.mesos.Protos; - import org.apache.myriad.scheduler.ServiceResourceProfile; +import org.apache.myriad.scheduler.constraints.Constraint; +import org.apache.myriad.scheduler.constraints.Constraint.Type; +import org.apache.myriad.scheduler.constraints.LikeConstraint; import org.apache.myriad.state.NodeTask; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.protobuf.GeneratedMessage; /** * ByteBuffer support for the Serialization of the StoreContext @@ -47,7 +45,8 @@ public class ByteBufferSupport { public static final String UTF8 = "UTF-8"; public static final byte[] ZERO_BYTES = new byte[0]; private static Gson gson = new Gson(); - private static Gson gsonCustom = new GsonBuilder().registerTypeAdapter(ServiceResourceProfile.class, new ServiceResourceProfile.CustomDeserializer()).create(); + private static Gson gsonCustom = new GsonBuilder().registerTypeAdapter(ServiceResourceProfile.class, + new ServiceResourceProfile.CustomDeserializer()).create(); public static void addByteBuffers(List<ByteBuffer> list, ByteArrayOutputStream bytes) throws IOException { // If list, add the list size, then the size of each buffer followed by the buffer. http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/df7d05c8/myriad-scheduler/src/main/java/org/apache/myriad/state/utils/StoreContext.java ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/main/java/org/apache/myriad/state/utils/StoreContext.java b/myriad-scheduler/src/main/java/org/apache/myriad/state/utils/StoreContext.java index feebff9..ba385b6 100644 --- a/myriad-scheduler/src/main/java/org/apache/myriad/state/utils/StoreContext.java +++ b/myriad-scheduler/src/main/java/org/apache/myriad/state/utils/StoreContext.java @@ -30,9 +30,9 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; import java.util.regex.Pattern; - import org.apache.mesos.Protos; import org.apache.mesos.Protos.TaskID; +import org.apache.myriad.state.NodeTask; /** * The purpose of this container/utility is to create a mechanism to serialize the SchedulerState @@ -63,8 +63,9 @@ public final class StoreContext { * @param lostTasks * @param killableTasks */ - public StoreContext(Protos.FrameworkID frameworkId, Map<Protos.TaskID, org.apache.myriad.state.NodeTask> tasks, Set<Protos.TaskID> pendingTasks, Set<Protos.TaskID> stagingTasks, Set<Protos.TaskID> activeTasks, Set<Protos.TaskID> lostTasks, - Set<Protos.TaskID> killableTasks) { + public StoreContext(Protos.FrameworkID frameworkId, Map<Protos.TaskID, NodeTask> tasks, Set<Protos.TaskID> pendingTasks, + Set<Protos.TaskID> stagingTasks, Set<Protos.TaskID> activeTasks, Set<Protos.TaskID> lostTasks, + Set<Protos.TaskID> killableTasks) { setFrameworkId(frameworkId); setTasks(tasks); setPendingTasks(pendingTasks); @@ -86,8 +87,9 @@ public final class StoreContext { * @param lostTasks * @param killableTasks */ - public StoreContext(ByteBuffer frameworkId, List<ByteBuffer> taskIds, List<ByteBuffer> taskNodes, List<ByteBuffer> pendingTasks, List<ByteBuffer> stagingTasks, List<ByteBuffer> activeTasks, List<ByteBuffer> lostTasks, List<ByteBuffer> - killableTasks) { + public StoreContext(ByteBuffer frameworkId, List<ByteBuffer> taskIds, List<ByteBuffer> taskNodes, List<ByteBuffer> pendingTasks, + List<ByteBuffer> stagingTasks, List<ByteBuffer> activeTasks, List<ByteBuffer> lostTasks, + List<ByteBuffer> killableTasks) { this.frameworkId = frameworkId; this.taskIds = taskIds; this.taskNodes = taskNodes; @@ -148,10 +150,10 @@ public final class StoreContext { * * @param tasks */ - public void setTasks(Map<Protos.TaskID, org.apache.myriad.state.NodeTask> tasks) { + public void setTasks(Map<Protos.TaskID, NodeTask> tasks) { taskIds = new ArrayList<ByteBuffer>(tasks.size()); taskNodes = new ArrayList<ByteBuffer>(tasks.size()); - for (Entry<TaskID, org.apache.myriad.state.NodeTask> entry : tasks.entrySet()) { + for (Entry<TaskID, NodeTask> entry : tasks.entrySet()) { taskIds.add(ByteBufferSupport.toByteBuffer(entry.getKey())); taskNodes.add(ByteBufferSupport.toByteBuffer(entry.getValue())); } @@ -180,14 +182,14 @@ public final class StoreContext { * * @return */ - public Map<Protos.TaskID, org.apache.myriad.state.NodeTask> getTasks() { - Map<Protos.TaskID, org.apache.myriad.state.NodeTask> map = null; + public Map<Protos.TaskID, NodeTask> getTasks() { + Map<Protos.TaskID, NodeTask> map = null; if (taskIds != null) { - map = new HashMap<Protos.TaskID, org.apache.myriad.state.NodeTask>(taskIds.size()); + map = new HashMap<Protos.TaskID, NodeTask>(taskIds.size()); int idx = 0; for (ByteBuffer bb : taskIds) { final Protos.TaskID taskId = ByteBufferSupport.toTaskId(bb); - final org.apache.myriad.state.NodeTask task = ByteBufferSupport.toNodeTask(taskNodes.get(idx++)); + final NodeTask task = ByteBufferSupport.toNodeTask(taskNodes.get(idx++)); if (task.getTaskPrefix() == null && taskId != null) { String taskPrefix = taskIdPattern.split(taskId.getValue())[0]; task.setTaskPrefix(taskPrefix); @@ -195,7 +197,7 @@ public final class StoreContext { map.put(taskId, task); } } else { - map = new HashMap<Protos.TaskID, org.apache.myriad.state.NodeTask>(0); + map = new HashMap<Protos.TaskID, NodeTask>(0); } return map; } http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/df7d05c8/myriad-scheduler/src/main/java/org/apache/myriad/webapp/HttpConnectorProvider.java ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/main/java/org/apache/myriad/webapp/HttpConnectorProvider.java b/myriad-scheduler/src/main/java/org/apache/myriad/webapp/HttpConnectorProvider.java index fc97c75..f397a23 100644 --- a/myriad-scheduler/src/main/java/org/apache/myriad/webapp/HttpConnectorProvider.java +++ b/myriad-scheduler/src/main/java/org/apache/myriad/webapp/HttpConnectorProvider.java @@ -18,13 +18,12 @@ */ package org.apache.myriad.webapp; -import org.apache.myriad.configuration.MyriadConfiguration; import com.google.inject.Provider; +import javax.inject.Inject; +import org.apache.myriad.configuration.MyriadConfiguration; import org.mortbay.jetty.Connector; import org.mortbay.jetty.nio.SelectChannelConnector; -import javax.inject.Inject; - /** * The factory for creating the http connector for the myriad scheduler */ http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/df7d05c8/myriad-scheduler/src/main/java/org/apache/myriad/webapp/MyriadServletModule.java ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/main/java/org/apache/myriad/webapp/MyriadServletModule.java b/myriad-scheduler/src/main/java/org/apache/myriad/webapp/MyriadServletModule.java index 253f710..3aa3737 100644 --- a/myriad-scheduler/src/main/java/org/apache/myriad/webapp/MyriadServletModule.java +++ b/myriad-scheduler/src/main/java/org/apache/myriad/webapp/MyriadServletModule.java @@ -18,13 +18,13 @@ */ package org.apache.myriad.webapp; +import com.google.inject.Scopes; +import com.google.inject.servlet.ServletModule; +import com.sun.jersey.guice.spi.container.servlet.GuiceContainer; import org.apache.myriad.api.ClustersResource; import org.apache.myriad.api.ConfigurationResource; import org.apache.myriad.api.ControllerResource; import org.apache.myriad.api.SchedulerStateResource; -import com.google.inject.Scopes; -import com.google.inject.servlet.ServletModule; -import com.sun.jersey.guice.spi.container.servlet.GuiceContainer; import org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider; /** http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/df7d05c8/myriad-scheduler/src/main/java/org/apache/myriad/webapp/MyriadWebServer.java ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/main/java/org/apache/myriad/webapp/MyriadWebServer.java b/myriad-scheduler/src/main/java/org/apache/myriad/webapp/MyriadWebServer.java index 98edfba..126febc 100644 --- a/myriad-scheduler/src/main/java/org/apache/myriad/webapp/MyriadWebServer.java +++ b/myriad-scheduler/src/main/java/org/apache/myriad/webapp/MyriadWebServer.java @@ -19,12 +19,15 @@ package org.apache.myriad.webapp; import com.google.inject.servlet.GuiceFilter; +import javax.inject.Inject; import org.mortbay.jetty.Connector; import org.mortbay.jetty.Handler; import org.mortbay.jetty.Server; -import org.mortbay.jetty.servlet.*; - -import javax.inject.Inject; +import org.mortbay.jetty.servlet.Context; +import org.mortbay.jetty.servlet.DefaultServlet; +import org.mortbay.jetty.servlet.FilterHolder; +import org.mortbay.jetty.servlet.FilterMapping; +import org.mortbay.jetty.servlet.ServletHandler; /** * The myriad web server configuration for jetty http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/df7d05c8/myriad-scheduler/src/test/java/org/apache/myriad/MesosModule.java ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/test/java/org/apache/myriad/MesosModule.java b/myriad-scheduler/src/test/java/org/apache/myriad/MesosModule.java index aee04a8..73389c2 100644 --- a/myriad-scheduler/src/test/java/org/apache/myriad/MesosModule.java +++ b/myriad-scheduler/src/test/java/org/apache/myriad/MesosModule.java @@ -18,21 +18,19 @@ */ package org.apache.myriad; +import com.google.inject.AbstractModule; +import com.google.inject.Provides; +import com.google.inject.Scopes; +import com.google.inject.Singleton; import java.util.concurrent.FutureTask; - import org.apache.mesos.Protos; import org.apache.mesos.Protos.Status; import org.apache.mesos.SchedulerDriver; import org.apache.mesos.state.State; import org.apache.mesos.state.Variable; -import org.mockito.Mockito; - import org.apache.myriad.configuration.MyriadConfiguration; import org.apache.myriad.state.MyriadState; -import com.google.inject.AbstractModule; -import com.google.inject.Provides; -import com.google.inject.Scopes; -import com.google.inject.Singleton; +import org.mockito.Mockito; /** * Guice Module for Mesos objects. @@ -48,7 +46,8 @@ public class MesosModule extends AbstractModule { @Provides @Singleton - SchedulerDriver providesSchedulerDriver(org.apache.myriad.scheduler.MyriadScheduler scheduler, MyriadConfiguration cfg, org.apache.myriad.state.SchedulerState schedulerState) { + SchedulerDriver providesSchedulerDriver(org.apache.myriad.scheduler.MyriadScheduler scheduler, MyriadConfiguration cfg, + org.apache.myriad.state.SchedulerState schedulerState) { SchedulerDriver driver = Mockito.mock(SchedulerDriver.class); Mockito.when(driver.start()).thenReturn(Status.DRIVER_RUNNING); http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/df7d05c8/myriad-scheduler/src/test/java/org/apache/myriad/MultiBindingsTest.java ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/test/java/org/apache/myriad/MultiBindingsTest.java b/myriad-scheduler/src/test/java/org/apache/myriad/MultiBindingsTest.java index 66ddb15..b36f32e 100644 --- a/myriad-scheduler/src/test/java/org/apache/myriad/MultiBindingsTest.java +++ b/myriad-scheduler/src/test/java/org/apache/myriad/MultiBindingsTest.java @@ -18,17 +18,15 @@ package org.apache.myriad; -import static org.junit.Assert.*; - +import com.google.inject.Guice; +import com.google.inject.Injector; import java.util.Map; - +import org.apache.myriad.scheduler.TaskFactory; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; - -import org.apache.myriad.scheduler.TaskFactory; -import com.google.inject.Guice; -import com.google.inject.Injector; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; /** * Test for Multibindings http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/df7d05c8/myriad-scheduler/src/test/java/org/apache/myriad/MultiBindingsUsage.java ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/test/java/org/apache/myriad/MultiBindingsUsage.java b/myriad-scheduler/src/test/java/org/apache/myriad/MultiBindingsUsage.java index ecb7894..eba815d 100644 --- a/myriad-scheduler/src/test/java/org/apache/myriad/MultiBindingsUsage.java +++ b/myriad-scheduler/src/test/java/org/apache/myriad/MultiBindingsUsage.java @@ -19,9 +19,7 @@ package org.apache.myriad; import java.util.Map; - import javax.inject.Inject; - import org.apache.myriad.scheduler.TaskFactory; /** http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/df7d05c8/myriad-scheduler/src/test/java/org/apache/myriad/MyriadTestModule.java ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/test/java/org/apache/myriad/MyriadTestModule.java b/myriad-scheduler/src/test/java/org/apache/myriad/MyriadTestModule.java index 315d055..fbfb0d2 100644 --- a/myriad-scheduler/src/test/java/org/apache/myriad/MyriadTestModule.java +++ b/myriad-scheduler/src/test/java/org/apache/myriad/MyriadTestModule.java @@ -18,26 +18,16 @@ package org.apache.myriad; -import java.io.IOException; -import java.util.Map; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import org.apache.myriad.configuration.ServiceConfiguration; -import org.apache.myriad.configuration.MyriadConfiguration; -import org.apache.myriad.configuration.MyriadExecutorConfiguration; -import org.apache.myriad.configuration.NodeManagerConfiguration; -import org.apache.myriad.scheduler.TaskFactory.NMTaskFactoryImpl; -import org.apache.myriad.scheduler.NMExecutorCLGenImpl; -import org.apache.myriad.scheduler.TaskFactory; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; -import com.google.inject.AbstractModule; -import com.google.inject.Provides; -import com.google.inject.Scopes; -import com.google.inject.Singleton; -import com.google.inject.multibindings.MapBinder; +import com.fasterxml.jackson.databind.*; +import com.fasterxml.jackson.dataformat.yaml.*; +import com.google.inject.*; +import com.google.inject.multibindings.*; +import java.io.*; +import java.util.*; +import org.apache.myriad.configuration.*; +import org.apache.myriad.scheduler.*; +import org.apache.myriad.scheduler.TaskFactory.*; +import org.slf4j.*; /** * AbstractModule extension for UnitTests @@ -54,7 +44,8 @@ public class MyriadTestModule extends AbstractModule { ObjectMapper mapper = new ObjectMapper(new YAMLFactory()); try { - cfg = mapper.readValue(Thread.currentThread().getContextClassLoader().getResource("myriad-config-test-default.yml"), MyriadConfiguration.class); + cfg = mapper.readValue(Thread.currentThread().getContextClassLoader().getResource("myriad-config-test-default.yml"), + MyriadConfiguration.class); } catch (IOException e1) { LOGGER.error("IOException", e1); return; @@ -79,18 +70,18 @@ public class MyriadTestModule extends AbstractModule { e.printStackTrace(); } } else { - mapBinder.addBinding(entry.getKey()).to(org.apache.myriad.scheduler.ServiceTaskFactoryImpl.class).in(Scopes.SINGLETON); + mapBinder.addBinding(entry.getKey()).to(ServiceTaskFactoryImpl.class).in(Scopes.SINGLETON); } } } @Provides @Singleton - org.apache.myriad.scheduler.ExecutorCommandLineGenerator providesCLIGenerator(MyriadConfiguration cfg) { - org.apache.myriad.scheduler.ExecutorCommandLineGenerator cliGenerator = null; + ExecutorCommandLineGenerator providesCLIGenerator(MyriadConfiguration cfg) { + ExecutorCommandLineGenerator cliGenerator = null; MyriadExecutorConfiguration myriadExecutorConfiguration = cfg.getMyriadExecutorConfiguration(); if (myriadExecutorConfiguration.getNodeManagerUri().isPresent()) { - cliGenerator = new org.apache.myriad.scheduler.DownloadNMExecutorCLGenImpl(cfg, myriadExecutorConfiguration.getNodeManagerUri().get()); + cliGenerator = new DownloadNMExecutorCLGenImpl(cfg, myriadExecutorConfiguration.getNodeManagerUri().get()); } else { cliGenerator = new NMExecutorCLGenImpl(cfg); } http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/df7d05c8/myriad-scheduler/src/test/java/org/apache/myriad/configuration/MyriadBadConfigurationExceptionTest.java ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/test/java/org/apache/myriad/configuration/MyriadBadConfigurationExceptionTest.java b/myriad-scheduler/src/test/java/org/apache/myriad/configuration/MyriadBadConfigurationExceptionTest.java index cc4124c..368cdbf 100644 --- a/myriad-scheduler/src/test/java/org/apache/myriad/configuration/MyriadBadConfigurationExceptionTest.java +++ b/myriad-scheduler/src/test/java/org/apache/myriad/configuration/MyriadBadConfigurationExceptionTest.java @@ -18,11 +18,10 @@ package org.apache.myriad.configuration; -import static org.junit.Assert.*; - import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import static org.junit.Assert.assertEquals; /** * Class to test MyriadBadConfigurationException http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/df7d05c8/myriad-scheduler/src/test/java/org/apache/myriad/configuration/MyriadConfigurationTest.java ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/test/java/org/apache/myriad/configuration/MyriadConfigurationTest.java b/myriad-scheduler/src/test/java/org/apache/myriad/configuration/MyriadConfigurationTest.java index 06f44b6..85fe5e6 100644 --- a/myriad-scheduler/src/test/java/org/apache/myriad/configuration/MyriadConfigurationTest.java +++ b/myriad-scheduler/src/test/java/org/apache/myriad/configuration/MyriadConfigurationTest.java @@ -18,16 +18,14 @@ package org.apache.myriad.configuration; -import static org.junit.Assert.*; - +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import java.util.Map; - import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; /** * AuxServices/tasks test @@ -39,7 +37,8 @@ public class MyriadConfigurationTest { @BeforeClass public static void setUpBeforeClass() throws Exception { ObjectMapper mapper = new ObjectMapper(new YAMLFactory()); - cfg = mapper.readValue(Thread.currentThread().getContextClassLoader().getResource("myriad-config-test-default.yml"), MyriadConfiguration.class); + cfg = mapper.readValue(Thread.currentThread().getContextClassLoader().getResource("myriad-config-test-default.yml"), + MyriadConfiguration.class); } http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/df7d05c8/myriad-scheduler/src/test/java/org/apache/myriad/scheduler/SchedulerUtilsSpec.groovy ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/test/java/org/apache/myriad/scheduler/SchedulerUtilsSpec.groovy b/myriad-scheduler/src/test/java/org/apache/myriad/scheduler/SchedulerUtilsSpec.groovy index 190db32..e394dd8 100644 --- a/myriad-scheduler/src/test/java/org/apache/myriad/scheduler/SchedulerUtilsSpec.groovy +++ b/myriad-scheduler/src/test/java/org/apache/myriad/scheduler/SchedulerUtilsSpec.groovy @@ -18,10 +18,10 @@ */ package org.apache.myriad.scheduler +import org.apache.mesos.Protos import org.apache.myriad.configuration.NodeManagerConfiguration import org.apache.myriad.state.NodeTask import org.apache.myriad.state.SchedulerState -import org.apache.mesos.Protos import spock.lang.Specification /** http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/df7d05c8/myriad-scheduler/src/test/java/org/apache/myriad/scheduler/TMSTaskFactoryImpl.java ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/test/java/org/apache/myriad/scheduler/TMSTaskFactoryImpl.java b/myriad-scheduler/src/test/java/org/apache/myriad/scheduler/TMSTaskFactoryImpl.java index 89edfe9..17e043f 100644 --- a/myriad-scheduler/src/test/java/org/apache/myriad/scheduler/TMSTaskFactoryImpl.java +++ b/myriad-scheduler/src/test/java/org/apache/myriad/scheduler/TMSTaskFactoryImpl.java @@ -19,14 +19,12 @@ package org.apache.myriad.scheduler; import javax.inject.Inject; - import org.apache.mesos.Protos.CommandInfo; import org.apache.mesos.Protos.ExecutorInfo; import org.apache.mesos.Protos.FrameworkID; import org.apache.mesos.Protos.Offer; import org.apache.mesos.Protos.TaskID; import org.apache.mesos.Protos.TaskInfo; - import org.apache.myriad.configuration.MyriadConfiguration; /** http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/df7d05c8/myriad-scheduler/src/test/java/org/apache/myriad/scheduler/TestMyriadScheduler.java ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/test/java/org/apache/myriad/scheduler/TestMyriadScheduler.java b/myriad-scheduler/src/test/java/org/apache/myriad/scheduler/TestMyriadScheduler.java index d7abb3d..9eae873 100644 --- a/myriad-scheduler/src/test/java/org/apache/myriad/scheduler/TestMyriadScheduler.java +++ b/myriad-scheduler/src/test/java/org/apache/myriad/scheduler/TestMyriadScheduler.java @@ -22,20 +22,12 @@ import java.io.IOException; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.event.AsyncDispatcher; -//import org.apache.hadoop.yarn.server.resourcemanager.MockNodes; import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; -//import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler; -//import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.NodeAddedSchedulerEvent; -//import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.NodeRemovedSchedulerEvent; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairSchedulerConfiguration; -//import org.apache.hadoop.yarn.util.resource.Resources; import org.junit.After; import org.junit.Before; -//import org.junit.Test; - -//import static org.junit.Assert.assertEquals; /** * Tests myriad scheduler. http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/df7d05c8/myriad-scheduler/src/test/java/org/apache/myriad/scheduler/TestRandomPorts.java ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/test/java/org/apache/myriad/scheduler/TestRandomPorts.java b/myriad-scheduler/src/test/java/org/apache/myriad/scheduler/TestRandomPorts.java index e8c0e58..dd36436 100644 --- a/myriad-scheduler/src/test/java/org/apache/myriad/scheduler/TestRandomPorts.java +++ b/myriad-scheduler/src/test/java/org/apache/myriad/scheduler/TestRandomPorts.java @@ -19,22 +19,21 @@ package org.apache.myriad.scheduler; -import static org.junit.Assert.*; - +import com.google.common.collect.Lists; import java.util.Collections; import java.util.List; import java.util.Set; - import org.apache.mesos.Protos; import org.apache.mesos.Protos.Resource; import org.apache.mesos.Protos.Value.Range; import org.apache.mesos.Protos.Value.Ranges; +import org.apache.myriad.scheduler.TaskFactory.NMTaskFactoryImpl; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; - -import org.apache.myriad.scheduler.TaskFactory.NMTaskFactoryImpl; -import com.google.common.collect.Lists; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * Test Class to test NM ports randomization http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/df7d05c8/myriad-scheduler/src/test/java/org/apache/myriad/scheduler/TestServiceCommandLine.java ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/test/java/org/apache/myriad/scheduler/TestServiceCommandLine.java b/myriad-scheduler/src/test/java/org/apache/myriad/scheduler/TestServiceCommandLine.java index 080a76f..9d697fe 100644 --- a/myriad-scheduler/src/test/java/org/apache/myriad/scheduler/TestServiceCommandLine.java +++ b/myriad-scheduler/src/test/java/org/apache/myriad/scheduler/TestServiceCommandLine.java @@ -18,17 +18,16 @@ */ package org.apache.myriad.scheduler; -import static org.junit.Assert.*; - +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import org.apache.mesos.Protos.CommandInfo; +import org.apache.myriad.configuration.MyriadConfiguration; +import org.apache.myriad.scheduler.TaskFactory.NMTaskFactoryImpl; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -import org.apache.myriad.configuration.MyriadConfiguration; -import org.apache.myriad.scheduler.TaskFactory.NMTaskFactoryImpl; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; +import static org.junit.Assert.assertTrue; /** * Class to test CommandLine generation @@ -37,16 +36,19 @@ public class TestServiceCommandLine { static MyriadConfiguration cfg; - static String toJHSCompare = "echo \"sudo tar -zxpf hadoop-2.5.0.tar.gz && sudo chown hduser . &&" + - " cp conf /usr/local/hadoop/etc/hadoop/yarn-site.xml; sudo -E -u hduser -H $YARN_HOME/bin/mapred historyserver\";" + - "sudo tar -zxpf hadoop-2.5.0.tar.gz && sudo chown hduser . && cp conf /usr/local/hadoop/etc/hadoop/yarn-site.xml; sudo -E -u hduser -H $YARN_HOME/bin/mapred historyserver"; + static String toJHSCompare = + "echo \"sudo tar -zxpf hadoop-2.5.0.tar.gz && sudo chown hduser . && cp conf /usr/local/hadoop/etc/hadoop/yarn-site.xml; " + + "sudo -E -u hduser -H $YARN_HOME/bin/mapred historyserver\";sudo tar -zxpf hadoop-2.5.0.tar.gz && sudo chown hduser . && cp" + + " conf /usr/local/hadoop/etc/hadoop/yarn-site.xml; sudo -E -u hduser -H $YARN_HOME/bin/mapred historyserver"; - static String toCompare = "echo \"sudo tar -zxpf hadoop-2.5.0.tar.gz && sudo chown hduser . && cp conf /usr/local/hadoop/etc/hadoop/yarn-site.xml;"; + static String toCompare = + "echo \"sudo tar -zxpf hadoop-2.5.0.tar.gz && sudo chown hduser . && cp conf /usr/local/hadoop/etc/hadoop/yarn-site.xml;"; @BeforeClass public static void setUpBeforeClass() throws Exception { ObjectMapper mapper = new ObjectMapper(new YAMLFactory()); - cfg = mapper.readValue(Thread.currentThread().getContextClassLoader().getResource("myriad-config-test-default.yml"), MyriadConfiguration.class); + cfg = mapper.readValue(Thread.currentThread().getContextClassLoader().getResource("myriad-config-test-default.yml"), + MyriadConfiguration.class); } @@ -72,7 +74,8 @@ public class TestServiceCommandLine { ServiceResourceProfile profile = new ExtendedResourceProfile(new NMProfile("nm", 10L, 15L), 3.0, 5.0); - ExecutorCommandLineGenerator clGenerator = new DownloadNMExecutorCLGenImpl(cfg, "hdfs://namenode:port/dist/hadoop-2.5.0.tar.gz"); + ExecutorCommandLineGenerator clGenerator = new DownloadNMExecutorCLGenImpl(cfg, + "hdfs://namenode:port/dist/hadoop-2.5.0.tar.gz"); NMTaskFactoryImpl nms = new NMTaskFactoryImpl(cfg, null, clGenerator); CommandInfo cInfo = nms.getCommandInfo(profile, nmPorts); http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/df7d05c8/myriad-scheduler/src/test/java/org/apache/myriad/scheduler/TestTaskUtils.java ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/test/java/org/apache/myriad/scheduler/TestTaskUtils.java b/myriad-scheduler/src/test/java/org/apache/myriad/scheduler/TestTaskUtils.java index f58e1ba..a04b94b 100644 --- a/myriad-scheduler/src/test/java/org/apache/myriad/scheduler/TestTaskUtils.java +++ b/myriad-scheduler/src/test/java/org/apache/myriad/scheduler/TestTaskUtils.java @@ -17,18 +17,17 @@ */ package org.apache.myriad.scheduler; -import static org.junit.Assert.*; - -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -import org.apache.myriad.configuration.MyriadBadConfigurationException; -import org.apache.myriad.configuration.MyriadConfiguration; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import org.apache.myriad.configuration.MyriadBadConfigurationException; +import org.apache.myriad.configuration.MyriadConfiguration; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * Tests for TaskUtils @@ -40,7 +39,8 @@ public class TestTaskUtils { @BeforeClass public static void setUpBeforeClass() throws Exception { ObjectMapper mapper = new ObjectMapper(new YAMLFactory()); - cfg = mapper.readValue(Thread.currentThread().getContextClassLoader().getResource("myriad-config-test-default.yml"), MyriadConfiguration.class); + cfg = mapper.readValue(Thread.currentThread().getContextClassLoader().getResource("myriad-config-test-default.yml"), + MyriadConfiguration.class); } @AfterClass @@ -71,7 +71,8 @@ public class TestTaskUtils { public void testServiceResourceProfile() throws Exception { // testing custom deserializer - Gson gson = new GsonBuilder().registerTypeAdapter(ServiceResourceProfile.class, new ServiceResourceProfile.CustomDeserializer()).create(); + Gson gson = new GsonBuilder().registerTypeAdapter(ServiceResourceProfile.class, new ServiceResourceProfile.CustomDeserializer()) + .create(); ServiceResourceProfile parentProfile = new ServiceResourceProfile("abc", 1.0, 100.0); http://git-wip-us.apache.org/repos/asf/incubator-myriad/blob/df7d05c8/myriad-scheduler/src/test/java/org/apache/myriad/scheduler/fgs/FGSTestBaseSpec.groovy ---------------------------------------------------------------------- diff --git a/myriad-scheduler/src/test/java/org/apache/myriad/scheduler/fgs/FGSTestBaseSpec.groovy b/myriad-scheduler/src/test/java/org/apache/myriad/scheduler/fgs/FGSTestBaseSpec.groovy index afd02be..5b15e59 100644 --- a/myriad-scheduler/src/test/java/org/apache/myriad/scheduler/fgs/FGSTestBaseSpec.groovy +++ b/myriad-scheduler/src/test/java/org/apache/myriad/scheduler/fgs/FGSTestBaseSpec.groovy @@ -18,7 +18,6 @@ */ package org.apache.myriad.scheduler.fgs -import org.apache.myriad.configuration.MyriadConfiguration import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.dataformat.yaml.YAMLFactory import org.apache.hadoop.yarn.api.records.* @@ -37,6 +36,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerNode import org.apache.hadoop.yarn.util.resource.Resources import org.apache.mesos.Protos import org.apache.mesos.SchedulerDriver +import org.apache.myriad.configuration.MyriadConfiguration import org.apache.myriad.scheduler.MyriadDriver import spock.lang.Specification
