From 8b0005e123e794f336cb86e99a9c5864b3ec13f6 Mon Sep 17 00:00:00 2001 From: Khushboo Date: Tue, 7 Dec 2021 11:19:40 +0530 Subject: [PATCH 1/4] Fix etcd lock error --- st2common/st2common/services/executions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/st2common/st2common/services/executions.py b/st2common/st2common/services/executions.py index fe8de613b1..39ce663272 100644 --- a/st2common/st2common/services/executions.py +++ b/st2common/st2common/services/executions.py @@ -196,7 +196,7 @@ def update_execution(liveaction_db, publish=True, set_result_size=False): """ execution = ActionExecution.get(liveaction__id=str(liveaction_db.id)) - with coordination.get_coordinator().get_lock(liveaction_db.id): + with coordination.get_coordinator().get_lock(str(liveaction_db.id)): # Skip execution object update when action is already in completed state. if execution.status in action_constants.LIVEACTION_COMPLETED_STATES: LOG.debug( From 2335e57656a094e8e418bea56f1c79ea753894db Mon Sep 17 00:00:00 2001 From: bkhushboo Date: Tue, 7 Dec 2021 20:52:43 +0530 Subject: [PATCH 2/4] Add changelog entry --- CHANGELOG.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index a3a2c0e647..6991ebc203 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -11,6 +11,10 @@ in development Added ~~~~~ +* Use string lock name instead of object id. #5484 + + Contributed by @khushboobhatia01 + * Added service degerestration on shutdown of a service. #5396 Contributed by @khushboobhatia01 From 5eb1ed194e0ea433f18b51965a056599c49025c6 Mon Sep 17 00:00:00 2001 From: bkhushboo Date: Tue, 7 Dec 2021 21:14:21 +0530 Subject: [PATCH 3/4] Add changelog entry --- CHANGELOG.rst | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 6991ebc203..71e5068065 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,17 +4,30 @@ Changelog in development -------------- +Added +~~~~~ -3.6.0 - October 29, 2021 ------------------------- +* Added service degerestration on shutdown of a service. #5396 -Added + Contributed by @khushboobhatia01 + +* Added cancel/pause/resume requester information to execution context. #5459 + + Contributed by @khushboobhatia01 + +Fixed ~~~~~ -* Use string lock name instead of object id. #5484 +* Fixed regression caused by #5358. Use string lock name instead of object ID. #5484 Contributed by @khushboobhatia01 +3.6.0 - October 29, 2021 +------------------------ + +Added +~~~~~ + * Added service degerestration on shutdown of a service. #5396 Contributed by @khushboobhatia01 @@ -32,10 +45,6 @@ Added Changed ~~~~~~~ -* Added cancel/pause/resume requester information to execution context. #5459 - - Contributed by @khushboobhatia01 - * Modified action delete API to delete action files from disk along with backward compatibility. From CLI ``st2 action delete .`` will delete only action database entry. From a19f8c6933813cded2d23175bc43a8e2b87b5352 Mon Sep 17 00:00:00 2001 From: bkhushboo Date: Tue, 7 Dec 2021 21:15:50 +0530 Subject: [PATCH 4/4] Fix changelog entry --- CHANGELOG.rst | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 71e5068065..10f8ce9e85 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -28,10 +28,6 @@ Fixed Added ~~~~~ -* Added service degerestration on shutdown of a service. #5396 - - Contributed by @khushboobhatia01 - * Added possibility to add new values to the KV store via CLI without leaking them to the shell history. #5164 * ``st2.conf`` is now the only place to configure ports for ``st2api``, ``st2auth``, and ``st2stream``.