Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support stop purge audit log job #17033

Merged
merged 1 commit into from
Jun 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions api/v2.0/swagger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4250,6 +4250,26 @@ paths:
$ref: '#/responses/404'
'500':
$ref: '#/responses/500'
put:
summary: Stop the specific purge audit log execution
description: Stop the purge audit log execution specified by ID
tags:
- purge
operationId: stopPurge
parameters:
- $ref: '#/parameters/requestId'
- $ref: '#/parameters/purgeId'
responses:
'200':
$ref: '#/responses/200'
'401':
$ref: '#/responses/401'
'403':
$ref: '#/responses/403'
'404':
$ref: '#/responses/404'
'500':
$ref: '#/responses/500'
/system/purgeaudit/{purge_id}/log:
get:
summary: Get purge job log.
Expand Down
6 changes: 6 additions & 0 deletions src/controller/purge/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,19 @@ func purgeCallback(ctx context.Context, p string) error {
type Controller interface {
// Start kick off a purge schedule
Start(ctx context.Context, policy JobPolicy, trigger string) (int64, error)
// Stop a purge job
Stop(ctx context.Context, id int64) error
}

type controller struct {
taskMgr task.Manager
exeMgr task.ExecutionManager
}

func (c *controller) Stop(ctx context.Context, id int64) error {
return c.exeMgr.Stop(ctx, id)
}

func (c *controller) Start(ctx context.Context, policy JobPolicy, trigger string) (int64, error) {
para := make(map[string]interface{})

Expand Down
13 changes: 12 additions & 1 deletion src/jobservice/job/impl/purge/purge.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,10 @@ func (j *Job) Run(ctx job.Context, params job.Parameters) error {
logger := ctx.GetLogger()
logger.Info("Purge audit job start")
logger.Infof("job parameters %+v", params)

if j.shouldStop(ctx) {
log.Info("received the stop signal, stop the purge job")
return nil
}
j.parseParams(params)
ormCtx := ctx.SystemContext()
if j.retentionHour == -1 || j.retentionHour == 0 {
Expand All @@ -115,3 +118,11 @@ func (j *Job) Run(ctx job.Context, params job.Parameters) error {
// Successfully exit
return nil
}

func (j *Job) shouldStop(ctx job.Context) bool {
opCmd, exit := ctx.OPCommand()
if exit && opCmd.IsStop() {
return true
}
return false
}
10 changes: 10 additions & 0 deletions src/jobservice/job/impl/purge/purge_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ func (suite *PurgeJobTestSuite) TestRun() {
ctx := &mockjobservice.MockJobContext{}
logger := &mockjobservice.MockJobLogger{}
ctx.On("GetLogger").Return(logger)
ctx.On("OPCommand").Return(job.NilCommand, true)
auditManager := &mockAudit.Manager{}
auditManager.On("Purge", mock.Anything, 128, []string{}, true).Return(int64(100), nil)
j := &Job{auditMgr: auditManager}
Expand All @@ -76,6 +77,15 @@ func (suite *PurgeJobTestSuite) TestRun() {
ret2 := j2.Run(ctx, param2)
suite.Require().NotNil(ret2)
}
func (suite *PurgeJobTestSuite) TestStop() {
ctx := &mockjobservice.MockJobContext{}
logger := &mockjobservice.MockJobLogger{}
ctx.On("GetLogger").Return(logger)
ctx.On("OPCommand").Return(job.StopCommand, true)
auditManager := &mockAudit.Manager{}
j := &Job{auditMgr: auditManager}
suite.True(j.shouldStop(ctx))
}

func TestPurgeJobTestSuite(t *testing.T) {
suite.Run(t, &PurgeJobTestSuite{})
Expand Down
10 changes: 10 additions & 0 deletions src/server/v2.0/handler/purge.go
Original file line number Diff line number Diff line change
Expand Up @@ -303,3 +303,13 @@ func (p *purgeAPI) createSchedule(ctx context.Context, vendorType string, cronTy
}
return nil
}

func (p *purgeAPI) StopPurge(ctx context.Context, params operation.StopPurgeParams) middleware.Responder {
if err := p.RequireSystemAccess(ctx, rbac.ActionStop, rbac.ResourcePurgeAuditLog); err != nil {
return p.SendError(ctx, err)
}
if err := p.purgeCtr.Stop(ctx, params.PurgeID); err != nil {
return p.SendError(ctx, err)
}
return operation.NewStopPurgeOK()
}
14 changes: 14 additions & 0 deletions src/testing/controller/purge/controller.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.