diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html index 2324fdb0efd6582ebf28a9ec34043d43ffe05288..f4fb3278583426d1aef9b3cb9603ff1be856b9d6 100644 --- a/atdb/taskdatabase/templates/taskdatabase/index.html +++ b/atdb/taskdatabase/templates/taskdatabase/index.html @@ -31,7 +31,7 @@ {% include 'taskdatabase/pagination.html' %} </div> </div> - <p class="footer"> Version 15 Feb 2024 (19:50) + <p class="footer"> Version 16 Feb 2024 (7:00) </div> {% include 'taskdatabase/refresh.html' %} diff --git a/atdb/taskdatabase/urls.py b/atdb/taskdatabase/urls.py index 9f0f72075654e187930c81d6e50b4fcc7d8c3f29..bf8ed0a4087b273b865f695267985371d1a628f7 100644 --- a/atdb/taskdatabase/urls.py +++ b/atdb/taskdatabase/urls.py @@ -134,6 +134,6 @@ urlpatterns = [ path('tasks/repair/associate-activities/', views.AssociateActivities, name='associate-activities'), path('tasks/repair/update-all-activities/', views.UpdateAllActivities, name='update-all-activities'), path('tasks/repair/update-failed-tasks/', views.UpdateFailedTasks, name='update-failed-tasks'), - path('tasks/repair/update-ingestq-tasks/', views.UpdateIngestQTasks, name='update-ingestq-tasks'), + path('tasks/repair/update-ingestq-tasks/<batch_size>', views.UpdateIngestQTasks, name='update-ingestq-tasks'), path('tasks/repair/update-finished-tasks/', views.UpdateFinishedTasks, name='update-finished-tasks'), ] diff --git a/atdb/taskdatabase/views.py b/atdb/taskdatabase/views.py index 2d95d2c9040f579d4ee0e00ca132ba44c96f1276..fe602715b8bbebf22c64c226384d166a39bc6993 100644 --- a/atdb/taskdatabase/views.py +++ b/atdb/taskdatabase/views.py @@ -1684,8 +1684,8 @@ def AssociateActivities(request): # disconnect the signals to avoid save recursion disconnect_signals() - #tasks = Task.objects.all().only('sas_id') - tasks = Task.objects.filter(activity__isnull=True)[:10000] + #tasks = Task.objects.filter(activity__isnull=True)[:10000] + tasks = Task.objects.filter(activity__isnull=True) total = tasks.count() i = 0 for task in tasks: @@ -1712,8 +1712,7 @@ def UpdateAllActivities(request): try: i += 1 task = Task.objects.filter(sas_id=activity.sas_id)[0] - if i>2680: - activities_handler.update_activity(task) + activities_handler.update_activity(task) logger.info(f'{i} of {total}') except Exception as error: logger.error(error) @@ -1742,17 +1741,18 @@ def UpdateFailedTasks(request): return redirect('index') @staff_member_required -def UpdateIngestQTasks(request): +def UpdateIngestQTasks(request, batch_size): tasks = Task.objects.only('sas_id').filter( Q(status__icontains=State.SCRUBBED.value) | Q(status__icontains=State.ARCHIVING.value) | Q(status__icontains=State.ARCHIVED.value) | - Q(status__icontains=State.FINISHING.value)) + Q(status__icontains=State.FINISHING.value)).filter(activity__ingested_fraction__isnull=True)[:int(batch_size)] total = tasks.count() i = 0 for task in tasks: i+=1 + activities_handler.update_activity(task) logger.info(f'{i} of {total}')