Merge "Moving task cache update into task creation transaction"

This commit is contained in:
Jenkins 2017-03-23 09:46:24 +00:00 committed by Gerrit Code Review
commit 2ec2a93d53
1 changed files with 12 additions and 21 deletions

View File

@ -946,24 +946,18 @@ class StopDeploymentTask(object):
} }
} }
) )
db().commit()
return rpc_message return rpc_message
@classmethod @classmethod
def execute(cls, task, deploy_task=None, provision_task=None): def execute(cls, task, deploy_task=None, provision_task=None):
db().commit() messages = []
if provision_task: if provision_task:
rpc.cast( messages.append(cls.message(task, provision_task))
'naily',
cls.message(task, provision_task),
service=True
)
if deploy_task: if deploy_task:
rpc.cast( messages.append(cls.message(task, deploy_task))
'naily', db().commit()
cls.message(task, deploy_task), for msg in messages:
service=True rpc.cast('naily', msg, service=True)
)
class ResetEnvironmentTask(object): class ResetEnvironmentTask(object):
@ -1962,8 +1956,9 @@ class CheckRepoAvailability(BaseNetworkVerification):
return rpc_message return rpc_message
def execute(self): def execute(self):
message = self.get_message()
db().commit() db().commit()
rpc.cast('naily', self.get_message()) rpc.cast('naily', message)
def _get_nodes_to_check(self): def _get_nodes_to_check(self):
nodes = [{'uid': consts.MASTER_NODE_UID}] nodes = [{'uid': consts.MASTER_NODE_UID}]
@ -2091,11 +2086,9 @@ class CreateStatsUserTask(object):
@classmethod @classmethod
def execute(cls, task, primary_controller): def execute(cls, task, primary_controller):
message = cls.message(task, primary_controller)
db().commit() db().commit()
rpc.cast( rpc.cast('naily', message)
'naily',
cls.message(task, primary_controller)
)
class RemoveStatsUserTask(object): class RemoveStatsUserTask(object):
@ -2124,11 +2117,9 @@ class RemoveStatsUserTask(object):
@classmethod @classmethod
def execute(cls, task, primary_controller): def execute(cls, task, primary_controller):
message = cls.message(task, primary_controller)
db().commit() db().commit()
rpc.cast( rpc.cast('naily', message)
'naily',
cls.message(task, primary_controller)
)
class UpdateOpenstackConfigTask(BaseDeploymentTask): class UpdateOpenstackConfigTask(BaseDeploymentTask):