taskflow 5.6.0__py3-none-any.whl → 5.6.1__py3-none-any.whl

taskflow/engines/action_engine/runtime.py

@@ -291,6 +291,18 @@ class Runtime(object):
         """Resets all the provided atoms to the given state and intention."""
         tweaked = []
         for atom in atoms:
+            cur_intention = self.storage.get_atom_intention(atom.name)
+            # Don't trigger a RETRY if the atom needs to be REVERTED.
+            # This is a workaround for a bug when REVERT_ALL is applied to
+            # unordered flows
+            # (https://bugs.launchpad.net/taskflow/+bug/2043808)
+            # A subflow may trigger a REVERT_ALL, all the atoms of all the
+            # related subflows are marked as REVERT but a task of a related
+            # flow may still be running in another thread. If this task
+            # triggers a RETRY, it overrides the previously set REVERT status,
+            # breaking the revert path of the flow.
+            if cur_intention == st.REVERT and intention == st.RETRY:
+                continue
             if state or intention:
                 tweaked.append((atom, state, intention))
             if state:

taskflow/tests/unit/jobs/test_redis_job.py

@@ -161,14 +161,11 @@ class RedisJobboardTest(test.TestCase, base.BoardTestMixin):
             test_conf = {
                 'username': 'default',
                 'password': 'secret',
+                'sentinel_kwargs': None,
             }
             mock_sentinel.assert_called_once_with(
                 [('127.0.0.1', 26379), ('::1', 26379),
                  ('127.0.0.2', 26379), ('localhost', 26379)],
-                sentinel_kwargs={
-                    'username': 'default',
-                    'password': 'secret'
-                },
                 **test_conf)
             mock_sentinel().master_for.assert_called_once_with('mymaster')
 
@@ -179,7 +176,7 @@ class RedisJobboardTest(test.TestCase, base.BoardTestMixin):
                 'password': 'secret',
                 'namespace': 'test',
                 'sentinel': 'mymaster',
-                'sentinel_kwargs': {'password': 'senitelsecret'},
+                'sentinel_kwargs': None,
                 'ssl': True,
                 'ssl_ca_certs': '/etc/ssl/certs'}
         with mock.patch('redis.sentinel.Sentinel') as mock_sentinel:
@@ -192,6 +189,6 @@ class RedisJobboardTest(test.TestCase, base.BoardTestMixin):
             }
             mock_sentinel.assert_called_once_with(
                 [('127.0.0.1', 26379)],
-                sentinel_kwargs={'password': 'senitelsecret'},
+                sentinel_kwargs=None,
                 **test_conf)
             mock_sentinel().master_for.assert_called_once_with('mymaster')

taskflow/tests/unit/test_retries.py

@@ -15,8 +15,10 @@
 #    under the License.
 
 import testtools
+import time
 
 import taskflow.engines
+from taskflow.engines.action_engine import executor
 from taskflow import exceptions as exc
 from taskflow.patterns import graph_flow as gf
 from taskflow.patterns import linear_flow as lf
@@ -497,6 +499,56 @@ class RetryTest(utils.EngineTestBase):
         self.assertRaisesRegex(RuntimeError, '^Woot', engine.run)
         self.assertRaisesRegex(RuntimeError, '^Woot', engine.run)
 
