wip

armadaproject · Nov 29, 2024 · 688d7ae · 688d7ae
1 parent 85b2993
commit 688d7ae
Show file tree

Hide file tree

Showing 10 changed files with 573 additions and 616 deletions.
diff --git a/.run/Scheduler Ingester.run.xml b/.run/Scheduler Ingester.run.xml
diff --git a/internal/scheduler/schedulerobjects/schedulerobjects.pb.go b/internal/scheduler/schedulerobjects/schedulerobjects.pb.go
diff --git a/internal/scheduler/schedulerobjects/schedulerobjects.proto b/internal/scheduler/schedulerobjects/schedulerobjects.proto
@@ -89,7 +89,6 @@ message JobSchedulingInfo {
     // Kubernetes objects that make up this job and their respective scheduling requirements.
     repeated ObjectRequirements object_requirements = 5;
     uint32 version = 9;
-    double price = 11;
 }
 
 // Message capturing the scheduling requirements of a particular Kubernetes object.

diff --git a/internal/scheduleringester/instructions.go b/internal/scheduleringester/instructions.go
@@ -164,6 +164,11 @@ func (c *JobSetEventsInstructionConverter) handleSubmitJob(job *armadaevents.Sub
 		return nil, err
 	}
 
+	bidPrice := 0.0
+	if job.PriceInfo != nil {
+		bidPrice = job.PriceInfo.BidPrice
+	}
+
 	return []DbOperation{InsertJobs{jobId: &schedulerdb.Job{
 		JobID:                 jobId,
 		JobSet:                meta.jobset,
@@ -174,7 +179,7 @@ func (c *JobSetEventsInstructionConverter) handleSubmitJob(job *armadaevents.Sub
 		QueuedVersion:         0,
 		Submitted:             submitTime.UnixNano(),
 		Priority:              int64(job.Priority),
-		Price:                 job.Price,
+		BidPrice:              bidPrice,
 		SubmitMessage:         compressedSubmitJobBytes,
 		SchedulingInfo:        schedulingInfoBytes,
 		SchedulingInfoVersion: int32(schedulingInfo.Version),
@@ -516,7 +521,6 @@ func SchedulingInfoFromSubmitJob(submitJob *armadaevents.SubmitJob, submitTime t
 		ConcurrencySafe: submitJob.ConcurrencySafe,
 		SubmitTime:      submitTime,
 		Priority:        submitJob.Priority,
-		Price:           submitJob.Price,
 		Version:         0,
 	}
 

diff --git a/pkg/api/api.swagger.go b/pkg/api/api.swagger.go
@@ -855,6 +855,9 @@ func SwaggerJsonTemplate() string {
 		"          \"type\": \"string\",\n" +
 		"          \"format\": \"date-time\"\n" +
 		"        },\n" +
+		"        \"experimentalPriceInfo\": {\n" +
+		"          \"$ref\": \"#/definitions/apiExperimentalPriceInfo\"\n" +
+		"        },\n" +
 		"        \"id\": {\n" +
 		"          \"type\": \"string\"\n" +
 		"        },\n" +
@@ -901,9 +904,6 @@ func SwaggerJsonTemplate() string {
 		"            \"$ref\": \"#/definitions/v1PodSpec\"\n" +
 		"          }\n" +
 		"        },\n" +
-		"        \"priceInfo\": {\n" +
-		"          \"$ref\": \"#/definitions/apiExperimentalPriceInfo\"\n" +
-		"        },\n" +
 		"        \"priority\": {\n" +
 		"          \"type\": \"number\",\n" +
 		"          \"format\": \"double\"\n" +

diff --git a/pkg/api/api.swagger.json b/pkg/api/api.swagger.json
@@ -844,6 +844,9 @@
           "type": "string",
           "format": "date-time"
         },
+        "experimentalPriceInfo": {
+          "$ref": "#/definitions/apiExperimentalPriceInfo"
+        },
         "id": {
           "type": "string"
         },
@@ -890,9 +893,6 @@
             "$ref": "#/definitions/v1PodSpec"
           }
         },
-        "priceInfo": {
-          "$ref": "#/definitions/apiExperimentalPriceInfo"
-        },
         "priority": {
           "type": "number",
           "format": "double"

diff --git a/pkg/api/submit.pb.go b/pkg/api/submit.pb.go
diff --git a/pkg/api/submit.proto b/pkg/api/submit.proto
@@ -146,7 +146,7 @@ message Job {
   // Indicates which scheduler should manage this job.
   // If empty, the default scheduler is used.
   string scheduler = 20;
-  ExperimentalPriceInfo priceInfo = 30;
+  ExperimentalPriceInfo experimentalPriceInfo = 30;
 }
 
 message ExperimentalPriceInfo {

diff --git a/pkg/armadaevents/events.pb.go b/pkg/armadaevents/events.pb.go
diff --git a/pkg/armadaevents/events.proto b/pkg/armadaevents/events.proto
@@ -156,9 +156,8 @@ message SubmitJob {
     bool isDuplicate = 12;
     // The job id
     string job_id = 14;
-
     // Pricing Information for the job.  Currently experimental
-    ExperimentalPriceInfo priceInfo = 15;
+    ExperimentalPriceInfo experimentalPriceInfo = 15;
 }
 
 message ExperimentalPriceInfo {