Instance stop timeout

pierlauro · pierlauro · commit b211944dabc2 · 2020-03-24T17:53:46.000+01:00
diff --git a/spython/instance/cmd/stop.py b/spython/instance/cmd/stop.py
@@ -8,13 +8,15 @@
 from spython.logger import bot
 
 
-def stop(self, name=None, sudo=False):
+def stop(self, name=None, sudo=False, timeout=10):
     """stop an instance. This is done by default when an instance is created.
 
        Parameters
        ==========
        name: a name for the instance
        sudo: if the user wants to run the command with sudo
+       timeout: forcebly kill non-stopped instance after specified timeout
+	            in seconds (default 10)
 
        USAGE: 
        singularity [...] instance.stop [...] <instance name>
@@ -27,7 +29,7 @@ def stop(self, name=None, sudo=False):
     subgroup = "instance.stop"
 
     if "version 3" in self.version():
-        subgroup = ["instance", "stop"]
+        subgroup = ["instance", "stop", "-t", str(timeout)]
 
     cmd = self._init_command(subgroup)
 
