Merge pull request #70 from isi-vista/fix-max-walltime

Update max walltime for scavenge to 2 hrs
isi-vista · Nov 18, 2020 · 15e805c · 15e805c
2 parents 55f57b7 + 6ab7acb
commit 15e805c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pegasus_wrapper/artifact.py b/pegasus_wrapper/artifact.py
@@ -62,7 +62,7 @@ class Artifact(Protocol):
     """
 
     depends_on: ImmutableSet[DependencyNode]
-    locator: Optional[Locator]
+    locator: Optional[Locator] = attrib(validator=optional(instance_of(Locator)))
 
 
 def _canonicalize_depends_on(
@@ -97,7 +97,7 @@ class AbstractArtifact(Artifact):
         converter=_canonicalize_depends_on, kw_only=True, default=immutableset()
     )
     locator: Optional[Locator] = attrib(
-        validator=optional(instance_of(Locator)), kw_only=True
+        validator=optional(instance_of(Locator)), kw_only=True, default=None
     )
 
 

diff --git a/pegasus_wrapper/resource_request.py b/pegasus_wrapper/resource_request.py
@@ -36,7 +36,7 @@ def __str__(self) -> str:
 
     @staticmethod
     def from_str(name: str):
-        _partition_to_max_walltime = {"ephemeral": 720, "scavenge": 60}
+        _partition_to_max_walltime = {"ephemeral": 720, "scavenge": 120}
 
         return Partition(
             name=name,