Merge pull request #5484 from khushboobhatia01/bkhushboo/5483

Fix etcd lock error

Author: arm4b

CHANGELOG.rst

@@ -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``.
@@ -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.

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(