Merge pull request #333 from mesos/fix/typos

Fix/typos

Author: Phil Winder

scheduler/src/main/java/org/apache/mesos/elasticsearch/scheduler/Configuration.java

@@ -153,7 +153,7 @@ public Long getExecutorTimeout() {
     public static final String DEFAULT_EXECUTOR_IMAGE = "mesos/elasticsearch-executor";
     @Parameter(names = {EXECUTOR_IMAGE}, description = "The docker executor image to use.", validateWith = CLIValidators.NotEmptyString.class)
     private String executorImage = DEFAULT_EXECUTOR_IMAGE;
-    public String getEexecutorImage() {
+    public String getExecutorImage() {
         return executorImage;
     }
 

scheduler/src/main/java/org/apache/mesos/elasticsearch/scheduler/TaskInfoFactory.java

@@ -88,7 +88,7 @@ private Protos.ExecutorInfo.Builder newExecutorInfo(Configuration configuration)
                 .setCommand(newCommandInfo(configuration))
                 .setContainer(Protos.ContainerInfo.newBuilder()
                         .setType(Protos.ContainerInfo.Type.DOCKER)
-                        .setDocker(Protos.ContainerInfo.DockerInfo.newBuilder().setImage(configuration.getEexecutorImage()).setForcePullImage(configuration.getExecutorForcePullImage()))
+                        .setDocker(Protos.ContainerInfo.DockerInfo.newBuilder().setImage(configuration.getExecutorImage()).setForcePullImage(configuration.getExecutorForcePullImage()))
                         .addVolumes(Protos.Volume.newBuilder().setHostPath(SETTINGS_PATH_VOLUME).setContainerPath(SETTINGS_PATH_VOLUME).setMode(Protos.Volume.Mode.RO)) // Temporary fix until we get a data container.
                         .addVolumes(Protos.Volume.newBuilder().setContainerPath(SETTINGS_DATA_VOLUME_CONTAINER).setHostPath(configuration.getDataDir()).setMode(Protos.Volume.Mode.RW).build())
                         .build());
@@ -109,7 +109,7 @@ private Protos.CommandInfo.Builder newCommandInfo(Configuration configuration) {
                 .setShell(false)
                 .addAllArguments(args)
                 .setEnvironment(Protos.Environment.newBuilder().addAllVariables(executorEnvironmentalVariables.getList()))
-                .setContainer(Protos.CommandInfo.ContainerInfo.newBuilder().setImage(configuration.getEexecutorImage()).build());
+                .setContainer(Protos.CommandInfo.ContainerInfo.newBuilder().setImage(configuration.getExecutorImage()).build());
     }
 
     private void addIfNotEmpty(List<String> args, String key, String value) {

scheduler/src/main/java/org/apache/mesos/elasticsearch/scheduler/controllers/ClusterController.java

@@ -57,7 +57,7 @@ private Object invokeConfigurationGetter(Method method) {
             }
             return result.toString();
         } catch (Exception e) {
-            LOGGER.warn("Failed to invoce method", e);
+            LOGGER.warn("Failed to invoke method", e);
             return "--ERROR--";
         }
     }

scheduler/src/test/java/org/apache/mesos/elasticsearch/scheduler/TaskInfoFactoryTest.java

@@ -38,7 +38,7 @@ public void testCreateTaskInfo() {
         when(configuration.getTaskName()).thenReturn("esdemo");
         when(configuration.getMesosZKURL()).thenReturn("zk://zookeeper:2181/mesos");
         when(configuration.getFrameworkZKURL()).thenReturn("zk://zookeeper:2181/mesos");
-        when(configuration.getEexecutorImage()).thenReturn(Configuration.DEFAULT_EXECUTOR_IMAGE);
+        when(configuration.getExecutorImage()).thenReturn(Configuration.DEFAULT_EXECUTOR_IMAGE);
         when(configuration.getElasticsearchSettingsLocation()).thenReturn("/var");
         when(configuration.getElasticsearchNodes()).thenReturn(3);
         when(configuration.getElasticsearchClusterName()).thenReturn("cluster-name");

system-test/src/systemTest/java/org/apache/mesos/elasticsearch/systemtest/ReconciliationSystemTest.java

@@ -46,7 +46,7 @@ public class ReconciliationSystemTest {
     );
     private static final int TIMEOUT = 60;
     private static final String MESOS_LOCAL_IMAGE_NAME = "mesos-local";
-    private static final ContainerLifecycleManagement CONTAINER_MANGER = new ContainerLifecycleManagement();
+    private static final ContainerLifecycleManagement CONTAINER_MANAGER = new ContainerLifecycleManagement();
     private static String mesosClusterId;
     private static DockerClient innerDockerClient;
 
@@ -79,19 +79,19 @@ public static void beforeScheduler() throws Exception {
 
     private static ElasticsearchSchedulerContainer startSchedulerContainer() {
         ElasticsearchSchedulerContainer scheduler = new ElasticsearchSchedulerContainer(CLUSTER.getConfig().dockerClient, CLUSTER.getMesosContainer().getIpAddress());
-        CONTAINER_MANGER.addAndStart(scheduler);
+        CONTAINER_MANAGER.addAndStart(scheduler);
         return scheduler;
     }
 
     @After
     public void after() {
-        CONTAINER_MANGER.stopAll();
+        CONTAINER_MANAGER.stopAll();
     }
 
     @Test
     public void forceCheckExecutorTimeout() throws IOException {
         ElasticsearchSchedulerContainer scheduler = new TimeoutSchedulerContainer(CLUSTER.getConfig().dockerClient, CLUSTER.getMesosContainer().getIpAddress());
-        CONTAINER_MANGER.addAndStart(scheduler);
+        CONTAINER_MANAGER.addAndStart(scheduler);
         assertCorrectNumberOfExecutors(); // Start with 3
         assertLessThan(CLUSTER_SIZE); // Then should be less than 3, because at some point we kill an executor
         assertCorrectNumberOfExecutors(); // Then at some point should get back to 3.
@@ -103,7 +103,7 @@ public void ifSchedulerLostShouldReconcileExecutors() throws IOException {
         assertCorrectNumberOfExecutors();
 
         // Stop and restart container
-        CONTAINER_MANGER.stopContainer(scheduler);
+        CONTAINER_MANAGER.stopContainer(scheduler);
         startSchedulerContainer();
         assertCorrectNumberOfExecutors();
     }
@@ -126,7 +126,7 @@ public void ifExecutorIsLostWhileSchedulerIsDead() throws IOException {
         assertCorrectNumberOfExecutors();
 
         // Kill scheduler
-        CONTAINER_MANGER.stopContainer(scheduler);
+        CONTAINER_MANAGER.stopContainer(scheduler);
 
         // Kill executor
         killOneExecutor();