Skip to content

Commit

Permalink
adding task_topological_generations_without_scheduler for threads (#635)
Browse files Browse the repository at this point in the history
  • Loading branch information
eamonnfaherty committed Feb 14, 2023
1 parent bd2330e commit a004dc1
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

[tool.poetry]
name = "aws-service-catalog-puppet"
version = "0.218.0"
version = "0.219.0"
description = "Making it easier to deploy ServiceCatalog products"
classifiers = ["Development Status :: 5 - Production/Stable", "Intended Audience :: Developers", "Programming Language :: Python :: 3", "License :: OSI Approved :: Apache Software License", "Operating System :: OS Independent", "Natural Language :: English"]
homepage = "https://service-catalog-tools-workshop.com/"
Expand Down
2 changes: 1 addition & 1 deletion servicecatalog_puppet/waluigi/dag_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

def build_the_dag(tasks_to_run: dict):
g = nx.DiGraph()
#print("-- BUILDING THE DAG!!!")
# print("-- BUILDING THE DAG!!!")
for uid, task in tasks_to_run.items():
g.add_nodes_from(
[(uid, task),]
Expand Down
2 changes: 1 addition & 1 deletion servicecatalog_puppet/waluigi/locks/external.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def lock_resources_for_task(
resources_in_use: dict,
resources_file_path: str,
):
#print(f"Worker locking {task_reference}")
# print(f"Worker locking {task_reference}")
for r in task_parameters.get(RESOURCES_REQUIRED, []):
resources_in_use[r] = task_reference
with open(resources_file_path, "wb") as f:
Expand Down
5 changes: 5 additions & 0 deletions servicecatalog_puppet/waluigi/threads/runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,18 @@
from servicecatalog_puppet.waluigi.shared_tasks.workers.worker_requiring_scheduler import (
worker_task,
)
from servicecatalog_puppet.waluigi.shared_tasks.task_topological_generations_without_scheduler import (
worker_task as task_topological_generations_without_scheduler_worker_task,
)

QUEUE_REFILL_SLEEP_DURATION = 0.2


def get_tasks(scheduling_algorithm):
if scheduling_algorithm == "topological_generations":
return worker_task, scheduler_task
if scheduling_algorithm == "topological_generations_without_scheduler":
return worker_task, scheduler_task
raise ValueError(f"Unsupported scheduling_algorithm: {scheduling_algorithm}")


Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@

setup_kwargs = {
'name': 'aws-service-catalog-puppet',
'version': '0.218.0',
'version': '0.219.0',
'description': 'Making it easier to deploy ServiceCatalog products',
'long_description': '# aws-service-catalog-puppet\n\n![logo](./docs/logo.png) \n\n## Badges\n\n[![codecov](https://codecov.io/gh/awslabs/aws-service-catalog-puppet/branch/master/graph/badge.svg?token=e8M7mdsmy0)](https://codecov.io/gh/awslabs/aws-service-catalog-puppet)\n\n\n## What is it?\nThis is a python3 framework that makes it easier to share multi region AWS Service Catalog portfolios and makes it \npossible to provision products into accounts declaratively using a metadata based rules engine.\n\nWith this framework you define your accounts in a YAML file. You give each account a set of tags, a default region and \na set of enabled regions.\n\nOnce you have done this you can define portfolios should be shared with each set of accounts using the tags and you \ncan specify which regions the shares occur in.\n\nIn addition to this, you can also define products that should be provisioned into accounts using the same tag based \napproach. The framework will assume role into the target account and provision the product on your behalf.\n\n\n## Getting started\n\nYou can read the [installation how to](https://service-catalog-tools-workshop.com/30-how-tos/10-installation/30-service-catalog-puppet.html)\nor you can read through the [every day use](https://service-catalog-tools-workshop.com/30-how-tos/50-every-day-use.html)\nguides.\n\nYou can read the [documentation](https://aws-service-catalog-puppet.readthedocs.io/en/latest/) to understand the inner \nworkings. \n\n\n## Going further\n\nThe framework is one of a pair. The other is [aws-service-catalog-factory](https://github.com/awslabs/aws-service-catalog-factory).\nWith Service Catalog Factory you can create pipelines that deploy multi region portfolios very easily. \n\n## License\n\nThis library is licensed under the Apache 2.0 License. \n \n',
'author': 'Eamonn Faherty',
Expand Down

0 comments on commit a004dc1

Please sign in to comment.