Performing tasks on a remote worker with Docker.

pom.xml

@@ -78,6 +78,11 @@
             <version>${jackson.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.4</version>
+        </dependency>
 
     </dependencies>
 

src/main/java/org/fogbowcloud/arrebol/ArrebolApplication.java

@@ -12,18 +12,12 @@
 @SpringBootApplication
 public class ArrebolApplication {
 
-    @Bean
-    public Properties properties() {
-        return new Properties();
-    }
-
     @Autowired
     private ArrebolController arrebolController;
 
     @Bean
     @Lazy
-    public ArrebolFacade arrebolFacade(Properties properties) {
-        //ArrebolController arrebolController = new ArrebolController(properties);
+    public ArrebolFacade arrebolFacade() {
         ArrebolFacade arrebolFacade = new ArrebolFacade(arrebolController);
         try {
             arrebolFacade.start();

src/main/java/org/fogbowcloud/arrebol/ArrebolController.java

@@ -1,10 +1,8 @@
 package org.fogbowcloud.arrebol;
 
+import com.google.gson.Gson;
 import org.apache.log4j.Logger;
-import org.fogbowcloud.arrebol.execution.DockerTaskExecutor;
-import org.fogbowcloud.arrebol.execution.RawTaskExecutor;
-import org.fogbowcloud.arrebol.execution.TaskExecutor;
-import org.fogbowcloud.arrebol.execution.Worker;
+import org.fogbowcloud.arrebol.execution.*;
 import org.fogbowcloud.arrebol.models.job.Job;
 import org.fogbowcloud.arrebol.models.job.JobState;
 import org.fogbowcloud.arrebol.models.specification.Specification;
@@ -20,18 +18,15 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 import java.util.*;
 
 @Component
 public class ArrebolController {
 
     private final Logger LOGGER = Logger.getLogger(ArrebolController.class);
 
-    private final Properties properties;
+    private Configuration configuration;
     private final DefaultScheduler scheduler;
     private final Map<String, Job> jobPool;
     private final TaskQueue queue;
@@ -43,16 +38,17 @@ public class ArrebolController {
     @Autowired
     private JobRepository jobRepository;
 
-    public ArrebolController(Properties properties) {
-        this.properties = properties;
+    public ArrebolController() {
 
         String path = Thread.currentThread().getContextClassLoader().getResource("").getPath();
-        Properties arrebolProperties = new Properties();
-
-        try (InputStream input = new FileInputStream(path + File.separator + "arrebol.conf")) {
-            arrebolProperties.load(input);
-        } catch (IOException ex) {
-            LOGGER.error("Error on loading properties file path=" + path, ex);
+        //Configuration arrebolConfiguration
+        try {
+            Gson gson = new Gson();
+            BufferedReader bufferedReader = new BufferedReader(new FileReader(path + File.separator + "arrebol.json"));
+            this.configuration = gson.fromJson(bufferedReader, Configuration.class);
+            DockerVariable.DEFAULT_IMAGE = this.configuration.getImageId();
+        } catch (FileNotFoundException e) {
+            LOGGER.error("Error on loading properties file path=" + path, e);
             System.exit(1);
         }
 
@@ -62,7 +58,7 @@ public ArrebolController(Properties properties) {
         this.queue = new TaskQueue(queueId, queueName);
 
         int poolId = 1;
-        WorkerPool pool = createPool(arrebolProperties, poolId);
+        WorkerPool pool = createPool(configuration, poolId);
 
         //create the scheduler bind the pieces together
         FifoSchedulerPolicy policy = new FifoSchedulerPolicy();
@@ -75,39 +71,65 @@ public ArrebolController(Properties properties) {
     private static final String RAW_TYPE = "raw";
     private static final String DOCKER_TYPE = "docker";
 
-    private WorkerPool createPool(Properties properties, int poolId) {
+    private WorkerPool createPool(Configuration configuration, int poolId) {
 
         //we need to deal with missing/wrong properties
 
         Collection<Worker> workers = new LinkedList<>();
-        String poolType = properties.getProperty("pool.type");
-
-        int poolSize = new Integer(properties.getProperty("pool.size"));
-        for (int i = 0; i < poolSize; i++) {
-            TaskExecutor executor = createTaskExecutor(poolType, properties);
-            Specification resourceSpec = null;
-            Worker worker = new MatchAnyWorker(resourceSpec, "resourceId-"+i, poolId, executor);
-            workers.add(worker);
-        }
+        populatePool(workers, poolId, configuration);
 
         WorkerPool pool = new StaticPool(poolId, workers);
         LOGGER.info("pool={" + pool + "} created with workers={" + workers + "}");
 
         return pool;
     }
 
-    private TaskExecutor createTaskExecutor(String type, Properties properties) {
+    private void populatePool(Collection<Worker> workers, int poolId, Configuration configuration){
+        String poolType = configuration.getPoolType();
+        if(poolType.equals(DOCKER_TYPE)){
+            workers.addAll(createDockerWorkers(poolId, configuration));
+        } else if(poolType.equals(RAW_TYPE)){
+            workers.addAll(createRawWorkers(poolId, configuration));
+        }
+    }
+
+    private Collection<Worker> createDockerWorkers(Integer poolId, Configuration configuration){
+        Collection<Worker> workers = new LinkedList<>();
+        int poolSize = new Integer(configuration.getPoolSize());
+        String imageId = configuration.getImageId();
+        for(String address : configuration.getWorkers()){
+            for (int i = 0; i < poolSize; i++) {
+                LOGGER.info("Creating docker worker with address=" + address);
+                Worker worker = createDockerWorker(poolId, i, imageId, address);
+                workers.add(worker);
+            }
+        }
+        return workers;
+    }
 
-        TaskExecutor executor = null;
+    private Worker createDockerWorker(Integer poolId, int resourceId, String imageId, String address){
+        TaskExecutor executor = new DockerTaskExecutor(imageId, "docker-executor-" + UUID.randomUUID().toString(), address);
+        Specification resourceSpec = null;
+        Worker worker = new MatchAnyWorker(resourceSpec, "resourceId-"+resourceId, poolId, executor);
+        return worker;
+    }
 
-        if (type.equals(RAW_TYPE)) {
-            executor = new RawTaskExecutor();
-        } else if (type.equals(DOCKER_TYPE)) {
-            String imageId = properties.getProperty("pool.image_id");
-            executor = new DockerTaskExecutor(imageId, "docker-executor-" + UUID.randomUUID().toString());
+    private Collection<Worker> createRawWorkers(Integer poolId, Configuration configuration){
+        Collection<Worker> workers = new LinkedList<>();
+        int poolSize = new Integer(configuration.getPoolSize());
+        for (int i = 0; i < poolSize; i++) {
+            LOGGER.info("Creating raw worker[" + i + "]");
+            Worker worker = createRawWorker(poolId, i);
+            workers.add(worker);
         }
+        return workers;
+    }
 
-        return executor;
+    private Worker createRawWorker(Integer poolId, int resourceId){
+        TaskExecutor executor = new RawTaskExecutor();
+        Specification resourceSpec = null;
+        Worker worker = new MatchAnyWorker(resourceSpec, "resourceId-"+resourceId, poolId, executor);
+        return worker;
     }
 
     public void start() {
@@ -158,4 +180,6 @@ public TaskState getTaskState(String taskId) {
         //FIXME:
         return null;
     }
+
+
 }

src/main/java/org/fogbowcloud/arrebol/Configuration.java

@@ -0,0 +1,34 @@
+package org.fogbowcloud.arrebol;
+
+import java.util.List;
+
+public class Configuration {
+
+    private String poolType;
+    private Integer poolSize;
+    private String imageId;
+    private List<String> workers;
+
+    public Configuration(String poolType, Integer poolSize, String imageId, List<String> workers) {
+        this.poolType = poolType;
+        this.poolSize = poolSize;
+        this.imageId = imageId;
+        this.workers = workers;
+    }
+
+    public String getPoolType() {
+        return poolType;
+    }
+
+    public Integer getPoolSize() {
+        return poolSize;
+    }
+
+    public String getImageId() {
+        return imageId;
+    }
+
+    public List<String> getWorkers() {
+        return workers;
+    }
+}