Page Menu
Home
Software Heritage
Search
Configure Global Search
Log In
Files
F9346191
D8102.id29242.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
5 KB
Subscribers
None
D8102.id29242.diff
View Options
diff --git a/swh/scheduler/__init__.py b/swh/scheduler/__init__.py
--- a/swh/scheduler/__init__.py
+++ b/swh/scheduler/__init__.py
@@ -13,7 +13,7 @@
"scheduler": (
"dict",
{
- "cls": "local",
+ "cls": "postgresql",
"db": "dbname=softwareheritage-scheduler-dev",
},
)
diff --git a/swh/scheduler/api/server.py b/swh/scheduler/api/server.py
--- a/swh/scheduler/api/server.py
+++ b/swh/scheduler/api/server.py
@@ -112,9 +112,9 @@
if type == "local":
cls = vcfg.get("cls")
- if cls != "local":
+ if cls not in ("local", "postgresql"):
raise ValueError(
- "The scheduler backend can only be started with a 'local' "
+ "The scheduler backend can only be started with a 'postgresql' "
"configuration"
)
diff --git a/swh/scheduler/celery_backend/pika_listener.py b/swh/scheduler/celery_backend/pika_listener.py
--- a/swh/scheduler/celery_backend/pika_listener.py
+++ b/swh/scheduler/celery_backend/pika_listener.py
@@ -104,7 +104,9 @@
if __name__ == "__main__":
url = sys.argv[1]
logging.basicConfig(level=logging.DEBUG)
- scheduler_backend = get_scheduler("local", args={"db": "service=swh-scheduler"})
+ scheduler_backend = get_scheduler(
+ "postgresql", args={"db": "service=swh-scheduler"}
+ )
channel = get_listener(url, "celeryev.test", scheduler_backend)
logger.info("Start consuming")
channel.start_consuming()
diff --git a/swh/scheduler/celery_backend/runner.py b/swh/scheduler/celery_backend/runner.py
--- a/swh/scheduler/celery_backend/runner.py
+++ b/swh/scheduler/celery_backend/runner.py
@@ -172,7 +172,7 @@
for module in main_app.conf.CELERY_IMPORTS:
__import__(module)
- main_backend = get_scheduler("local")
+ main_backend = get_scheduler("postgresql")
try:
run_ready_tasks(main_backend, main_app)
except Exception:
diff --git a/swh/scheduler/cli/__init__.py b/swh/scheduler/cli/__init__.py
--- a/swh/scheduler/cli/__init__.py
+++ b/swh/scheduler/cli/__init__.py
@@ -33,7 +33,7 @@
"--database",
"-d",
default=None,
- help="Scheduling database DSN (imply cls is 'local')",
+ help="Scheduling database DSN (imply cls is 'postgresql')",
)
@click.option(
"--url", "-u", default=None, help="Scheduler's url access (imply cls is 'remote')"
@@ -67,7 +67,7 @@
raise ValueError("missing 'scheduler' configuration")
if database:
- conf["scheduler"]["cls"] = "local"
+ conf["scheduler"]["cls"] = "postgresql"
conf["scheduler"]["db"] = database
elif url:
conf["scheduler"]["cls"] = "remote"
diff --git a/swh/scheduler/pytest_plugin.py b/swh/scheduler/pytest_plugin.py
--- a/swh/scheduler/pytest_plugin.py
+++ b/swh/scheduler/pytest_plugin.py
@@ -44,7 +44,7 @@
@pytest.fixture
def swh_scheduler(swh_scheduler_config):
- scheduler = get_scheduler("local", **swh_scheduler_config)
+ scheduler = get_scheduler("postgresql", **swh_scheduler_config)
for taskname in TASK_NAMES:
scheduler.create_task_type(
{
diff --git a/swh/scheduler/tests/test_cli_journal.py b/swh/scheduler/tests/test_cli_journal.py
--- a/swh/scheduler/tests/test_cli_journal.py
+++ b/swh/scheduler/tests/test_cli_journal.py
@@ -22,7 +22,7 @@
"""Journal client configuration ready"""
return {
"scheduler": {
- "cls": "local",
+ "cls": "postgresql",
"db": postgresql_scheduler.dsn,
},
"journal": {
diff --git a/swh/scheduler/tests/test_init.py b/swh/scheduler/tests/test_init.py
--- a/swh/scheduler/tests/test_init.py
+++ b/swh/scheduler/tests/test_init.py
@@ -14,7 +14,7 @@
SERVER_IMPLEMENTATIONS = [
("remote", RemoteScheduler, {"url": "localhost"}),
- ("local", SchedulerBackend, {"db": "something"}),
+ ("postgresql", SchedulerBackend, {"db": "something"}),
]
diff --git a/swh/scheduler/tests/test_recurrent_visits.py b/swh/scheduler/tests/test_recurrent_visits.py
--- a/swh/scheduler/tests/test_recurrent_visits.py
+++ b/swh/scheduler/tests/test_recurrent_visits.py
@@ -169,7 +169,7 @@
@pytest.fixture
def scheduler_config(swh_scheduler_config):
- return {"scheduler": {"cls": "local", **swh_scheduler_config}, "celery": {}}
+ return {"scheduler": {"cls": "postgresql", **swh_scheduler_config}, "celery": {}}
def test_visit_scheduler_thread_unknown_task(
diff --git a/swh/scheduler/tests/test_server.py b/swh/scheduler/tests/test_server.py
--- a/swh/scheduler/tests/test_server.py
+++ b/swh/scheduler/tests/test_server.py
@@ -58,7 +58,7 @@
config = {"scheduler": {"cls": "remote"}}
config_path = prepare_config_file(tmpdir, config)
expected_error = (
- "The scheduler backend can only be started with a 'local'" " configuration"
+ "The scheduler backend can only be started with a 'postgresql'" " configuration"
)
with pytest.raises(ValueError, match=expected_error):
load_and_check_config(config_path, type="local")
@@ -68,7 +68,7 @@
"""Incomplete 'local' configuration should raise"""
config = {
"scheduler": {
- "cls": "local",
+ "cls": "postgresql",
"something": "needed-for-test",
}
}
@@ -83,7 +83,7 @@
"""Local configuration is fine"""
config = {
"scheduler": {
- "cls": "local",
+ "cls": "postgresql",
"db": "db",
}
}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Thu, Jul 3, 3:48 PM (2 w, 11 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3227793
Attached To
D8102: Fix the load_and_check_config() function to support the "postgresql" cls value
Event Timeline
Log In to Comment