Score with disk resources.

Docs/about/requests-and-deploys.md

@@ -36,6 +36,7 @@ Now you want `TestService` to actually run. To do this, you need to create a `De
     "resources": {
         "cpus":1,
         "memoryMb":128,
+        "diskMb": 1024,
         "numPorts":2
     }, 
 	"command":"java -Ddw.server.applicationConnectors[0].port=$PORT0 -Ddw.server.adminConnectors[0].port=$PORT1 -jar singularitytest-1.0-SNAPSHOT.jar server example.yml",

Docs/getting-started/install.md

@@ -66,6 +66,7 @@ mesos:
   master: http://[mesos master hostname]/api/v1/scheduler
   defaultCpus: 1
   defaultMemory: 128
+  defaultDisk: 1024
   frameworkName: Singularity
   frameworkId: Singularity
   frameworkFailoverTimeout: 1000000

Docs/reference/configuration.md

@@ -176,6 +176,7 @@ These settings should live under the "mesos" field inside the root configuration
 |-----------|---------|-------------|------|
 | defaultCpus | 1 | Number of CPUs to request for a task if none are specified | int |
 | defaultMemory | 64 | MB of memory to request for a task if none is specified | int |
+| defaultDisk | 1024 | MB of disk to request for a task if none is specified | int |
 | maxNumInstancesPerRequest | 25 | Max instances (tasks) to allow for a request (requests using over this will return a 400) | int |
 | maxNumCpusPerInstance | 50 | Max number of CPUs allowed on a given task | int |
 | maxNumCpusPerRequest | 900 | Max number of CPUs allowed for a given request (cpus per task * task instance) | int |

SingularityBase/pom.xml

@@ -41,11 +41,6 @@
       <artifactId>jackson-datatype-guava</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.mesos</groupId>
-      <artifactId>mesos</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>

SingularityBase/src/main/java/com/hubspot/mesos/JavaUtils.java

@@ -202,12 +202,4 @@ public static ThreadPoolExecutor newFixedTimingOutThreadPool(int maxThreads, lon
   public static String getReplaceHyphensWithUnderscores(String string) {
     return string.replace("-", "_");
   }
-
-  public static final Optional<String> getUserEmail(Optional<SingularityUser> user) {
-    if (user.isPresent()) {
-      return user.get().getEmail();
-    } else {
-      return Optional.absent();
-    }
-  }
 }

SingularityBase/src/main/java/com/hubspot/mesos/SingularityVolume.java

@@ -2,8 +2,6 @@
 
 import java.util.Objects;
 
-import org.apache.mesos.v1.Protos;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Optional;
@@ -23,19 +21,6 @@ public SingularityVolume(
     this.mode = Optional.fromNullable(mode);
   }
 
-  @Deprecated
-  public SingularityVolume(String containerPath, Optional<String> hostPath, Optional<Protos.Volume.Mode> mode) {
-    this(containerPath, hostPath, convertedMode(mode));
-  }
-
-  private static SingularityDockerVolumeMode convertedMode(Optional<Protos.Volume.Mode> mode) {
-    if (mode.isPresent()) {
-      return SingularityDockerVolumeMode.valueOf(mode.get().toString());
-    } else {
-      return null;
-    }
-  }
-
   public String getContainerPath() {
     return containerPath;
   }