Skip to content

Commit

Permalink
frontend: don't show new action task if namespace is deleting itself
Browse files Browse the repository at this point in the history
wait for the end of the deletion of project to avoid race
condition when other action like fork or create is called
immidiatelly after delete
  • Loading branch information
nikromen committed Aug 7, 2023
1 parent 030dd32 commit e5115c2
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 4 deletions.
2 changes: 0 additions & 2 deletions frontend/coprs_frontend/coprs/logic/complex_logic.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# coding: utf-8

import os
import datetime
import time
Expand Down Expand Up @@ -126,7 +125,6 @@ def delete_expired_projects(cls):
print(e)
print("project {} postponed".format(copr.full_name))


@classmethod
def fork_copr(cls, copr, user, dstname, dstgroup=None):
cls.raise_if_cant_fork(user, copr)
Expand Down
1 change: 1 addition & 0 deletions frontend/coprs_frontend/coprs/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -2129,6 +2129,7 @@ class Action(db.Model, helpers.Serializer):
# see ActionTypeEnum
action_type = db.Column(db.Integer, nullable=False)
# copr, ...; downcase name of class of modified object
# TODO: replace this in the future with something better
object_type = db.Column(db.String(20))
# id of the modified object
object_id = db.Column(db.Integer)
Expand Down
18 changes: 16 additions & 2 deletions frontend/coprs_frontend/coprs/views/backend_ns/backend_general.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import flask
from copr_common.enums import StatusEnum
from copr_common.enums import StatusEnum, ActionTypeEnum, ActionObjectTypeEnum

Check warning

Code scanning / vcs-diff-lint

No name 'ActionObjectTypeEnum' in module 'copr_common.enums' Warning

No name 'ActionObjectTypeEnum' in module 'copr_common.enums'

Check warning

Code scanning / vcs-diff-lint

Unused ActionObjectTypeEnum imported from copr_common.enums Warning

Unused ActionObjectTypeEnum imported from copr_common.enums
from coprs import db, app
from coprs import models
from coprs.logic import actions_logic
Expand Down Expand Up @@ -287,14 +287,28 @@ def build_task_canceled(task_id):
@backend_ns.route("/pending-actions/")
def pending_actions():
'get the list of actions backand should take care of'
busy_namespaces = set()
data = []
# waiting repos are ordered
for action in actions_logic.ActionsLogic.get_waiting():
if (
action.object_type == "copr"
and action.action_type == ActionTypeEnum("delete")
):
busy_namespaces.add(action.copr.full_name)
elif action.copr.full_name in busy_namespaces:
# e.g. copr delete _ && copr fork _; will cause race condition
# so don't process new action with the same namespace until delete
# action is processed
# https://github.com/fedora-copr/copr/issues/2698
continue

data.append({
'id': action.id,
'priority': action.priority or action.default_priority,
})
return flask.json.dumps(data)

return flask.json.dumps(data)


@backend_ns.route("/action/<int:action_id>/")
Expand Down

0 comments on commit e5115c2

Please sign in to comment.