Clean up SingularityExecutor.

HubSpot · Mar 2, 2015 · a508a99 · a508a99
1 parent e700800
commit a508a99
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 20 deletions.
diff --git a/SingularityExecutor/src/main/java/com/hubspot/singularity/executor/models/RunnerContext.java b/SingularityExecutor/src/main/java/com/hubspot/singularity/executor/models/RunnerContext.java
@@ -2,26 +2,29 @@
 
 import com.google.common.base.Optional;
 
+/**
+ * Handlebars context for generating the runner.sh file.
+ */
 public class RunnerContext {
 
   private final String cmd;
+  private final String taskAppDirectory;
+  private final String logDir;
   private final String user;
-  private final String logfile;
+  private final String logFile;
   private final String taskId;
-  private final String taskAppDirectory;
+
   private final Optional<Integer> maxTaskThreads;
 
-  public RunnerContext(String cmd, String taskAppDirectory, String user, String logfile, String taskId, Optional<Integer> maxTaskThreads) {
+  public RunnerContext(String cmd, String taskAppDirectory, String logDir, String user, String logFile, String taskId, Optional<Integer> maxTaskThreads) {
     this.cmd = cmd;
+    this.taskAppDirectory = taskAppDirectory;
+    this.logDir = logDir;
     this.user = user;
-    this.logfile = logfile;
+    this.logFile = logFile;
     this.taskId = taskId;
-    this.taskAppDirectory = taskAppDirectory;
-    this.maxTaskThreads = maxTaskThreads;
-  }
 
-  public String getTaskId() {
+    this.maxTaskThreads = maxTaskThreads;
-    return taskId;
   }
 
   public String getCmd() {
@@ -32,12 +35,20 @@ public String getTaskAppDirectory() {
     return taskAppDirectory;
   }
 
+  public String getLogDir() {
+    return logDir;
+  }
+
   public String getUser() {
     return user;
   }
 
-  public String getLogfile() {
+  public String getLogFile() {
-    return logfile;
+    return logFile;
+  }
+
+  public String getTaskId() {
+    return taskId;
   }
 
   public Optional<Integer> getMaxTaskThreads() {
@@ -47,11 +58,12 @@ public Optional<Integer> getMaxTaskThreads() {
   @Override
   public String toString() {
     return "RunnerContext [" +
-        "cmd='" + cmd + '\'' +
+        "cmd='" + cmd + "'" +
-        ", user='" + user + '\'' +
+        ", taskAppDirectory='" + taskAppDirectory + "'" +
-        ", logfile='" + logfile + '\'' +
+        ", logDir='" + logDir + "'" +
-        ", taskId='" + taskId + '\'' +
+        ", user='" + user + "'" +
-        ", taskAppDirectory='" + taskAppDirectory + '\'' +
+        ", logFile='" + logFile + "'" +
+        ", taskId='" + taskId + "'" +
         ", maxTaskThreads=" + maxTaskThreads +
         ']';
   }

diff --git a/...ain/java/com/hubspot/singularity/executor/task/SingularityExecutorTaskProcessBuilder.java b/...ain/java/com/hubspot/singularity/executor/task/SingularityExecutorTaskProcessBuilder.java
@@ -34,7 +34,8 @@ public class SingularityExecutorTaskProcessBuilder implements Callable<ProcessBu
 
   private Optional<SingularityExecutorTaskArtifactFetcher> taskArtifactFetcher;
 
-  public SingularityExecutorTaskProcessBuilder(SingularityExecutorTask task, ExecutorUtils executorUtils, SingularityExecutorArtifactFetcher artifactFetcher, TemplateManager templateManager, SingularityExecutorConfiguration configuration, ExecutorData executorData, String executorPid) {
+  public SingularityExecutorTaskProcessBuilder(SingularityExecutorTask task, ExecutorUtils executorUtils, SingularityExecutorArtifactFetcher artifactFetcher, TemplateManager templateManager, SingularityExecutorConfiguration configuration,
+      ExecutorData executorData, String executorPid) {
     this.executorData = executorData;
     this.task = task;
     this.executorUtils = executorUtils;
@@ -85,7 +86,14 @@ private ProcessBuilder buildProcessBuilder(TaskInfo taskInfo, ExecutorData execu
 
     task.getLog().info("Writing a runner script to execute {}", cmd);
 
-    templateManager.writeRunnerScript(getPath("runner.sh"), new RunnerContext(cmd, configuration.getTaskAppDirectory(), executorData.getUser().or(configuration.getDefaultRunAsUser()), configuration.getServiceLog(), task.getTaskId(), executorData.getMaxTaskThreads().or(configuration.getMaxTaskThreads())));
+    templateManager.writeRunnerScript(getPath("runner.sh"), new RunnerContext(
+        cmd, // cmd
+        configuration.getTaskAppDirectory(), // taskAppDirectory
+        configuration.getLogrotateToDirectory(), // logDir
+        executorData.getUser().or(configuration.getDefaultRunAsUser()), // user
+        configuration.getServiceLog(), // logFile
+        task.getTaskId(), // taskId
+        executorData.getMaxTaskThreads().or(configuration.getMaxTaskThreads()))); // maxTaskThreads
 
     List<String> command = Lists.newArrayList();
     command.add("bash");

diff --git a/SingularityExecutor/src/main/resources/runner.sh.hbs b/SingularityExecutor/src/main/resources/runner.sh.hbs
@@ -32,6 +32,13 @@ if [[ ! -d ./tmp ]]; then
   sudo chown -R {{{ user }}} ./tmp
 fi
 
+# Create log directory for logrotate runs
+if [[ ! -d {{{ logDir }}} ]]; then
+    echo "Creating log directory ({{{ logDir }}})"
+    mkdir {{{ logDir }}}
+    sudo chown -R {{{ user }}} {{{ logDir }}}
+fi
+
 echo "Ensuring {{{ taskAppDirectory }}} is owned by {{{ user }}}"
 sudo chown -R {{{ user }}} {{{ taskAppDirectory }}}
 
@@ -48,5 +55,5 @@ else
 fi
 
 # execute command
-echo "Executing: sudo -E -u {{{ user }}} {{{ cmd }}} >> ../{{{ logfile }}} 2>&1"
+echo "Executing: sudo -E -u {{{ user }}} {{{ cmd }}} >> ../{{{ logFile }}} 2>&1"
-exec sudo -E -u {{{ user }}} {{{ cmd }}} >> ../{{{ logfile }}} 2>&1
+exec sudo -E -u {{{ user }}} {{{ cmd }}} >> ../{{{ logFile }}} 2>&1