diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 18:09:28 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 18:09:28 +0000 |
commit | ce8a0b90849ac5d1895e741c023432930f24d724 (patch) | |
tree | dbdc97de542cdbe18a2fc8b1a6b64ac0673ed3d3 /app/workers | |
parent | dc889678d1de8c09310b2f8f9742bb6c78a6f1a4 (diff) | |
download | gitlab-ce-ce8a0b90849ac5d1895e741c023432930f24d724.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/workers')
-rw-r--r-- | app/workers/all_queues.yml | 300 | ||||
-rw-r--r-- | app/workers/concerns/worker_attributes.rb | 4 | ||||
-rw-r--r-- | app/workers/error_tracking_issue_link_worker.rb | 4 | ||||
-rw-r--r-- | app/workers/update_merge_requests_worker.rb | 16 |
4 files changed, 155 insertions, 169 deletions
diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml index 81c09a77730..d70df18ffaf 100644 --- a/app/workers/all_queues.yml +++ b/app/workers/all_queues.yml @@ -6,602 +6,602 @@ - :name: auto_devops:auto_devops_disable :feature_category: :auto_devops :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 2 :idempotent: - :name: auto_merge:auto_merge_process :feature_category: :continuous_delivery :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :cpu :weight: 3 :idempotent: - :name: chaos:chaos_cpu_spin :feature_category: :chaos_engineering :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 2 :idempotent: - :name: chaos:chaos_db_spin :feature_category: :chaos_engineering :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 2 :idempotent: - :name: chaos:chaos_kill :feature_category: :chaos_engineering :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 2 :idempotent: - :name: chaos:chaos_leak_mem :feature_category: :chaos_engineering :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 2 :idempotent: - :name: chaos:chaos_sleep :feature_category: :chaos_engineering :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 2 :idempotent: - :name: container_repository:cleanup_container_repository :feature_category: :container_registry :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: container_repository:delete_container_repository :feature_category: :container_registry :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: cronjob:admin_email :feature_category: :source_code_management :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: cronjob:ci_archive_traces_cron :feature_category: :continuous_integration :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: cronjob:container_expiration_policy :feature_category: :container_registry :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: cronjob:environments_auto_stop_cron :feature_category: :continuous_delivery :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: cronjob:expire_build_artifacts :feature_category: :continuous_integration :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: cronjob:gitlab_usage_ping :feature_category: :collection :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: cronjob:import_export_project_cleanup :feature_category: :importers :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: cronjob:issue_due_scheduler :feature_category: :issue_tracking :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: cronjob:namespaces_prune_aggregation_schedules :feature_category: :source_code_management :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :cpu :weight: 1 :idempotent: - :name: cronjob:pages_domain_removal_cron :feature_category: :pages :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :cpu :weight: 1 :idempotent: - :name: cronjob:pages_domain_ssl_renewal_cron :feature_category: :pages :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: cronjob:pages_domain_verification_cron :feature_category: :pages :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: cronjob:personal_access_tokens_expiring :feature_category: :authentication_and_authorization :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: cronjob:pipeline_schedule :feature_category: :continuous_integration :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :cpu :weight: 1 :idempotent: - :name: cronjob:prune_old_events :feature_category: :users :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: cronjob:prune_web_hook_logs :feature_category: :integrations :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: cronjob:remove_expired_group_links :feature_category: :authentication_and_authorization :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: cronjob:remove_expired_members :feature_category: :authentication_and_authorization :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :cpu :weight: 1 :idempotent: - :name: cronjob:remove_unreferenced_lfs_objects :feature_category: :git_lfs :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: cronjob:repository_archive_cache :feature_category: :source_code_management :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: cronjob:repository_check_dispatch :feature_category: :source_code_management :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: cronjob:requests_profiles :feature_category: :source_code_management :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: cronjob:schedule_migrate_external_diffs :feature_category: :source_code_management :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: cronjob:stuck_ci_jobs :feature_category: :continuous_integration :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :cpu :weight: 1 :idempotent: - :name: cronjob:stuck_export_jobs :feature_category: :importers :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :cpu :weight: 1 :idempotent: - :name: cronjob:stuck_import_jobs :feature_category: :importers :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :cpu :weight: 1 :idempotent: - :name: cronjob:stuck_merge_jobs :feature_category: :source_code_management :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: cronjob:trending_projects :feature_category: :source_code_management :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: deployment:deployments_finished :feature_category: :continuous_delivery :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :cpu :weight: 3 :idempotent: - :name: deployment:deployments_forward_deployment :feature_category: :continuous_delivery :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 3 :idempotent: - :name: deployment:deployments_success :feature_category: :continuous_delivery :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :cpu :weight: 3 :idempotent: - :name: gcp_cluster:cluster_configure :feature_category: :kubernetes_management :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: gcp_cluster:cluster_configure_istio :feature_category: :kubernetes_management :has_external_dependencies: true - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: gcp_cluster:cluster_install_app :feature_category: :kubernetes_management :has_external_dependencies: true - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: gcp_cluster:cluster_patch_app :feature_category: :kubernetes_management :has_external_dependencies: true - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: gcp_cluster:cluster_project_configure :feature_category: :kubernetes_management :has_external_dependencies: true - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: gcp_cluster:cluster_provision :feature_category: :kubernetes_management :has_external_dependencies: true - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: gcp_cluster:cluster_upgrade_app :feature_category: :kubernetes_management :has_external_dependencies: true - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: gcp_cluster:cluster_wait_for_app_installation :feature_category: :kubernetes_management :has_external_dependencies: true - :urgency: :default + :urgency: :low :resource_boundary: :cpu :weight: 1 :idempotent: - :name: gcp_cluster:cluster_wait_for_ingress_ip_address :feature_category: :kubernetes_management :has_external_dependencies: true - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: gcp_cluster:clusters_applications_activate_service :feature_category: :kubernetes_management :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: gcp_cluster:clusters_applications_deactivate_service :feature_category: :kubernetes_management :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: gcp_cluster:clusters_applications_uninstall :feature_category: :kubernetes_management :has_external_dependencies: true - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: gcp_cluster:clusters_applications_wait_for_uninstall_app :feature_category: :kubernetes_management :has_external_dependencies: true - :urgency: :default + :urgency: :low :resource_boundary: :cpu :weight: 1 :idempotent: - :name: gcp_cluster:clusters_cleanup_app :feature_category: :kubernetes_management :has_external_dependencies: true - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: gcp_cluster:clusters_cleanup_project_namespace :feature_category: :kubernetes_management :has_external_dependencies: true - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: gcp_cluster:clusters_cleanup_service_account :feature_category: :kubernetes_management :has_external_dependencies: true - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: gcp_cluster:wait_for_cluster_creation :feature_category: :kubernetes_management :has_external_dependencies: true - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: github_importer:github_import_import_diff_note :feature_category: :importers :has_external_dependencies: true - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: github_importer:github_import_import_issue :feature_category: :importers :has_external_dependencies: true - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: github_importer:github_import_import_lfs_object :feature_category: :importers :has_external_dependencies: true - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: github_importer:github_import_import_note :feature_category: :importers :has_external_dependencies: true - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: github_importer:github_import_import_pull_request :feature_category: :importers :has_external_dependencies: true - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: github_importer:github_import_refresh_import_jid :feature_category: :importers :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: github_importer:github_import_stage_finish_import :feature_category: :importers :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: github_importer:github_import_stage_import_base_data :feature_category: :importers :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: github_importer:github_import_stage_import_issues_and_diff_notes :feature_category: :importers :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: github_importer:github_import_stage_import_lfs_objects :feature_category: :importers :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: github_importer:github_import_stage_import_notes :feature_category: :importers :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: github_importer:github_import_stage_import_pull_requests :feature_category: :importers :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: github_importer:github_import_stage_import_repository :feature_category: :importers :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: hashed_storage:hashed_storage_migrator :feature_category: :source_code_management :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: hashed_storage:hashed_storage_project_migrate :feature_category: :source_code_management :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: hashed_storage:hashed_storage_project_rollback :feature_category: :source_code_management :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: hashed_storage:hashed_storage_rollbacker :feature_category: :source_code_management :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: incident_management:incident_management_process_alert :feature_category: :incident_management :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 2 :idempotent: - :name: mail_scheduler:mail_scheduler_issue_due :feature_category: :issue_tracking :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 2 :idempotent: - :name: mail_scheduler:mail_scheduler_notification_service :feature_category: :issue_tracking :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :cpu :weight: 2 :idempotent: - :name: notifications:new_release :feature_category: :release_orchestration :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 2 :idempotent: - :name: object_pool:object_pool_create :feature_category: :gitaly :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: object_pool:object_pool_destroy :feature_category: :gitaly :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: object_pool:object_pool_join :feature_category: :gitaly :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :cpu :weight: 1 :idempotent: - :name: object_pool:object_pool_schedule_join :feature_category: :gitaly :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: object_storage:object_storage_background_move :feature_category: :not_owned :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: object_storage:object_storage_migrate_uploads :feature_category: :not_owned :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: pipeline_background:archive_trace :feature_category: :continuous_integration :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: pipeline_background:ci_build_trace_chunk_flush :feature_category: :continuous_integration :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: @@ -629,28 +629,28 @@ - :name: pipeline_creation:run_pipeline_schedule :feature_category: :continuous_integration :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 4 :idempotent: - :name: pipeline_default:build_coverage :feature_category: :continuous_integration :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 3 :idempotent: - :name: pipeline_default:build_trace_sections :feature_category: :continuous_integration :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 3 :idempotent: - :name: pipeline_default:ci_create_cross_project_pipeline :feature_category: :continuous_integration :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :cpu :weight: 3 :idempotent: @@ -720,21 +720,21 @@ - :name: pipeline_processing:ci_build_prepare :feature_category: :continuous_integration :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 5 :idempotent: - :name: pipeline_processing:ci_build_schedule :feature_category: :continuous_integration :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :cpu :weight: 5 :idempotent: - :name: pipeline_processing:ci_resource_groups_assign_resource_from_resource_group :feature_category: :continuous_delivery :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 5 :idempotent: @@ -776,70 +776,70 @@ - :name: repository_check:repository_check_batch :feature_category: :source_code_management :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: repository_check:repository_check_clear :feature_category: :source_code_management :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: repository_check:repository_check_single_repository :feature_category: :source_code_management :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: todos_destroyer:todos_destroyer_confidential_issue :feature_category: :issue_tracking :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: todos_destroyer:todos_destroyer_entity_leave :feature_category: :issue_tracking :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: todos_destroyer:todos_destroyer_group_private :feature_category: :issue_tracking :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: todos_destroyer:todos_destroyer_private_features :feature_category: :issue_tracking :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: todos_destroyer:todos_destroyer_project_private :feature_category: :issue_tracking :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: update_namespace_statistics:namespaces_root_statistics :feature_category: :source_code_management :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: update_namespace_statistics:namespaces_schedule_aggregation :feature_category: :source_code_management :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: @@ -860,7 +860,7 @@ - :name: background_migration :feature_category: :not_owned :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: @@ -874,21 +874,21 @@ - :name: create_commit_signature :feature_category: :source_code_management :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 2 :idempotent: - :name: create_evidence :feature_category: :release_evidence :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 2 :idempotent: - :name: create_note_diff_file :feature_category: :source_code_management :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: @@ -902,35 +902,35 @@ - :name: delete_diff_files :feature_category: :source_code_management :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: delete_merged_branches :feature_category: :source_code_management :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: delete_stored_files :feature_category: :not_owned :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: delete_user :feature_category: :authentication_and_authorization :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: detect_repository_languages :feature_category: :source_code_management :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: @@ -951,35 +951,35 @@ - :name: error_tracking_issue_link :feature_category: :error_tracking :has_external_dependencies: true - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: expire_build_instance_artifacts :feature_category: :continuous_integration :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: file_hook :feature_category: :integrations :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: git_garbage_collect :feature_category: :gitaly :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: github_import_advance_stage :feature_category: :importers :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: @@ -993,42 +993,42 @@ - :name: group_destroy :feature_category: :subgroups :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: group_export :feature_category: :importers :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: group_import :feature_category: :importers :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: import_issues_csv :feature_category: :issue_tracking :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :cpu :weight: 2 :idempotent: - :name: invalid_gpg_signature_update :feature_category: :source_code_management :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 2 :idempotent: - :name: irker :feature_category: :integrations :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: @@ -1049,21 +1049,21 @@ - :name: merge_request_mergeability_check :feature_category: :source_code_management :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: migrate_external_diffs :feature_category: :source_code_management :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: namespaceless_project_destroy :feature_category: :authentication_and_authorization :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: @@ -1091,28 +1091,28 @@ - :name: pages :feature_category: :pages :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: pages_domain_ssl_renewal :feature_category: :pages :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: pages_domain_verification :feature_category: :pages :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: phabricator_import_import_tasks :feature_category: :importers :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: @@ -1140,42 +1140,42 @@ - :name: project_daily_statistics :feature_category: :source_code_management :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: project_destroy :feature_category: :source_code_management :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: project_export :feature_category: :importers :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :memory :weight: 1 :idempotent: - :name: project_service :feature_category: :integrations :has_external_dependencies: true - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: project_update_repository_storage :feature_category: :source_code_management :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: propagate_service_template :feature_category: :source_code_management :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: @@ -1189,77 +1189,77 @@ - :name: rebase :feature_category: :source_code_management :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 2 :idempotent: - :name: remote_mirror_notification :feature_category: :source_code_management :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 2 :idempotent: - :name: repository_cleanup :feature_category: :source_code_management :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: repository_fork :feature_category: :source_code_management :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: repository_import :feature_category: :importers :has_external_dependencies: true - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: repository_remove_remote :feature_category: :source_code_management :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: repository_update_remote_mirror :feature_category: :source_code_management :has_external_dependencies: true - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: self_monitoring_project_create :feature_category: :metrics :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 2 :idempotent: - :name: self_monitoring_project_delete :feature_category: :metrics :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 2 :idempotent: - :name: system_hook_push :feature_category: :source_code_management :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: update_external_pull_requests :feature_category: :source_code_management :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 3 :idempotent: @@ -1273,21 +1273,21 @@ - :name: update_project_statistics :feature_category: :source_code_management :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: upload_checksum :feature_category: :geo_replication :has_external_dependencies: - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: - :name: web_hook :feature_category: :integrations :has_external_dependencies: true - :urgency: :default + :urgency: :low :resource_boundary: :unknown :weight: 1 :idempotent: diff --git a/app/workers/concerns/worker_attributes.rb b/app/workers/concerns/worker_attributes.rb index 216f73b58e2..b60179531af 100644 --- a/app/workers/concerns/worker_attributes.rb +++ b/app/workers/concerns/worker_attributes.rb @@ -8,7 +8,7 @@ module WorkerAttributes VALID_RESOURCE_BOUNDARIES = [:memory, :cpu, :unknown].freeze # Urgencies that workers can declare through the `urgencies` attribute - VALID_URGENCIES = [:high, :default, :none].freeze + VALID_URGENCIES = [:high, :low, :throttled].freeze NAMESPACE_WEIGHTS = { auto_devops: 2, @@ -65,7 +65,7 @@ module WorkerAttributes end def get_urgency - worker_attributes[:urgency] || :default + worker_attributes[:urgency] || :low end # Set this attribute on a job when it will call to services outside of the diff --git a/app/workers/error_tracking_issue_link_worker.rb b/app/workers/error_tracking_issue_link_worker.rb index d59abaf8683..9febd5cfecc 100644 --- a/app/workers/error_tracking_issue_link_worker.rb +++ b/app/workers/error_tracking_issue_link_worker.rb @@ -26,8 +26,8 @@ class ErrorTrackingIssueLinkWorker # rubocop:disable Scalability/IdempotentWorke logger.info("Linking Sentry issue #{sentry_issue_id} to GitLab issue #{issue.id}") sentry_client.create_issue_link(integration_id, sentry_issue_id, issue) - rescue Sentry::Client::Error - logger.info("Failed to link Sentry issue #{sentry_issue_id} to GitLab issue #{issue.id}") + rescue Sentry::Client::Error => e + logger.info("Failed to link Sentry issue #{sentry_issue_id} to GitLab issue #{issue.id} with error: #{e.message}") end end diff --git a/app/workers/update_merge_requests_worker.rb b/app/workers/update_merge_requests_worker.rb index 4c2a85d6642..63bb6171b9c 100644 --- a/app/workers/update_merge_requests_worker.rb +++ b/app/workers/update_merge_requests_worker.rb @@ -18,21 +18,7 @@ class UpdateMergeRequestsWorker # rubocop:disable Scalability/IdempotentWorker user = User.find_by(id: user_id) return unless user - # TODO: remove this benchmarking when we have rich logging - time = Benchmark.measure do - MergeRequests::RefreshService.new(project, user).execute(oldrev, newrev, ref) - end - - args_log = [ - "elapsed=#{time.real}", - "project_id=#{project_id}", - "user_id=#{user_id}", - "oldrev=#{oldrev}", - "newrev=#{newrev}", - "ref=#{ref}" - ].join(',') - - Rails.logger.info("UpdateMergeRequestsWorker#perform #{args_log}") if time.real > LOG_TIME_THRESHOLD # rubocop:disable Gitlab/RailsLogger + MergeRequests::RefreshService.new(project, user).execute(oldrev, newrev, ref) end # rubocop: enable CodeReuse/ActiveRecord end |