+    def test_restart_reverted_unordered_flows_with_retries(self):
+        now = time.time()
+
+        # First flow of an unordered flow:
+        subflow1 = lf.Flow('subflow1')
+
+        # * a task that completes in 3 sec with a few retries
+        subsubflow1 = lf.Flow('subflow1.subsubflow1',
+                              retry=utils.RetryFiveTimes())
+        subsubflow1.add(utils.SuccessAfter3Sec('subflow1.fail1',
+                                               inject={'start_time': now}))
+        subflow1.add(subsubflow1)
+
+        # * a task that fails and triggers a revert after 5 retries
+        subsubflow2 = lf.Flow('subflow1.subsubflow2',
+                              retry=utils.RetryFiveTimes())
+        subsubflow2.add(utils.FailingTask('subflow1.fail2'))
+        subflow1.add(subsubflow2)
+
+        # Second flow of the unordered flow:
+        subflow2 = lf.Flow('subflow2')
+
+        # * a task that always fails and retries
+        subsubflow1 = lf.Flow('subflow2.subsubflow1',
+                              retry=utils.AlwaysRetry())
+        subsubflow1.add(utils.FailingTask('subflow2.fail1'))
+        subflow2.add(subsubflow1)
+
+        unordered_flow = uf.Flow('unordered_flow')
+        unordered_flow.add(subflow1, subflow2)
+
+        # Main flow, contains a simple task and an unordered flow
+        flow = lf.Flow('test')
+        flow.add(utils.NoopTask('task1'))
+        flow.add(unordered_flow)
+
+        engine = self._make_engine(flow)
+
+        # This test fails when using Green threads, skipping it for now
+        if isinstance(engine._task_executor,
+                      executor.ParallelGreenThreadTaskExecutor):
+            self.skipTest("Skipping this test when using green threads.")
+
+        with utils.CaptureListener(engine) as capturer:
+            self.assertRaisesRegex(exc.WrappedFailure,
+                                   '.*RuntimeError: Woot!',
+                                   engine.run)
+            # task1 should have been reverted
+            self.assertIn('task1.t REVERTED(None)', capturer.values)
+
     def test_run_just_retry(self):
         flow = utils.OneReturnRetry(provides='x')
         engine = self._make_engine(flow)

taskflow/tests/utils.py

@@ -217,6 +217,32 @@ class FailingTask(ProgressingTask):
         raise RuntimeError('Woot!')
 
 
+class SimpleTask(task.Task):
+    def execute(self, time_sleep=0, **kwargs):
+        time.sleep(time_sleep)
+
+
+class SuccessAfter3Sec(task.Task):
+    def execute(self, start_time, **kwargs):
+        now = time.time()
+        if now - start_time >= 3:
+            return None
+        raise RuntimeError('Woot!')
+
+
+class RetryFiveTimes(retry.Times):
+    def on_failure(self, history, *args, **kwargs):
+        if len(history) < 5:
+            time.sleep(1)
+            return retry.RETRY
+        return retry.REVERT_ALL
+
+
+class AlwaysRetry(retry.Times):
+    def on_failure(self, history, *args, **kwargs):
+        return retry.RETRY
+
+
 class OptionalTask(task.Task):
     def execute(self, a, b=5):
         result = a * b

{taskflow-5.6.0.dist-info → taskflow-5.6.1.dist-info}/METADATA

@@ -1,13 +1,11 @@
 Metadata-Version: 2.1
 Name: taskflow
-Version: 5.6.0
+Version: 5.6.1
 Summary: Taskflow structured state management library.
 Home-page: https://docs.openstack.org/taskflow/latest/
 Author: OpenStack
 Author-email: openstack-discuss@lists.openstack.org
-License: UNKNOWN
 Keywords: reliable,tasks,execution,parallel,dataflow,workflows,distributed
-Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: OpenStack
 Classifier: Intended Audience :: Developers
@@ -25,41 +23,43 @@ Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: System :: Distributed Computing
 Requires-Python: >=3.8
-Requires-Dist: automaton (>=1.9.0)
-Requires-Dist: cachetools (>=2.0.0)
-Requires-Dist: fasteners (>=0.17.3)
-Requires-Dist: futurist (>=1.2.0)
-Requires-Dist: jsonschema (>=3.2.0)
-Requires-Dist: networkx (>=2.1.0)
-Requires-Dist: oslo.serialization (!=2.19.1,>=2.18.0)
-Requires-Dist: oslo.utils (>=3.33.0)
-Requires-Dist: pbr (!=2.1.0,>=2.0.0)
-Requires-Dist: pydot (>=1.2.4)
-Requires-Dist: stevedore (>=1.20.0)
-Requires-Dist: tenacity (>=6.0.0)
+License-File: LICENSE
+License-File: AUTHORS
+Requires-Dist: pbr !=2.1.0,>=2.0.0
+Requires-Dist: futurist >=1.2.0
+Requires-Dist: fasteners >=0.17.3
+Requires-Dist: networkx >=2.1.0
+Requires-Dist: stevedore >=1.20.0
+Requires-Dist: jsonschema >=3.2.0
+Requires-Dist: automaton >=1.9.0
+Requires-Dist: oslo.utils >=3.33.0
+Requires-Dist: oslo.serialization !=2.19.1,>=2.18.0
+Requires-Dist: tenacity >=6.0.0
+Requires-Dist: cachetools >=2.0.0
+Requires-Dist: pydot >=1.2.4
 Provides-Extra: database
