Author: eallen
Date: 2010-08-02 10:44:32 -0400 (Mon, 02 Aug 2010)
New Revision: 4179
Modified:
mgmt/newdata/cumin/python/cumin/grid/submission.py
Log:
Default some DAG submission fields
Modified: mgmt/newdata/cumin/python/cumin/grid/submission.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/grid/submission.py 2010-08-02 12:56:24 UTC (rev 4178)
+++ mgmt/newdata/cumin/python/cumin/grid/submission.py 2010-08-02 14:44:32 UTC (rev 4179)
@@ -522,13 +522,17 @@
self.dag.help = "DAG descriptor file location"
self.add_field(self.dag)
- self.requirements = self.RequirementsField(app, "requirements")
- self.requirements.input.columns = 50
- self.requirements.required = True
- self.requirements.help = "Attributes controlling where and when " + \
- "this submission will run"
- self.add_field(self.requirements)
+ self.requirements = Attribute(app, "requirements")
+ self.requirements.default = "1=?=1"
+ self.add_attribute(self.requirements)
+ #self.requirements = self.RequirementsField(app, "requirements")
+ #self.requirements.input.columns = 50
+ #self.requirements.required = True
+ #self.requirements.help = "Attributes controlling where and when " + \
+ # "this submission will run"
+ #self.add_field(self.requirements)
+
self.universe = Attribute(app, "universe")
self.universe.default = self.task.UNIVERSE["SCHEDULER"]
self.add_attribute(self.universe)
@@ -546,31 +550,40 @@
self.command = self.DagCommand(app, "command")
self.add_attribute(self.command)
- self.stdout = self.StdoutField(app, "stdout")
- self.stdout.input.size = 50
- self.stdout.help = "Send process output to this file"
- self.stdout.input.param.default = "diamond.dag.lib.out"
- self.add_extra_field(self.stdout)
+ self.stdout = Attribute(app, "stdout")
+ self.add_attribute(self.stdout)
- self.stderr = self.StderrField(app, "stderr")
- self.stderr.input.size = 50
- self.stderr.help = "Send error output to this file"
- self.stderr.input.param.default = "diamond.dag.lib.err"
- self.add_extra_field(self.stderr)
+ #self.stdout = self.StdoutField(app, "stdout")
+ #self.stdout.input.size = 50
+ #self.stdout.help = "Send process output to this file"
+ #self.stdout.input.param.default = "diamond.dag.lib.out"
+ #self.add_extra_field(self.stdout)
- self.usrlog = self.UsrLogField(app, "usrlog")
- self.usrlog.input.size = 50
- self.usrlog.help = "User Log File"
- self.usrlog.input.param.default = "diamond.dag.dagman.log"
- self.add_extra_field(self.usrlog)
+ self.stderr = Attribute(app, "stderr")
+ self.add_attribute(self.stderr)
- self.condor = self.CondorVersionField(app, "cv")
- self.condor.required = True
- self.condor.input.size = 50
- self.condor.help = "Condor Version"
- self.condor.input.param.default = "'7.4.3' 'Mar'
'16' '2010' 'BuildID:' 'RH-7.4.3-0.5.el5'
'PRE-RELEASE'"
- self.add_extra_field(self.condor)
+ #self.stderr = self.StderrField(app, "stderr")
+ #self.stderr.input.size = 50
+ #self.stderr.help = "Send error output to this file"
+ #self.stderr.input.param.default = "diamond.dag.lib.err"
+ #self.add_extra_field(self.stderr)
+ self.usrlog = Attribute(app, "usrlog")
+ self.add_attribute(self.usrlog)
+
+ #self.usrlog = self.UsrLogField(app, "usrlog")
+ #self.usrlog.input.size = 50
+ #self.usrlog.help = "User Log File"
+ #self.usrlog.input.param.default = "diamond.dag.dagman.log"
+ #self.add_extra_field(self.usrlog)
+
+ #self.condor = self.CondorVersionField(app, "cv")
+ #self.condor.required = True
+ #self.condor.input.size = 50
+ #self.condor.help = "Condor Version"
+ #self.condor.input.param.default = "'7.4.3' 'Mar'
'16' '2010' 'BuildID:' 'RH-7.4.3-0.5.el5'
'PRE-RELEASE'"
+ #self.add_extra_field(self.condor)
+
class DagField(StringField):
def render_title(self, session):
return "DAG"
@@ -581,6 +594,8 @@
class DagCommand(Attribute):
def get(self, session):
+ return "/usr/bin/condor_dagman"
+
dag = self.widget.dag.get(session)
condor = self.widget.condor.get(session)
args = """-f -l . -Debug 3 -Lockfile diamond.dag.lock
-AutoRescue 1
@@ -591,6 +606,8 @@
class DagAttributes(Attribute):
def get(self, session):
+ return ""
+
ads = list()
ads.append("getenv=True")
ads.append("remove_kill_sig=SIGUSR1")
Show replies by date