Proto changes

Signed-off-by: JamesMurkin <jamesmurkin@hotmail.com>

pkg/api/api.swagger.go

@@ -920,6 +920,9 @@ func SwaggerJsonTemplate() string {
 		"    \"apiJobCancellingEvent\": {\n" +
 		"      \"type\": \"object\",\n" +
 		"      \"properties\": {\n" +
+		"        \"cause\": {\n" +
+		"          \"type\": \"string\"\n" +
+		"        },\n" +
 		"        \"created\": {\n" +
 		"          \"type\": \"string\",\n" +
 		"          \"format\": \"date-time\"\n" +
@@ -933,9 +936,6 @@ func SwaggerJsonTemplate() string {
 		"        \"queue\": {\n" +
 		"          \"type\": \"string\"\n" +
 		"        },\n" +
-		"        \"reason\": {\n" +
-		"          \"type\": \"string\"\n" +
-		"        },\n" +
 		"        \"requestor\": {\n" +
 		"          \"type\": \"string\"\n" +
 		"        }\n" +
@@ -1265,6 +1265,9 @@ func SwaggerJsonTemplate() string {
 		"        \"queue\": {\n" +
 		"          \"type\": \"string\"\n" +
 		"        },\n" +
+		"        \"reason\": {\n" +
+		"          \"type\": \"string\"\n" +
+		"        },\n" +
 		"        \"runId\": {\n" +
 		"          \"type\": \"string\"\n" +
 		"        }\n" +

pkg/api/api.swagger.json

@@ -909,6 +909,9 @@
     "apiJobCancellingEvent": {
       "type": "object",
       "properties": {
+        "cause": {
+          "type": "string"
+        },
         "created": {
           "type": "string",
           "format": "date-time"
@@ -922,9 +925,6 @@
         "queue": {
           "type": "string"
         },
-        "reason": {
-          "type": "string"
-        },
         "requestor": {
           "type": "string"
         }
@@ -1254,6 +1254,9 @@
         "queue": {
           "type": "string"
         },
+        "reason": {
+          "type": "string"
+        },
         "runId": {
           "type": "string"
         }

pkg/api/event.proto

@@ -140,6 +140,7 @@ message JobPreemptedEvent {
     string run_id = 6;
     string preemptive_job_id = 7;
     string preemptive_run_id = 8;
+    string reason = 9;
 }
 
 message JobSucceededEvent {
@@ -194,7 +195,7 @@ message JobCancellingEvent {
     string queue = 3;
     google.protobuf.Timestamp created = 4;
     string requestor = 5;
-    string reason = 6;
+    string cause = 6;
 }
 
 message JobCancelledEvent {

pkg/armadaevents/events.proto

@@ -556,6 +556,7 @@ message JobRunPreempted{
     Uuid preemptive_run_id = 4;
     string preempted_job_id_str = 5;
     string preempted_run_id_str = 6;
+    string cause = 7;
 }
 
 // Message used internally by Armada to see if messages can be propagated through a pulsar partition

pkg/client/load-test.go

@@ -6,15 +6,12 @@ import (
 	"sync"
 	"time"
 
-	"github.com/sirupsen/logrus"
-	log "github.com/sirupsen/logrus"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-
 	"github.com/armadaproject/armada/internal/common"
 	"github.com/armadaproject/armada/internal/common/logging"
 	"github.com/armadaproject/armada/pkg/api"
 	"github.com/armadaproject/armada/pkg/client/domain"
+	"github.com/sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 )
 
 type LoadTester interface {
@@ -133,15 +130,15 @@ func (apiLoadTester ArmadaLoadTester) runSubmission(
 		err := WithSubmitClient(apiLoadTester.apiConnectionDetails, func(client api.SubmitClient) error {
 			defer submissionComplete.Done()
 
-			e := CreateQueue(client, &api.Queue{Name: queue, PriorityFactor: priorityFactor})
-			if status.Code(e) == codes.AlreadyExists {
-				log.Infof("queue %s already exists so no need to create it.\n", queue)
-			} else if e != nil {
-				log.Errorf("failed to create queue: %s because: %s\n", queue, e)
-				return nil
-			} else {
-				log.Infof("queue %s created.\n", queue)
-			}
+			//e := CreateQueue(client, &api.Queue{Name: queue, PriorityFactor: priorityFactor})
+			//if status.Code(e) == codes.AlreadyExists {
+			//	log.Infof("queue %s already exists so no need to create it.\n", queue)
+			//} else if e != nil {
+			//	log.Errorf("failed to create queue: %s because: %s\n", queue, e)
+			//	return nil
+			//} else {
+			//	log.Infof("queue %s created.\n", queue)
+			//}
 
 			for len(jobs) > 0 {
 				select {