Skip to content

Commit

Permalink
fix: npe during cleanup incomplete executions
Browse files Browse the repository at this point in the history
the log file storage request may already be deleted, causing NPE when deleting by execution UUID
  • Loading branch information
gschueler committed May 21, 2024
1 parent e36904a commit a4db230
Show file tree
Hide file tree
Showing 2 changed files with 91 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,13 @@ class GormLogFileStorageRequestProvider implements LogFileStorageRequestProvider
@Override
void delete(String executionUuid) {
def execution = findExecutionByUuid(executionUuid)
if(!execution){
return
}
def request = findByExecution(execution)
execution.setLogFileStorageRequest(null)
execution.save(flush:true)
request.delete(flush:true)
request?.delete(flush:true)
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
package org.rundeck.app.data.providers.logstorage

import grails.testing.gorm.DataTest
import org.rundeck.app.data.model.v1.logstorage.LogFileStorageRequestData
import org.rundeck.app.data.providers.GormExecReportDataProvider
import rundeck.CommandExec
import rundeck.ExecReport
import rundeck.Execution
import rundeck.JobExec
import rundeck.LogFileStorageRequest
import rundeck.PluginStep
import rundeck.Workflow
import spock.lang.Specification

class GormLogFileStorageRequestProviderSpec extends Specification implements DataTest {
def provider = new GormLogFileStorageRequestProvider()

def setupSpec() {
mockDomains(Execution, LogFileStorageRequest, Workflow, CommandExec, PluginStep, JobExec)
}

def "Delete by execid no execution"() {
given:

def execUuid = UUID.randomUUID().toString()
when:
provider.delete(execUuid)
then:
noExceptionThrown()
}

def "Delete by execid no request"() {
given:
def execUuid = UUID.randomUUID().toString()
def exec = new Execution(
dateStarted: new Date(),
dateCompleted: null,
user: 'user1',
project: 'test',
serverNodeUUID: null,
outputfilepath: '/tmp/test/logs/blah/1.rdlog',
uuid: execUuid
).save()


when:
provider.delete(execUuid)
then:
noExceptionThrown()
}

def "Delete by execid valid"() {
given:
def execUuid = UUID.randomUUID().toString()
def exec = new Execution(
dateStarted: new Date(),
dateCompleted: null,
user: 'user1',
project: 'test',
serverNodeUUID: null,
outputfilepath: '/tmp/test/logs/blah/1.rdlog',
uuid: execUuid
).save()


def request = provider.create(
Mock(LogFileStorageRequestData) {
getExecutionUuid() >> execUuid
getExecutionId() >> exec.id
getPluginName() >> 'test'
getFiletype() >> 'test'
getCompleted() >> false

}
)
when:
def found = Execution.get(exec.id).logFileStorageRequest
then:
found != null
when:
provider.delete(execUuid)
then:
Execution.get(exec.id).logFileStorageRequest == null
LogFileStorageRequest.get(request.id) == null
noExceptionThrown()
}
}

0 comments on commit a4db230

Please sign in to comment.