Change domain classes to fix issue 56 [#56 state:resolved]

Update domain classes to remove Workflow.scheduledExecution bidirectionality; Add missing strategy property in Workflow constructor for duplicating another Workflow; remove belongsTo ScheduledExecution for Execution domain class. Update controllers to fix operational logic, Update tests and legacy job support.
rundeck · Nov 1, 2010 · 7a4c7f7 · 7a4c7f7
1 parent d4729e6
commit 7a4c7f7
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 17 deletions.
diff --git a/rundeckapp/grails-app/controllers/ScheduledExecutionController.groovy b/rundeckapp/grails-app/controllers/ScheduledExecutionController.groovy
@@ -348,12 +348,21 @@ class ScheduledExecutionController  {
             def jobname = scheduledExecution.generateJobScheduledName()
             def groupname = scheduledExecution.generateJobGroupName()
             def jobtitle=scheduledExecution.jobName
-            scheduledExecution.delete()
-            scheduledExecutionService.deleteJob(jobname,groupname)    
+            //unlink any Execution records
+            def torem=[]
+            def execs = scheduledExecution.executions
+            execs.each{Execution exec->
+                torem<<exec
+            }
+            torem.each{Execution exec->
+                scheduledExecution.removeFromExecutions(exec)
+                exec.scheduledExecution=null
+            }
+            scheduledExecution.delete(flush:true)
+            scheduledExecutionService.deleteJob(jobname,groupname)
             flash.message = "Job '${jobtitle}' was successfully deleted."
             redirect(controller:'menu',action:'list', params:[:])
-        }
-    else {
+        } else {
             flash.message = "ScheduledExecution not found with id ${params.id}"
             redirect(controller:'menu',action:'list', params:params)
         }
@@ -581,13 +590,9 @@ class ScheduledExecutionController  {
                 if(!wfitemfailed){
                     def oldwf=scheduledExecution.workflow
                     final Workflow newworkflow = new Workflow(wf)
-                    newworkflow.scheduledExecution=scheduledExecution
                     scheduledExecution.workflow=newworkflow
                     if(oldwf){
-                        def execs = Execution.findByWorkflow(oldwf)
-                        if(!execs){
                             oldwf.delete()
-                        }
                     }
                     wf.discard()
                 }else{
@@ -1251,7 +1256,6 @@ class ScheduledExecutionController  {
                 }
                 if(!wfitemfailed){
                     final Workflow workflow = new Workflow(wf)
-                    workflow.scheduledExecution=scheduledExecution
                     scheduledExecution.workflow=workflow
                     wf.discard()
                 }else{

diff --git a/rundeckapp/grails-app/domain/Execution.groovy b/rundeckapp/grails-app/domain/Execution.groovy
@@ -12,8 +12,6 @@ class Execution extends ExecutionContext {
     String failedNodeList
     boolean cancelled
 
-    static belongsTo = ScheduledExecution
-
     static constraints = {
         workflow(nullable:true)
         argString(nullable:true)

diff --git a/rundeckapp/grails-app/domain/Workflow.groovy b/rundeckapp/grails-app/domain/Workflow.groovy
@@ -33,9 +33,7 @@ public class Workflow {
     List commands
     String strategy="node-first"
     static hasMany=[commands:CommandExec]
-    static belongsTo = [scheduledExecution:ScheduledExecution]
     static constraints = {
-        scheduledExecution(nullable:true)
         strategy(nullable:false, inList:['node-first','step-first'])
     }
     public String toString() {
@@ -49,6 +47,7 @@ public class Workflow {
     public Workflow(Workflow source){
         this.threadcount=source.threadcount
         this.keepgoing=source.keepgoing
+        this.strategy=source.strategy
         commands = new ArrayList()
         source.commands.each {
             commands.add(createItem(it))

diff --git a/rundeckapp/grails-app/services/ExecutionService.groovy b/rundeckapp/grails-app/services/ExecutionService.groovy
@@ -886,6 +886,11 @@ class ExecutionService implements ApplicationContextAware, Executor{
             throw new ExecutionServiceException('Job "'+se.jobName+'" ['+se.id+'] is currently being executed (execution ['+found.id+'])')
         }
 
+        //create duplicate workflow
+        if(se.workflow){
+            props.workflow=new Workflow(se.workflow)
+        }
+
         def Execution execution = createExecution(props, framework)
         se.addToExecutions(execution)
         execution.scheduledExecution=se
@@ -908,6 +913,11 @@ class ExecutionService implements ApplicationContextAware, Executor{
         }
 
 
+        if(execution.workflow && !execution.workflow.save(flush:true)){
+            execution.workflow.errors.allErrors.each { log.warn(it.defaultMessage) }
+            log.error("unable to save execution workflow")
+            throw new ExecutionServiceException("unable to create execution workflow")
+        }
         if(!execution.save(flush:true)){
             execution.errors.allErrors.each { log.warn(it.defaultMessage) }
             log.error("unable to save execution")

diff --git a/rundeckapp/grails-app/services/ScheduledExecutionService.groovy b/rundeckapp/grails-app/services/ScheduledExecutionService.groovy
@@ -234,7 +234,7 @@ class ScheduledExecutionService {
         def kprops=['argString','adhocLocalString','adhocRemoteString','adhocFilepath']
         def props = se.properties.findAll{it.key=~/^(type|name|command|argString|adhocExecution|adhoc.*String|adhocFilepath)$/}
         if(props){
-            def Workflow workflow = new Workflow(threadcount:1,keepgoing:true,scheduledExecution:se)
+            def Workflow workflow = new Workflow(threadcount:1,keepgoing:true)
             def cexec
             if(props.jobName){
                 cexec = new JobExec(props)

diff --git a/rundeckapp/test/integration/ScheduledExecValidationTests.groovy b/rundeckapp/test/integration/ScheduledExecValidationTests.groovy
@@ -2213,7 +2213,6 @@ public class ScheduledExecValidationTests extends GrailsUnitTestCase{
             def workflow = new Workflow(threadcount:1,keepgoing:true)
             def wfitem = new CommandExec(adhocExecution:true,adhocRemoteString:'test command',)
             workflow.addToCommands(wfitem)
-            workflow.scheduledExecution=se
             se.workflow=workflow
             se.save()
 
@@ -2279,7 +2278,6 @@ public class ScheduledExecValidationTests extends GrailsUnitTestCase{
             def workflow = new Workflow(threadcount:1,keepgoing:true)
             def wfitem = new CommandExec(name: 'aResource', type: 'aType', command: 'aCommand')
             workflow.addToCommands(wfitem)
-            workflow.scheduledExecution=se
             se.workflow=workflow
             se.save()
 
@@ -2338,7 +2336,6 @@ public class ScheduledExecValidationTests extends GrailsUnitTestCase{
             def workflow = new Workflow(threadcount:1,keepgoing:true)
             def wfitem = new CommandExec(name: 'aResource', type: 'aType', command: 'aCommand')
             workflow.addToCommands(wfitem)
-            workflow.scheduledExecution=se
             se.workflow=workflow
             def opt1 = new Option(name: 'test1', defaultValue: 'val1', enforced: false, valuesUrl: "http://test.com/test")
             def opt2 = new Option(name: 'test2', defaultValue: 'val2', enforced: true, values: ['a', 'b', 'c'])