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

feat: added ability to omit clean_up jobs from general db_clean task and fixed clean_up_archived_data_doc #1387

Merged
merged 1 commit into from
Jan 3, 2024
Merged
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
31 changes: 19 additions & 12 deletions querybook/server/tasks/db_clean_up_jobs.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,24 @@ def run_all_db_clean_up_jobs(
days_to_keep_event_logs=7,
):
with DBSession() as session:
clean_up_task_run_record(days_to_keep=days_to_keep_task_record, session=session)
clean_up_query_execution(
days_to_keep_done=days_to_keep_query_exec_done,
days_to_keep_else=days_to_keep_query_exec_else,
session=session,
)
clean_up_impression(days_to_keep=days_to_keep_impression, session=session)
clean_up_archived_data_doc(
days_to_keep=days_to_keep_archived_data_doc, session=session
)
clean_up_event_logs(days_to_keep=days_to_keep_event_logs, session=session)
if days_to_keep_task_record != -1:
clean_up_task_run_record(
days_to_keep=days_to_keep_task_record, session=session
)
if days_to_keep_query_exec_done != -1 and days_to_keep_query_exec_else != -1:
clean_up_query_execution(
days_to_keep_done=days_to_keep_query_exec_done,
days_to_keep_else=days_to_keep_query_exec_else,
session=session,
)
if days_to_keep_impression != -1:
clean_up_impression(days_to_keep=days_to_keep_impression, session=session)
if days_to_keep_archived_data_doc != -1:
clean_up_archived_data_doc(
days_to_keep=days_to_keep_archived_data_doc, session=session
)
if days_to_keep_event_logs != -1:
clean_up_event_logs(days_to_keep=days_to_keep_event_logs, session=session)


@with_session
Expand Down Expand Up @@ -90,7 +97,7 @@ def clean_up_impression(days_to_keep=30, session=None):
def clean_up_archived_data_doc(days_to_keep=60, session=None):
last_day = datetime.now() - timedelta(days_to_keep)

session.query(DataDoc).filter(archived=False).filter(
session.query(DataDoc).filter(DataDoc.archived).filter(
DataDoc.updated_at < last_day
).delete(synchronize_session=False)
session.commit()
Expand Down
Loading