18863: Add rest of event_type values used by crunch-run. 18863-delete-old-logs-without-cron
authorTom Clegg <tom@curii.com>
Thu, 20 Oct 2022 14:37:24 +0000 (10:37 -0400)
committerTom Clegg <tom@curii.com>
Thu, 20 Oct 2022 14:37:24 +0000 (10:37 -0400)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

lib/controller/trash.go

index 37c7be485924dda45b3be6bdc48ee0a09a85cb6f..9a7b0814cee7477dc7b506921aa99be0ef34ed77 100644 (file)
@@ -49,7 +49,7 @@ func (h *Handler) containerLogSweepWorker() {
 DELETE FROM logs
  USING containers
  WHERE logs.object_uuid=containers.uuid
- AND logs.event_type in ('stdout', 'stderr', 'arv-mount', 'crunch-run', 'crunchstat')
+ AND logs.event_type in ('stdout', 'stderr', 'arv-mount', 'crunch-run', 'crunchstat', 'hoststat', 'node', 'container', 'keepstore')
  AND containers.log IS NOT NULL
  AND now() - containers.finished_at > $1::interval`,
                        h.Cluster.Containers.Logging.MaxAge.String())