bamboo-engine 2.6.2__tar.gz → 2.6.3__tar.gz

{bamboo_engine-2.6.2 → bamboo_engine-2.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bamboo-engine
-Version: 2.6.2
+Version: 2.6.3
 Summary: Bamboo-engine is a general-purpose workflow engine
 License: MIT
 Author: blueking

{bamboo_engine-2.6.2 → bamboo_engine-2.6.3}/bamboo_engine/__version__.py

@@ -11,4 +11,4 @@ an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express o
 specific language governing permissions and limitations under the License.
 """
 
-__version__ = "2.6.2"
+__version__ = "2.6.3"

{bamboo_engine-2.6.2 → bamboo_engine-2.6.3}/bamboo_engine/engine.py

@@ -80,6 +80,7 @@ class Engine:
     PURE_SKIP_ENABLE_NODE_TYPE = {NodeType.ServiceActivity, NodeType.EmptyStartEvent}
     CALLBACK_LOCK_RETRY_HEADER = "callback_lock_retry_times"
     CALLBACK_LOCK_RETRY_LIMIT = 3
+    CALLBACK_LOCK_RETRY_DELAY_RANGES = ((1, 3), (3, 6), (6, 10))
 
     def __init__(self, runtime: EngineRuntimeInterface):
         self.runtime = runtime
@@ -103,6 +104,12 @@ class Engine:
         service = self.runtime.get_service(code=node.code, version=node.version)
         return callback_data, service.callback_lock_retryable(callback_data=callback_data.data)
 
+    def _callback_lock_retry_delay(self, retry_count: int) -> int:
+        delay_range = self.CALLBACK_LOCK_RETRY_DELAY_RANGES[
+            min(retry_count, len(self.CALLBACK_LOCK_RETRY_DELAY_RANGES) - 1)
+        ]
+        return random.randint(*delay_range)
+
     # api
     def run_pipeline(
         self,
@@ -1045,10 +1052,13 @@ class Engine:
                     )
                     return
 
-                try_after = random.randint(1, 5)
                 retry_headers = dict(headers or {})
                 if schedule.type is ScheduleType.CALLBACK:
-                    retry_headers[self.CALLBACK_LOCK_RETRY_HEADER] = self._schedule_lock_retry_count(headers) + 1
+                    current_retry_count = self._schedule_lock_retry_count(headers)
+                    try_after = self._callback_lock_retry_delay(current_retry_count)
+                    retry_headers[self.CALLBACK_LOCK_RETRY_HEADER] = current_retry_count + 1
+                else:
+                    try_after = random.randint(1, 5)
                 logger.info(
                     "root pipeline[%s] schedule(%s) lock %s with data %s fetch fail, try after %s, "
                     "retry_count=%s, callback_data=%s",

{bamboo_engine-2.6.2 → bamboo_engine-2.6.3}/bamboo_engine/eri/interfaces.py

@@ -113,6 +113,16 @@ class Service(metaclass=ABCMeta):
         :rtype: bool
         """
 
+    @abstractmethod
+    def callback_lock_retryable(self, callback_data=None) -> bool:
+        """
+        回调调度锁冲突时是否允许重试
+
+        :param callback_data: 回调数据
+        :return: 是否允许重试
+        :rtype: bool
+        """
+
     @abstractmethod
     def schedule_after(
         self,

{bamboo_engine-2.6.2 → bamboo_engine-2.6.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "bamboo-engine"
-version = "2.6.2"
+version = "2.6.3"
 description = "Bamboo-engine is a general-purpose workflow engine"
 authors = ["blueking <blueking@tencent.com>"]
 license = "MIT"