Move log_quota_hour from JobSpec to SubmitBody for backward compatibility

JobSpec is sent client→server as part of RunPlan.current_resource, so new
fields break older servers. log_quota_hour is only needed server→runner,
so it belongs on SubmitBody instead.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: Andrey Cheptsov

runner/internal/runner/executor/executor.go

@@ -262,12 +262,12 @@ func (ex *RunExecutor) Run(ctx context.Context) (err error) {
 		}
 
 		if errors.Is(err, ErrLogQuotaExceeded) {
-			log.Error(ctx, "Log quota exceeded", "quota", ex.jobSpec.LogQuotaHour)
+			log.Error(ctx, "Log quota exceeded", "quota", ex.jobLogs.quota)
 			ex.SetJobStateWithTerminationReason(
 				ctx,
 				schemas.JobStateFailed,
 				types.TerminationReasonLogQuotaExceeded,
-				fmt.Sprintf("Job log output exceeded the hourly quota of %d bytes", ex.jobSpec.LogQuotaHour),
+				fmt.Sprintf("Job log output exceeded the hourly quota of %d bytes", ex.jobLogs.quota),
 			)
 			return fmt.Errorf("log quota exceeded: %w", err)
 		}
@@ -294,7 +294,7 @@ func (ex *RunExecutor) SetJob(body schemas.SubmitBody) {
 	ex.clusterInfo = body.ClusterInfo
 	ex.secrets = body.Secrets
 	ex.repoCredentials = body.RepoCredentials
-	ex.jobLogs.SetQuota(body.JobSpec.LogQuotaHour)
+	ex.jobLogs.SetQuota(body.LogQuotaHour)
 	ex.state = WaitCode
 }
 

runner/internal/runner/executor/executor_test.go

