Create Schedule
+
+
+ {% if schedule.backup_timeout_seconds or schedule.backup_retry_count or schedule.cloud_sync_timeout_seconds or schedule.cloud_sync_retry_count %}
+
+ Retries / Timeouts:
+ Backup {{ schedule.backup_retry_count }} retries{% if schedule.backup_timeout_seconds %}, {{ schedule.backup_timeout_seconds }}s timeout{% endif %};
+ Cloud {{ schedule.cloud_sync_retry_count }} retries{% if schedule.cloud_sync_timeout_seconds %}, {{ schedule.cloud_sync_timeout_seconds }}s timeout{% endif %}
+
+ {% endif %}
{% if schedule.last_run %}
Last Run: {{ schedule.last_run | format_datetime_browser('%Y-%m-%d %H:%M:%S', browser_tz_offset) }}
diff --git a/tests/integration/schedules/test_manual_run_apscheduler.py b/tests/integration/schedules/test_manual_run_apscheduler.py
index b53ec07b..fc1b8be9 100644
--- a/tests/integration/schedules/test_manual_run_apscheduler.py
+++ b/tests/integration/schedules/test_manual_run_apscheduler.py
@@ -456,6 +456,10 @@ def mock_schedule(self) -> Mock:
schedule.pre_job_hooks = None
schedule.post_job_hooks = None
schedule.patterns = None
+ schedule.backup_timeout_seconds = 120
+ schedule.backup_retry_count = 2
+ schedule.cloud_sync_timeout_seconds = 300
+ schedule.cloud_sync_retry_count = 1
schedule.last_run = None
return schedule
@@ -525,6 +529,10 @@ async def test_execute_scheduled_backup_success(
assert backup_request.source_path == "/data/backup"
assert backup_request.prune_config_id == 2
assert backup_request.check_config_id == 3
+ assert backup_request.backup_timeout_seconds == 120
+ assert backup_request.backup_retry_count == 2
+ assert backup_request.cloud_sync_timeout_seconds == 300
+ assert backup_request.cloud_sync_retry_count == 1
assert call_args.args[2] == JobType.SCHEDULED_BACKUP
@pytest.mark.asyncio
diff --git a/tests/unit/schedules/test_schedule_validation_service.py b/tests/unit/schedules/test_schedule_validation_service.py
index 288f9251..b2f86279 100644
--- a/tests/unit/schedules/test_schedule_validation_service.py
+++ b/tests/unit/schedules/test_schedule_validation_service.py
@@ -54,6 +54,10 @@ def test_validate_schedule_creation_data_valid_input(
"pre_job_hooks": None,
"post_job_hooks": None,
"patterns": None,
+ "backup_timeout_seconds": None,
+ "backup_retry_count": 0,
+ "cloud_sync_timeout_seconds": None,
+ "cloud_sync_retry_count": 0,
}
def test_validate_schedule_creation_data_minimal_valid_input(
@@ -87,6 +91,10 @@ def test_validate_schedule_creation_data_minimal_valid_input(
"pre_job_hooks": None,
"post_job_hooks": None,
"patterns": None,
+ "backup_timeout_seconds": None,
+ "backup_retry_count": 0,
+ "cloud_sync_timeout_seconds": None,
+ "cloud_sync_retry_count": 0,
}
def test_validate_schedule_creation_data_missing_name(
@@ -276,6 +284,31 @@ def test_validate_schedule_creation_data_optional_field_type_conversion(
assert is_valid is True
assert processed_data["cloud_sync_config_id"] == expected_output
+ def test_validate_schedule_creation_data_retry_timeout_conversion(
+ self, schedule_service: ScheduleService
+ ) -> None:
+ """Test conversion of retry and timeout fields."""
+ data = {
+ "name": "Test Schedule",
+ "repository_id": "1",
+ "cron_expression": "0 2 * * *",
+ "backup_timeout_seconds": "120",
+ "backup_retry_count": "2",
+ "cloud_sync_timeout_seconds": "300",
+ "cloud_sync_retry_count": "1",
+ }
+
+ is_valid, processed_data, error_msg = (
+ schedule_service.validate_schedule_creation_data(data)
+ )
+
+ assert is_valid is True
+ assert error_msg is None
+ assert processed_data["backup_timeout_seconds"] == 120
+ assert processed_data["backup_retry_count"] == 2
+ assert processed_data["cloud_sync_timeout_seconds"] == 300
+ assert processed_data["cloud_sync_retry_count"] == 1
+
def test_validate_cron_expression_valid(
self, schedule_service: ScheduleService
) -> None:
diff --git a/tests/unit/test_task_definition_builder.py b/tests/unit/test_task_definition_builder.py
index 1b31ce75..20d9a67a 100644
--- a/tests/unit/test_task_definition_builder.py
+++ b/tests/unit/test_task_definition_builder.py
@@ -138,6 +138,20 @@ def test_build_backup_task_custom_params(
assert task == expected
+ def test_build_backup_task_with_retry_timeout(
+ self, task_builder: TaskDefinitionBuilder
+ ) -> None:
+ """Test building backup task with retry and timeout values."""
+ task = task_builder.build_backup_task(
+ "test-repo",
+ timeout=120,
+ retry_count=2,
+ )
+
+ assert task.type == TaskTypeEnum.BACKUP
+ assert task.timeout == 120
+ assert task.retry_count == 2
+
async def test_build_prune_task_from_config_simple_strategy(
self,
task_builder: TaskDefinitionBuilder,
@@ -406,6 +420,21 @@ def test_build_cloud_sync_task_with_config_id(
assert task == expected
+ def test_build_cloud_sync_task_with_retry_timeout(
+ self, task_builder: TaskDefinitionBuilder
+ ) -> None:
+ """Test building cloud sync task with retry and timeout values."""
+ task = task_builder.build_cloud_sync_task(
+ "test-repo",
+ cloud_sync_config_id=123,
+ timeout=300,
+ retry_count=1,
+ )
+
+ assert task.type == TaskTypeEnum.CLOUD_SYNC
+ assert task.timeout == 300
+ assert task.retry_count == 1
+
async def test_build_notification_task(
self,
task_builder: TaskDefinitionBuilder,