wip

internal/common/eventutil/eventutil.go

@@ -161,9 +161,9 @@ func ApiJobFromLogSubmitJob(ownerId string, groups []string, queueName string, j
 	}
 
 	var priceInfo *api.ExperimentalPriceInfo
-	if e.PriceInfo != nil {
+	if e.ExperimentalPriceInfo != nil {
 		priceInfo = &api.ExperimentalPriceInfo{
-			BidPrice: e.PriceInfo.BidPrice,
+			BidPrice: e.ExperimentalPriceInfo.BidPrice,
 		}
 	}
 
@@ -177,10 +177,10 @@ func ApiJobFromLogSubmitJob(ownerId string, groups []string, queueName string, j
 		Labels:      e.ObjectMeta.Labels,
 		Annotations: e.ObjectMeta.Annotations,
 
-		K8SIngress: k8sIngresses,
-		K8SService: k8sServices,
-		PriceInfo:  priceInfo,
-		Priority:   float64(e.Priority),
+		K8SIngress:            k8sIngresses,
+		K8SService:            k8sServices,
+		ExperimentalPriceInfo: priceInfo,
+		Priority:              float64(e.Priority),
 
 		PodSpec:                        podSpec,
 		PodSpecs:                       podSpecs,

internal/scheduler/jobdb/comparison.go

@@ -117,8 +117,8 @@ func MarketSchedulingOrderCompare(job, other *Job) int {
 		return 1
 	}
 
-	// Next we sort on price
-	if job.price < other.price {
+	// Next we sort on bidPrice
+	if job.bidPrice < other.bidPrice {
 		return -1
 	} else if job.priority > other.priority {
 		return 1

internal/scheduler/jobdb/job.go

@@ -32,8 +32,8 @@ type Job struct {
 	jobSet string
 	// Per-queue priority of this job.
 	priority uint32
-	// Price the user us willing to pay to have this job scheduled
-	price float64
+	// BidPrice the user is willing to pay to have this job scheduled
+	bidPrice float64
 	// Requested per queue priority of this job.
 	// This is used when syncing the postgres database with the scheduler-internal database.
 	requestedPriority uint32
@@ -302,7 +302,7 @@ func (job *Job) Equal(other *Job) bool {
 	if job.priority != other.priority {
 		return false
 	}
-	if job.price != other.price {
+	if job.bidPrice != other.bidPrice {
 		return false
 	}
 	if job.requestedPriority != other.requestedPriority {
@@ -383,9 +383,9 @@ func (job *Job) Priority() uint32 {
 	return job.priority
 }
 
-// Price returns the price of the job.
-func (job *Job) Price() float64 {
-	return job.price
+// BidPrice returns the bidPrice of the job.
+func (job *Job) BidPrice() float64 {
+	return job.bidPrice
 }
 
 // PriorityClass returns the priority class of the job.
@@ -423,10 +423,10 @@ func (job *Job) WithPriority(priority uint32) *Job {
 	return j
 }
 
-// WithPrice returns a copy of the job with the price updated.
+// WithPrice returns a copy of the job with the bidPrice updated.
 func (job *Job) WithPrice(price float64) *Job {
 	j := copyJob(*job)
-	j.price = price
+	j.bidPrice = price
 	return j
 }
 

internal/scheduler/jobdb/jobdb.go

@@ -49,6 +49,7 @@ func (jq jobQueue) delete(j *Job) jobQueue {
 		marketQueue:    jq.marketQueue.Delete(j),
 	}
 }
+
 func (jq jobQueue) has(j *Job) bool {
 	return jq.fairShareQueue.Has(j)
 }
@@ -199,7 +200,7 @@ func (jobDb *JobDb) NewJob(
 		queue:                          jobDb.stringInterner.Intern(queue),
 		jobSet:                         jobDb.stringInterner.Intern(jobSet),
 		priority:                       priority,
-		price:                          price,
+		bidPrice:                       price,
 		queued:                         queued,
 		queuedVersion:                  queuedVersion,
 		requestedPriority:              priority,

internal/scheduler/scheduler_test.go

@@ -1790,7 +1790,7 @@ func jobDbJobFromDbJob(resourceListFactory *internaltypes.ResourceListFactory, j
 		job.JobSet,
 		job.Queue,
 		uint32(job.Priority),
-		job.Price,
+		job.BidPrice,
 		&schedulingInfo,
 		job.Queued,
 		job.QueuedVersion,

internal/scheduler/scheduling/marketPriorityQueue.go

@@ -2,10 +2,11 @@ package scheduling
 
 import (
 	"container/heap"
+	"time"
+
 	"github.com/armadaproject/armada/internal/scheduler/internaltypes"
 	schedulercontext "github.com/armadaproject/armada/internal/scheduler/scheduling/context"
 	"github.com/armadaproject/armada/internal/scheduler/scheduling/fairness"
-	"time"
 )
 
 type MarketIteratorPQ struct {
@@ -54,7 +55,7 @@ func (it *MarketBasedCandidateGangIterator) newPQItem(queue string, queueIt *Que
 }
 
 func (it *MarketBasedCandidateGangIterator) GetAllocationForQueue(queue string) (internaltypes.ResourceList, bool) {
-	//TODO implement me
+	// TODO implement me
 	panic("implement me")
 }
 
@@ -130,7 +131,7 @@ func (it *MarketBasedCandidateGangIterator) updatePQItem(item *MarketIteratorPQI
 
 	job := gctx.JobSchedulingContexts[0].Job
 	item.gctx = gctx
-	item.price = job.Price()
+	item.price = job.BidPrice()
 	if !job.Queued() && job.LatestRun() != nil {
 		item.runtime = time.Now().UnixNano() - job.LatestRun().Created()
 	} else {
@@ -167,7 +168,6 @@ type MarketIteratorPQItem struct {
 func (pq *MarketIteratorPQ) Len() int { return len(pq.items) }
 
 func (pq *MarketIteratorPQ) Less(i, j int) bool {
-
 	// First by price
 	if pq.items[i].price != pq.items[j].price {
 		return pq.items[i].price < pq.items[j].price

internal/scheduleringester/instructions.go

@@ -165,8 +165,8 @@ func (c *JobSetEventsInstructionConverter) handleSubmitJob(job *armadaevents.Sub
 	}
 
 	bidPrice := 0.0
-	if job.PriceInfo != nil {
-		bidPrice = job.PriceInfo.BidPrice
+	if job.ExperimentalPriceInfo != nil {
+		bidPrice = job.ExperimentalPriceInfo.BidPrice
 	}
 
 	return []DbOperation{InsertJobs{jobId: &schedulerdb.Job{

internal/server/submit/conversion/conversions.go

@@ -32,7 +32,6 @@ func SubmitJobFromApiRequest(
 		JobId:           jobId,
 		DeduplicationId: jobReq.GetClientId(),
 		Priority:        priority,
-		Price:           jobReq.GetPrice(),
 		ObjectMeta: &armadaevents.ObjectMeta{
 			Namespace:   jobReq.GetNamespace(),
 			Annotations: jobReq.GetAnnotations(),
@@ -48,6 +47,13 @@ func SubmitJobFromApiRequest(
 		Objects:   ingressesAndServices,
 		Scheduler: jobReq.Scheduler,
 	}
+
+	if jobReq.ExperimentalPriceInfo != nil {
+		msg.ExperimentalPriceInfo = &armadaevents.ExperimentalPriceInfo{
+			BidPrice: jobReq.ExperimentalPriceInfo.BidPrice,
+		}
+	}
+
 	postProcess(msg, config)
 	return msg
 }

internal/server/submit/validation/submit_request.go

@@ -227,10 +227,13 @@ func validatePriorityClasses(j *api.JobSubmitRequestItem, config configuration.S
 	return nil
 }
 
-// Ensures that if a request specifies a Price, that the price is noon-negative
+// Ensures that if a request specifies a BidPrice, that the price is non-negative
 func validatePrice(j *api.JobSubmitRequestItem, _ configuration.SubmissionConfig) error {
-	if j.Price < 0 {
-		return fmt.Errorf("price %.2f is invalid Prices must be greater than zero", j.Price)
+	if j.ExperimentalPriceInfo == nil {
+		return nil
+	}
+	if j.ExperimentalPriceInfo.BidPrice < 0 {
+		return fmt.Errorf("price %.2f is invalid Prices must be greater than zero", j.ExperimentalPriceInfo.BidPrice)
 	}
 	return nil
 }

internal/server/submit/validation/submit_request_test.go

@@ -841,16 +841,30 @@ func TestValidatePrice(t *testing.T) {
 		item          *api.JobSubmitRequestItem
 		expectSuccess bool
 	}{
-		"zero price is ok": {
+		"nil ExperimentalPriceInfo is ok": {
 			item:          &api.JobSubmitRequestItem{},
 			expectSuccess: true,
 		},
+		"zero price is ok": {
+			item: &api.JobSubmitRequestItem{
+				ExperimentalPriceInfo: &api.ExperimentalPriceInfo{},
+			},
+			expectSuccess: true,
+		},
 		"positive price is ok": {
-			item:          &api.JobSubmitRequestItem{Price: 1.0},
+			item: &api.JobSubmitRequestItem{
+				ExperimentalPriceInfo: &api.ExperimentalPriceInfo{
+					BidPrice: 1.0,
+				},
+			},
 			expectSuccess: true,
 		},
 		"negative price is rejected": {
-			item:          &api.JobSubmitRequestItem{Price: -1.0},
+			item: &api.JobSubmitRequestItem{
+				ExperimentalPriceInfo: &api.ExperimentalPriceInfo{
+					BidPrice: -1.0,
+				},
+			},
 			expectSuccess: false,
 		},
 	}

pkg/api/api.swagger.go

@@ -1741,6 +1741,9 @@ func SwaggerJsonTemplate() string {
 		"        \"clientId\": {\n" +
 		"          \"type\": \"string\"\n" +
 		"        },\n" +
+		"        \"experimentalPriceInfo\": {\n" +
+		"          \"$ref\": \"#/definitions/apiExperimentalPriceInfo\"\n" +
+		"        },\n" +
 		"        \"ingress\": {\n" +
 		"          \"type\": \"array\",\n" +
 		"          \"items\": {\n" +
@@ -1765,10 +1768,6 @@ func SwaggerJsonTemplate() string {
 		"            \"$ref\": \"#/definitions/v1PodSpec\"\n" +
 		"          }\n" +
 		"        },\n" +
-		"        \"price\": {\n" +
-		"          \"type\": \"number\",\n" +
-		"          \"format\": \"double\"\n" +
-		"        },\n" +
 		"        \"priority\": {\n" +
 		"          \"type\": \"number\",\n" +
 		"          \"format\": \"double\"\n" +

pkg/api/api.swagger.json

@@ -1730,6 +1730,9 @@
         "clientId": {
           "type": "string"
         },
+        "experimentalPriceInfo": {
+          "$ref": "#/definitions/apiExperimentalPriceInfo"
+        },
         "ingress": {
           "type": "array",
           "items": {
@@ -1754,10 +1757,6 @@
             "$ref": "#/definitions/v1PodSpec"
           }
         },
-        "price": {
-          "type": "number",
-          "format": "double"
-        },
         "priority": {
           "type": "number",
           "format": "double"