Author: tmckay Date: 2011-06-01 01:48:31 +0000 (Wed, 01 Jun 2011) New Revision: 4794
Modified: branches/stability/cumin/etc/cumin.conf branches/stability/cumin/python/cumin/grid/submission.py Log: Merge revision 4793 from trunk. BZ708495
Modified: branches/stability/cumin/etc/cumin.conf =================================================================== --- branches/stability/cumin/etc/cumin.conf 2011-06-01 01:39:44 UTC (rev 4793) +++ branches/stability/cumin/etc/cumin.conf 2011-06-01 01:48:31 UTC (rev 4794) @@ -89,7 +89,8 @@ # vacuum-enabled: True vacuum-interval: 900 include-classes: com.redhat.grid:* -exclude-classes: com.redhat.grid:Slot, com.redhat.grid:Submission +exclude-classes: com.redhat.grid:Slot, com.redhat.grid:Submission, + com.redhat.grid:JobServer, com.redhat.grid:Submitter, com.redhat.grid:Scheduler
[data.grid-slots] # log-file: $CUMIN_HOME/log/data.grid-slots.log @@ -108,7 +109,8 @@ # expire-threshold: 86400 vacuum-enabled: False # vacuum-interval: 3600 -include-classes: com.redhat.grid:Submission +include-classes: com.redhat.grid:Submission, com.redhat.grid:JobServer, + com.redhat.grid:Submitter, com.redhat.grid:Scheduler # exclude-classes: [none]
[data.sesame]
Modified: branches/stability/cumin/python/cumin/grid/submission.py =================================================================== --- branches/stability/cumin/python/cumin/grid/submission.py 2011-06-01 01:39:44 UTC (rev 4793) +++ branches/stability/cumin/python/cumin/grid/submission.py 2011-06-01 01:48:31 UTC (rev 4794) @@ -51,7 +51,7 @@
table = cls.sql_table
- fmt = "(%s > now() - interval '3 days' or %s > 0 or %s > 0 or %s > 0)" + fmt = "(%s > now() - interval '10 days' or %s > 0 or %s > 0 or %s > 0)" args = (table._qmf_update_time.identifier, table.Idle.identifier, table.Running.identifier,