@@ -150,7 +150,6 @@ func TestExecutor_LogQuota(t *testing.T) {
 	ex.killDelay = 500 * time.Millisecond
 	// Output >100 bytes to trigger the quota
 	ex.jobSpec.Commands = append(ex.jobSpec.Commands, "for i in $(seq 1 20); do echo 'This line is long enough to exceed the quota easily'; done")
-	ex.jobSpec.LogQuotaHour = 100 // 100 bytes
 	ex.jobLogs.SetQuota(100)
 	makeCodeTar(t, ex)
 

runner/internal/runner/schemas/schemas.go

@@ -36,6 +36,7 @@ type SubmitBody struct {
 	ClusterInfo     ClusterInfo       `json:"cluster_info"`
 	Secrets         map[string]string `json:"secrets"`
 	RepoCredentials *RepoCredentials  `json:"repo_credentials"`
+	LogQuotaHour    int               `json:"log_quota_hour"` // bytes per hour, 0 = unlimited
 }
 
 type PullResponse struct {
@@ -79,7 +80,6 @@ type JobSpec struct {
 	Env            map[string]string `json:"env"`
 	SingleBranch   bool              `json:"single_branch"`
 	MaxDuration    int               `json:"max_duration"`
-	LogQuotaHour   int               `json:"log_quota_hour"` // bytes per hour, 0 = unlimited
 	SSHKey         *SSHKey           `json:"ssh_key"`
 	WorkingDir     *string           `json:"working_dir"`
 	RepoDir        *string           `json:"repo_dir"`

src/dstack/_internal/core/models/runs.py

@@ -278,9 +278,6 @@ class JobSpec(CoreModel):
     privileged: bool = False
     single_branch: Optional[bool] = None
     max_duration: Optional[int]
-    log_quota_hour: Optional[int] = None
-    """`log_quota_hour` is the maximum number of bytes of log output per calendar hour.
-    `None` means unlimited. Set from `DSTACK_SERVER_LOG_QUOTA_PER_JOB_HOUR`."""
     stop_duration: Optional[int] = None
     utilization_policy: Optional[UtilizationPolicy] = None
     registry_auth: Optional[RegistryAuth]

src/dstack/_internal/server/schemas/runner.py

@@ -83,7 +83,6 @@ class SubmitBody(CoreModel):
                 "gateway",
                 "single_branch",
                 "max_duration",
-                "log_quota_hour",
                 "ssh_key",
                 "working_dir",
                 "repo_dir",
@@ -104,6 +103,8 @@ class SubmitBody(CoreModel):
     cluster_info: Annotated[Optional[ClusterInfo], Field(include=True)]
     secrets: Annotated[Optional[Dict[str, str]], Field(include=True)]
     repo_credentials: Annotated[Optional[RemoteRepoCreds], Field(include=True)]
+    log_quota_hour: Optional[int] = None
+    """Maximum bytes of log output per hour. None means unlimited."""
     # TODO: remove `run_spec` once instances deployed with 0.19.8 or earlier are no longer supported.
     run_spec: Annotated[
         RunSpec,

src/dstack/_internal/server/services/jobs/configurators/base.py

@@ -48,7 +48,6 @@
 from dstack._internal.core.models.volumes import MountPoint, VolumeMountPoint
 from dstack._internal.core.services.profiles import get_retry
 from dstack._internal.core.services.ssh.ports import filter_reserved_ports
-from dstack._internal.server import settings as server_settings
 from dstack._internal.server.services.docker import ImageConfig, get_image_config
 from dstack._internal.utils import crypto
 from dstack._internal.utils.common import run_async
@@ -170,7 +169,6 @@ async def _get_job_spec(
             privileged=self._privileged(),
             single_branch=self._single_branch(),
             max_duration=self._max_duration(),
-            log_quota_hour=self._log_quota_hour(),
             stop_duration=self._stop_duration(),
             utilization_policy=self._utilization_policy(),
             registry_auth=self._registry_auth(),
@@ -306,10 +304,6 @@ def _max_duration(self) -> Optional[int]:
             return None
         return self.run_spec.merged_profile.max_duration
 
-    def _log_quota_hour(self) -> Optional[int]:
-        quota = server_settings.SERVER_LOG_QUOTA_PER_JOB_HOUR
-        return quota if quota > 0 else None
-
     def _stop_duration(self) -> Optional[int]:
         if self.run_spec.merged_profile.stop_duration is None:
             return DEFAULT_STOP_DURATION

src/dstack/_internal/server/services/runner/client.py

@@ -15,6 +15,7 @@
 from dstack._internal.core.models.resources import Memory
 from dstack._internal.core.models.runs import ClusterInfo, Job, Run
 from dstack._internal.core.models.volumes import InstanceMountPoint, Volume, VolumeMountPoint
+from dstack._internal.server import settings as server_settings
 from dstack._internal.server.schemas.instances import InstanceCheck
 from dstack._internal.server.schemas.runner import (
     ComponentInfo,
@@ -93,13 +94,15 @@ def submit_job(
             merged_env.update(job_spec.env)
             job_spec = job_spec.copy(deep=True)
             job_spec.env = merged_env
+        quota = server_settings.SERVER_LOG_QUOTA_PER_JOB_HOUR
         body = SubmitBody(
             run=run,
             job_spec=job_spec,
             job_submission=job.job_submissions[-1],
             cluster_info=cluster_info,
             secrets=secrets,
             repo_credentials=repo_credentials,
+            log_quota_hour=quota if quota > 0 else None,
             run_spec=run.run_spec,
         )
         resp = requests.post(

src/tests/_internal/server/routers/test_runs.py

@@ -269,7 +269,6 @@ def get_dev_env_run_plan_dict(
                     "replica_group": "0",
                     "single_branch": False,
                     "max_duration": None,
-                    "log_quota_hour": 52428800,
                     "stop_duration": 300,
                     "utilization_policy": None,
                     "registry_auth": None,
@@ -507,7 +506,6 @@ def get_dev_env_run_dict(
                     "replica_group": "0",
                     "single_branch": False,
                     "max_duration": None,
-                    "log_quota_hour": 52428800,
                     "stop_duration": 300,
                     "utilization_policy": None,
                     "registry_auth": None,