-Requires-Dist: PyMySQL (>=0.7.6) ; extra == 'database'
-Requires-Dist: SQLAlchemy (!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10) ; extra == 'database'
-Requires-Dist: SQLAlchemy-Utils (>=0.30.11) ; extra == 'database'
-Requires-Dist: alembic (>=0.8.10) ; extra == 'database'
-Requires-Dist: psycopg2 (>=2.8.0) ; extra == 'database'
+Requires-Dist: SQLAlchemy !=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 ; extra == 'database'
+Requires-Dist: alembic >=0.8.10 ; extra == 'database'
+Requires-Dist: SQLAlchemy-Utils >=0.30.11 ; extra == 'database'
+Requires-Dist: PyMySQL >=0.7.6 ; extra == 'database'
+Requires-Dist: psycopg2 >=2.8.0 ; extra == 'database'
 Provides-Extra: eventlet
-Requires-Dist: eventlet (!=0.18.3,!=0.20.1,!=0.21.0,>=0.18.2) ; extra == 'eventlet'
+Requires-Dist: eventlet !=0.18.3,!=0.20.1,!=0.21.0,>=0.18.2 ; extra == 'eventlet'
 Provides-Extra: redis
-Requires-Dist: redis (>=4.0.0) ; extra == 'redis'
+Requires-Dist: redis >=4.0.0 ; extra == 'redis'
 Provides-Extra: test
-Requires-Dist: hacking (<0.11,>=0.10.0) ; extra == 'test'
-Requires-Dist: mock (>=2.0.0) ; extra == 'test'
-Requires-Dist: oslotest (>=3.2.0) ; extra == 'test'
-Requires-Dist: pydotplus (>=2.0.2) ; extra == 'test'
-Requires-Dist: stestr (>=2.0.0) ; extra == 'test'
-Requires-Dist: testscenarios (>=0.4) ; extra == 'test'
-Requires-Dist: testtools (>=2.2.0) ; extra == 'test'
+Requires-Dist: pydotplus >=2.0.2 ; extra == 'test'
+Requires-Dist: hacking <0.11,>=0.10.0 ; extra == 'test'
+Requires-Dist: oslotest >=3.2.0 ; extra == 'test'
+Requires-Dist: mock >=2.0.0 ; extra == 'test'
+Requires-Dist: testtools >=2.2.0 ; extra == 'test'
+Requires-Dist: testscenarios >=0.4 ; extra == 'test'
+Requires-Dist: stestr >=2.0.0 ; extra == 'test'
 Provides-Extra: workers
-Requires-Dist: kombu (>=4.3.0) ; extra == 'workers'
+Requires-Dist: kombu >=4.3.0 ; extra == 'workers'
 Provides-Extra: zookeeper
-Requires-Dist: kazoo (>=2.6.0) ; extra == 'zookeeper'
-Requires-Dist: zake (>=0.1.6) ; extra == 'zookeeper'
+Requires-Dist: kazoo >=2.6.0 ; extra == 'zookeeper'
+Requires-Dist: zake >=0.1.6 ; extra == 'zookeeper'
 
 ========================
 Team and repository tags
@@ -135,5 +135,3 @@ We also have sphinx documentation in ``docs/source``.
 .. _eventlet: http://eventlet.net/
 .. _tox: https://tox.testrun.org/
 
-
-

{taskflow-5.6.0.dist-info → taskflow-5.6.1.dist-info}/RECORD

@@ -29,7 +29,7 @@ taskflow/engines/action_engine/deciders.py,sha256=WEKo189CL9Zdg506Sz3Mlxpfp6dqGv
 taskflow/engines/action_engine/engine.py,sha256=RCjtPkpT2_aqpuhGZb3ZSruOMZdoVEm9PXpiVDzpLZU,29532
 taskflow/engines/action_engine/executor.py,sha256=sBmKwgDQN9fEZz42T7RB-RYUZvWqfHqC-Y2EsWRGkYI,7749
 taskflow/engines/action_engine/process_executor.py,sha256=4fbJtO7XWWnCWSKBTKEMrMNi2ryZn7W6c0LT3j1w5D4,27828
