paasta-tools 1.25.1__tar.gz → 1.26.0__tar.gz

{paasta_tools-1.25.1/paasta_tools.egg-info → paasta_tools-1.26.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: paasta-tools
-Version: 1.25.1
+Version: 1.26.0
 Summary: Tools for Yelps SOA infrastructure
 Author: Compute Infrastructure @ Yelp
 Author-email: compute-infra@yelp.com

{paasta_tools-1.25.1 → paasta_tools-1.26.0}/paasta_tools/__init__.py

@@ -17,4 +17,4 @@
 # setup phase, the dependencies may not exist on disk yet.
 #
 # Don't bump version manually. See `make release` docs in ./Makefile
-__version__ = "1.25.1"
+__version__ = "1.26.0"

{paasta_tools-1.25.1 → paasta_tools-1.26.0}/paasta_tools/cli/schemas/tron_schema.json

@@ -91,6 +91,11 @@
                     },
                     "uniqueItems": true
                 },
+                "idempotent": {
+                    "type": "boolean",
+                    "default": false,
+                    "$comment": "This will be used to determine whether the action can be retried without side effects."
+                },
                 "extra_constraints": {
                     "type": "array",
                     "items": {

{paasta_tools-1.25.1 → paasta_tools-1.26.0}/paasta_tools/tron_tools.py

@@ -260,6 +260,7 @@ class TronActionConfigDict(InstanceConfigDict, total=False):
     # TODO: TRON-2145: use this to implement timeout for non-spark actions in tron
     max_runtime: str
     mrjob: bool
+    idempotent: bool
 
 
 class TronActionConfig(InstanceConfig):
@@ -422,6 +423,9 @@ class TronActionConfig(InstanceConfig):
     def get_job_name(self):
         return self.job
 
+    def get_idempotent(self) -> bool:
+        return self.config_dict.get("idempotent", False)
+
     def get_action_name(self):
         return self.action
 
@@ -977,6 +981,7 @@ def format_tron_action_dict(action_config: TronActionConfig):
         "secret_volumes": action_config.get_secret_volumes(),
         "expected_runtime": action_config.get_expected_runtime(),
         "trigger_downstreams": action_config.get_trigger_downstreams(),
+        "idempotent": action_config.get_idempotent(),
         "triggered_by": action_config.get_triggered_by(),
         "on_upstream_rerun": action_config.get_on_upstream_rerun(),
         "trigger_timeout": action_config.get_trigger_timeout(),
@@ -1046,6 +1051,9 @@ def format_tron_action_dict(action_config: TronActionConfig):
                 limit=63,
                 suffix=4,
             ),
+            "tron.yelp.com/idempotent-action": str(
+                action_config.get_idempotent()
+            ).lower(),
             # XXX: should this be different for Spark drivers launched by Tron?
             "app.kubernetes.io/managed-by": "tron",
         }

{paasta_tools-1.25.1 → paasta_tools-1.26.0/paasta_tools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: paasta-tools
-Version: 1.25.1
+Version: 1.26.0
 Summary: Tools for Yelps SOA infrastructure
 Author: Compute Infrastructure @ Yelp
 Author-email: compute-infra@yelp.com

{paasta_tools-1.25.1 → paasta_tools-1.26.0}/tests/test_tron_tools.py

@@ -1043,6 +1043,7 @@ class TestTronTools:
             "mem": 1200,
             "disk": 42,
             "env": mock.ANY,
+            "idempotent": False,
             "topology_spread_constraints": [
                 {
                     "label_selector": {
@@ -1083,6 +1084,7 @@ class TestTronTools:
                 "paasta.yelp.com/service": "my_service",
                 "yelp.com/owner": "compute_infra_platform_experience",
                 "app.kubernetes.io/managed-by": "tron",
+                "tron.yelp.com/idempotent-action": "false",
             },
             "annotations": {
                 "paasta.yelp.com/routable_ip": "false",
@@ -1150,6 +1152,7 @@ class TestTronTools:
             "deploy_group": "prod",
             "executor": "spark",
             "disk": 42,
+            "idempotent": True,
             "pool": "special_pool",
             "env": {"SHELL": "/bin/bash"},
             "secret_volumes": [
@@ -1449,7 +1452,9 @@ class TestTronTools:
                 "paasta.yelp.com/prometheus_shard": "ml-compute",
                 "spark.yelp.com/user": "TRON",
                 "spark.yelp.com/driver_ui_port": "39091",
+                "tron.yelp.com/idempotent-action": "true",
             },
+            "idempotent": True,
             "annotations": {
                 "paasta.yelp.com/routable_ip": "true",
                 "paasta.yelp.com/service": "my_service",
@@ -1493,6 +1498,7 @@ class TestTronTools:
             "deploy_group": "prod",
             "pool": "default",
             "executor": "paasta",
+            "idempotent": True,
         }
         branch_dict = {
             "docker_image": "my_service:paasta-123abcde",
@@ -1534,6 +1540,7 @@ class TestTronTools:
             "disk": 1024,
             "cap_add": [],
             "cap_drop": CAPS_DROP,
+            "idempotent": True,
             "labels": {
                 "paasta.yelp.com/cluster": "test-cluster",
                 "paasta.yelp.com/instance": "job_name.instance_name",
@@ -1541,6 +1548,7 @@ class TestTronTools:
                 "paasta.yelp.com/service": "my_service",
                 "yelp.com/owner": "compute_infra_platform_experience",
                 "app.kubernetes.io/managed-by": "tron",
+                "tron.yelp.com/idempotent-action": "true",
             },
             "annotations": {
                 "paasta.yelp.com/routable_ip": "false",
@@ -1678,6 +1686,7 @@ class TestTronTools:
             "cpus": 2,
             "mem": 1200,
             "disk": 42,
+            "idempotent": False,
             "cap_add": [],
             "cap_drop": CAPS_DROP,
             "labels": {
@@ -1687,6 +1696,7 @@ class TestTronTools:
                 "paasta.yelp.com/service": "my_service",
                 "yelp.com/owner": "compute_infra_platform_experience",
                 "app.kubernetes.io/managed-by": "tron",
+                "tron.yelp.com/idempotent-action": "false",
             },
             "annotations": {
                 "paasta.yelp.com/routable_ip": "false",
@@ -1811,6 +1821,7 @@ class TestTronTools:
             "cpus": 2,
             "mem": 1200,
             "disk": 42,
+            "idempotent": False,
             "env": mock.ANY,
             "topology_spread_constraints": [
                 {
@@ -1849,6 +1860,7 @@ class TestTronTools:
                 "paasta.yelp.com/service": "my_service",
                 "yelp.com/owner": "compute_infra_platform_experience",
                 "app.kubernetes.io/managed-by": "tron",
+                "tron.yelp.com/idempotent-action": "false",
             },
             "annotations": {
                 "paasta.yelp.com/routable_ip": "false",
@@ -2004,7 +2016,7 @@ fake_job:
         # that are not static, this will cause continuous reconfiguration, which
         # will add significant load to the Tron API, which happened in DAR-1461.
         # but if this is intended, just change the hash.
-        assert hasher.hexdigest() == "b4c7ee4d47787f081b58b44df10a07f1"
+        assert hasher.hexdigest() == "5cf9985b6227ce18dc87376b687046f7"
 
     def test_override_default_pool_override(self, tmpdir):
         soa_dir = tmpdir.mkdir("test_create_complete_config_soa")