Skip to content

Fix etcd lock error #5484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arm4b merged 4 commits into from
Dec 7, 2021
Merged

Fix etcd lock error #5484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8b0005e
Fix etcd lock error
khushboobhatia01 Dec 7, 2021
2335e57
Add changelog entry
Dec 7, 2021
5eb1ed1
Add changelog entry
Dec 7, 2021
a19f8c6
Fix changelog entry
Dec 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,30 @@ Changelog
in development
--------------


3.6.0 - October 29, 2021
------------------------

Added
~~~~~

* Added service degerestration on shutdown of a service. #5396

Contributed by @khushboobhatia01

* Added cancel/pause/resume requester information to execution context. #5459

Contributed by @khushboobhatia01

Fixed
~~~~~

* 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 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``.
Expand All @@ -28,10 +41,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 <pack>.<action>`` will delete only action database entry.
Expand Down
2 changes: 1 addition & 1 deletion st2common/st2common/services/executions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down