-taskflow/engines/action_engine/runtime.py,sha256=exGFpk7iPPrl7vywAHqdeDW-cyFlYxphPLi8W1umP3o,13845
+taskflow/engines/action_engine/runtime.py,sha256=FAUJZsZaADo4t1kRzs0Pf5z2qRjrlNG5GCycUoe4N8U,14604
 taskflow/engines/action_engine/scheduler.py,sha256=yZEn2z23N-0XNpHtjOs3kxJh4CTpZl-2ASrPsyLP2t0,4048
 taskflow/engines/action_engine/scopes.py,sha256=u0cmoMycrNZqMebgKqLW2YXBVLukNi9dVqKOFr79lKw,5432
 taskflow/engines/action_engine/selector.py,sha256=9FKRKOi6mqIn4kfEY2R6Uq6aVzPPsT0DgI1VDVRaZdU,11558
@@ -148,7 +148,7 @@ taskflow/persistence/backends/sqlalchemy/alembic/versions/README,sha256=AwegmiWc
 taskflow/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 taskflow/tests/fixtures.py,sha256=VfGlusX2q79_ktPME4cm1qt_gN9VNRAwyYy5sDBAX0Y,2004
 taskflow/tests/test_examples.py,sha256=g2zhguLKE4Tex2e_vSmKMhsNXItnKWj89_VbnmgGejU,4925
-taskflow/tests/utils.py,sha256=P6RPD2w5h00KAse7r31LC9tJils0jaeiUx5QiVqLOA0,11157
+taskflow/tests/utils.py,sha256=Xa1o6x6LnOWtNa_eNXmOrMZPcdr2hmo4f_MJF-D5Xa4,11788
 taskflow/tests/unit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 taskflow/tests/unit/test_arguments_passing.py,sha256=gEtOSx9fibT_peqqWhtqCY96P1AJjaCEo3Hry0qdPak,9204
 taskflow/tests/unit/test_check_transition.py,sha256=DuxJAErCwheWPAdN_43LOOvZg00vmUoC-IzGgh642IM,6173
@@ -166,7 +166,7 @@ taskflow/tests/unit/test_mapfunctor_task.py,sha256=1FI8AJxRUPxT7Lu6h9Mhd62srAnKf
 taskflow/tests/unit/test_notifier.py,sha256=Q4xGl9e_LZRiJVpGR2FbG2qSp9CqlP65aDsaIKxPqHI,7894
 taskflow/tests/unit/test_progress.py,sha256=oeYFeWuHde1D2cAahhE1yN1NznNcXk7ajw0Z2yCyZkM,5259
 taskflow/tests/unit/test_reducefunctor_task.py,sha256=vM4P5h80-Ex4uq2N_dNmTFL49Ks3iFmP5dMbZEk0YQ0,2106
-taskflow/tests/unit/test_retries.py,sha256=UBYPtjTwydx7FnMuwYzYQOWta8bh8qtaA2tkEMqDhHE,56365
+taskflow/tests/unit/test_retries.py,sha256=KDZbF-eWNKGvD-ezNRG--Pnbj9-5RCKBzuvpgvWtm38,58481
 taskflow/tests/unit/test_states.py,sha256=iYyHo9YzHBMjlYaqlzZJTcKjB53WCqf5Fw3OGoVKVME,3660
 taskflow/tests/unit/test_storage.py,sha256=SlShgJ4hirdnggDkpB3GoosY--4B0PqMOVvMBG5D6g4,23520
 taskflow/tests/unit/test_suspend.py,sha256=j4M5J2G1aoGUJb111_xUUb0oYJfgRo9hC4ZFyr-00d4,9900
@@ -187,7 +187,7 @@ taskflow/tests/unit/action_engine/test_scoping.py,sha256=wIB9C3LMgfsqO6cdz_ZdhQc
 taskflow/tests/unit/jobs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 taskflow/tests/unit/jobs/base.py,sha256=wYv5ziDeVdYn2nhuMSfYTWU39Xxpv8lRKvJbGsB79lM,8447
 taskflow/tests/unit/jobs/test_entrypoint.py,sha256=t2m5zeYhjb2pmPxBgGO_0AMWR0dabWxglDBODzLE0fY,2220
