Bug: filter job submission clusters out of cluster list (#409)

Azure · Mar 9, 2018 · 1c31335 · 1c31335
1 parent f1e3f7a
commit 1c31335
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/aztk/client.py b/aztk/client.py
@@ -108,6 +108,8 @@ def __create_pool_and_job(self, cluster_conf: models.ClusterConfiguration, softw
             metadata=[
                 batch_models.MetadataItem(
                     name=constants.AZTK_SOFTWARE_METADATA_KEY, value=software_metadata_key),
+                batch_models.MetadataItem(
+                        name=constants.AZTK_MODE_METADATA_KEY, value=constants.AZTK_CLUSTER_MODE_METADATA)
             ])
 
         # Create the pool + create user for the pool
@@ -140,10 +142,13 @@ def __list_clusters(self, software_metadata_key):
         pools = self.batch_client.pool.list()
         software_metadata = (
             constants.AZTK_SOFTWARE_METADATA_KEY, software_metadata_key)
+        cluster_metadata = (
+            constants.AZTK_MODE_METADATA_KEY, constants.AZTK_CLUSTER_MODE_METADATA)
 
         aztk_pools = []
         for pool in [pool for pool in pools if pool.metadata]:
-            if software_metadata in [(metadata.name, metadata.value) for metadata in pool.metadata]:
+            pool_metadata = [(metadata.name, metadata.value) for metadata in pool.metadata]
+            if all([metadata in pool_metadata for metadata in [software_metadata, cluster_metadata]]):
                 aztk_pools.append(pool)
         return aztk_pools
 
@@ -300,7 +305,9 @@ def __submit_job(self,
                 max_tasks_per_node=1,
                 metadata=[
                     batch_models.MetadataItem(
-                        name=constants.AZTK_SOFTWARE_METADATA_KEY, value=software_metadata_key)
+                        name=constants.AZTK_SOFTWARE_METADATA_KEY, value=software_metadata_key),
+                    batch_models.MetadataItem(
+                        name=constants.AZTK_MODE_METADATA_KEY, value=constants.AZTK_JOB_MODE_METADATA)
                 ]
             )
         )

diff --git a/aztk/utils/constants.py b/aztk/utils/constants.py
@@ -58,6 +58,10 @@
 
 AZTK_SOFTWARE_METADATA_KEY = "_aztk_software"
 
+AZTK_MODE_METADATA_KEY = "_aztk_mode"
+AZTK_CLUSTER_MODE_METADATA = "cluster"
+AZTK_JOB_MODE_METADATA = "job"
+
 AZTK_CLUSTER_CONFIG_METADATA_KEY = "_aztk_cluster_config"
 
 TASK_WORKING_DIR = "wd"