-taskflow/tests/unit/jobs/test_redis_job.py,sha256=Ko8s96Sr8ilRUe6p_yybZUKs5FVTiRl0nMERMJswy2M,7540
+taskflow/tests/unit/jobs/test_redis_job.py,sha256=wHwptqgrafZMk0aDZNvn2h3sJw8ckKY1g5J9I_dzWAM,7394
 taskflow/tests/unit/jobs/test_zk_job.py,sha256=e5CdkqmiQY_jzNtcHsxKcsS9uY7k-D8CMGkqt1J_bqE,13789
 taskflow/tests/unit/patterns/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 taskflow/tests/unit/patterns/test_graph_flow.py,sha256=g5x6RdEgD6Sws3C5zmgz3kFpbJLEoi6i42RSEk5Vlso,12452
@@ -232,11 +232,11 @@ taskflow/utils/persistence_utils.py,sha256=GWceOcxdfsf-MtrdR74xmC2khClF8im6DpZmR
 taskflow/utils/redis_utils.py,sha256=zJBvXmlNZUQ_gwGZAaNLySVtCtou3YayHAkGSCNKDUw,4345
 taskflow/utils/schema_utils.py,sha256=Zf6eL0NK0_TVFD_Sc1yEZYswFz9K0tet1Dmj48F8uMA,1434
 taskflow/utils/threading_utils.py,sha256=eiaNUK127DOBr_zfj3-j4Oi5a2dsD7VunVeTYN6NjPo,5849
-taskflow-5.6.0.dist-info/AUTHORS,sha256=tle5nZW61YeKYzeIWT7GN7FJ6_Y0UkBX_oYE2tDMgKc,4530
-taskflow-5.6.0.dist-info/LICENSE,sha256=0t4vVm0tDgtQn7DqH6Nmn0kGSrHeIcV0U8qzdQojTo8,10143
-taskflow-5.6.0.dist-info/METADATA,sha256=4sOTaS700K8VJhSUNMhUUPNhbK99iEZGRPmGbz2cFkM,5150
-taskflow-5.6.0.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
-taskflow-5.6.0.dist-info/entry_points.txt,sha256=MGjjnng_YpSJs9BMAJBC2hJnljMV0pNllXl_5VoHJV0,1183
-taskflow-5.6.0.dist-info/pbr.json,sha256=sOEouTVPek9jsny8UcBxoKL_PTvTR-_fZPHqbhIepFk,47
-taskflow-5.6.0.dist-info/top_level.txt,sha256=PsdN41vwysesDlqHCSVVXH4mkTMdMiZFW_yHEAXiZE4,9
-taskflow-5.6.0.dist-info/RECORD,,
+taskflow-5.6.1.dist-info/AUTHORS,sha256=tle5nZW61YeKYzeIWT7GN7FJ6_Y0UkBX_oYE2tDMgKc,4530
+taskflow-5.6.1.dist-info/LICENSE,sha256=0t4vVm0tDgtQn7DqH6Nmn0kGSrHeIcV0U8qzdQojTo8,10143
+taskflow-5.6.1.dist-info/METADATA,sha256=nco8fLkosHJgz7lS1aYOynkN2NNEriO5IChcSEgK8_8,5099
+taskflow-5.6.1.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+taskflow-5.6.1.dist-info/entry_points.txt,sha256=XtpPeEh52QgJ7IOy68z7_5nSrohCjhbpHwN3bgyNqqg,1182
+taskflow-5.6.1.dist-info/pbr.json,sha256=9rNV-0TqLzQMcCdjF-v7Gpa2IE6IPtss5GhuoO-4RSg,47
+taskflow-5.6.1.dist-info/top_level.txt,sha256=PsdN41vwysesDlqHCSVVXH4mkTMdMiZFW_yHEAXiZE4,9
+taskflow-5.6.1.dist-info/RECORD,,

{taskflow-5.6.0.dist-info → taskflow-5.6.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.34.2)
+Generator: setuptools (75.3.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

{taskflow-5.6.0.dist-info → taskflow-5.6.1.dist-info}/entry_points.txt

@@ -21,4 +21,3 @@ mysql = taskflow.persistence.backends.impl_sqlalchemy:SQLAlchemyBackend
 postgresql = taskflow.persistence.backends.impl_sqlalchemy:SQLAlchemyBackend
 sqlite = taskflow.persistence.backends.impl_sqlalchemy:SQLAlchemyBackend
 zookeeper = taskflow.persistence.backends.impl_zookeeper:ZkBackend
-

taskflow-5.6.1.dist-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "24c88865", "is_release": true}

taskflow-5.6.0.dist-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "39440b74", "is_release": true}