diff --git a/.auroraversion b/.auroraversion index d183d4a..3f46c4d 100644 --- a/.auroraversion +++ b/.auroraversion @@ -1 +1 @@ -0.16.0 \ No newline at end of file +0.19.0 \ No newline at end of file diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000..78286f5 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,11 @@ +Before submitting, please make sure you run a vagrant box running Aurora with the latest version shown in .auroraversion +and run go test from the project root. + +To run an Aurora Vagrant image, follow the instructions here: +http://aurora.apache.org/documentation/latest/getting-started/vagrant/ + +* Have you run goformat on the project before submitting? + +* Have you run go test on the project before submitting? Do all tests pass? + +* Does the Pull Request require a test to be added to the end to end tests? If so, has it been added? \ No newline at end of file diff --git a/auroraAPI.thrift b/auroraAPI.thrift index a777e78..6236523 100644 --- a/auroraAPI.thrift +++ b/auroraAPI.thrift @@ -27,8 +27,8 @@ enum ResponseCode { ERROR = 2, WARNING = 3, AUTH_FAILED = 4, - /** Raised when a Lock-protected operation failed due to lock validation. */ - LOCK_ERROR = 5, + /** Raised when an operation was unable to proceed due to an in-progress job update. */ + JOB_UPDATING_ERROR = 5, /** Raised when a scheduler is transiently unavailable and later retry is recommended. */ ERROR_TRANSIENT = 6 } @@ -203,6 +203,8 @@ union Image { struct MesosContainer { /** the optional filesystem image to use when launching this task. */ 1: optional Image image + /** the optional list of volumes to mount into the task. */ + 2: optional list volumes } /** Describes a parameter passed to docker cli */ @@ -618,6 +620,10 @@ const set ACTIVE_JOB_UPDATE_STATES = [JobUpdateStatus.ROLLING_F JobUpdateStatus.ROLL_FORWARD_AWAITING_PULSE, JobUpdateStatus.ROLL_BACK_AWAITING_PULSE] +/** States the job update can be in while waiting for a pulse. */ +const set AWAITNG_PULSE_JOB_UPDATE_STATES = [JobUpdateStatus.ROLL_FORWARD_AWAITING_PULSE, + JobUpdateStatus.ROLL_BACK_AWAITING_PULSE] + /** Job update actions that can be applied to job instances. */ enum JobUpdateAction { /** @@ -1073,7 +1079,7 @@ service AuroraSchedulerManager extends ReadOnlyScheduler { Response restartShards(5: JobKey job, 3: set shardIds) /** Initiates a kill on tasks. */ - Response killTasks(4: JobKey job, 5: set instances) + Response killTasks(4: JobKey job, 5: set instances, 6: string message) /** * Adds new instances with the TaskConfig of the existing instance pointed by the key. @@ -1134,31 +1140,6 @@ service AuroraSchedulerManager extends ReadOnlyScheduler { Response pulseJobUpdate(1: JobUpdateKey key) } -struct InstanceConfigRewrite { - /** Key for the task to rewrite. */ - 1: InstanceKey instanceKey - /** The original configuration. */ - 2: TaskConfig oldTask - /** The rewritten configuration. */ - 3: TaskConfig rewrittenTask -} - -struct JobConfigRewrite { - /** The original job configuration. */ - 1: JobConfiguration oldJob - /** The rewritten job configuration. */ - 2: JobConfiguration rewrittenJob -} - -union ConfigRewrite { - 1: JobConfigRewrite jobRewrite - 2: InstanceConfigRewrite instanceRewrite -} - -struct RewriteConfigsRequest { - 1: list rewriteCommands -} - struct ExplicitReconciliationSettings { 1: optional i32 batchSize } @@ -1214,20 +1195,18 @@ service AuroraAdmin extends AuroraSchedulerManager { /** Start a storage snapshot and block until it completes. */ Response snapshot() - /** - * Forcibly rewrites the stored definition of user configurations. This is intended to be used - * in a controlled setting, primarily to migrate pieces of configurations that are opaque to the - * scheduler (e.g. executorConfig). - * The scheduler may do some validation of the rewritten configurations, but it is important - * that the caller take care to provide valid input and alter only necessary fields. - */ - Response rewriteConfigs(1: RewriteConfigsRequest request) - /** Tell scheduler to trigger an explicit task reconciliation with the given settings. */ Response triggerExplicitTaskReconciliation(1: ExplicitReconciliationSettings settings) /** Tell scheduler to trigger an implicit task reconciliation. */ Response triggerImplicitTaskReconciliation() + + /** + * Force prune any (terminal) tasks that match the query. If no statuses are supplied with the + * query, it will default to all terminal task states. If statuses are supplied, they must be + * terminal states. + */ + Response pruneTasks(1: TaskQuery query) } // The name of the header that should be sent to bypass leader redirection in the Scheduler. @@ -1235,4 +1214,4 @@ const string BYPASS_LEADER_REDIRECT_HEADER_NAME = 'Bypass-Leader-Redirect' // The path under which a task's filesystem should be mounted when using images and the Mesos // unified containerizer. -const string TASK_FILESYSTEM_MOUNT_POINT = 'taskfs' \ No newline at end of file +const string TASK_FILESYSTEM_MOUNT_POINT = 'taskfs' diff --git a/gen-go/apache/aurora/aurora_admin-remote/aurora_admin-remote.go b/gen-go/apache/aurora/aurora_admin-remote/aurora_admin-remote.go index cb052fe..3afe684 100755 --- a/gen-go/apache/aurora/aurora_admin-remote/aurora_admin-remote.go +++ b/gen-go/apache/aurora/aurora_admin-remote/aurora_admin-remote.go @@ -34,15 +34,15 @@ func Usage() { fmt.Fprintln(os.Stderr, " Response maintenanceStatus(Hosts hosts)") fmt.Fprintln(os.Stderr, " Response endMaintenance(Hosts hosts)") fmt.Fprintln(os.Stderr, " Response snapshot()") - fmt.Fprintln(os.Stderr, " Response rewriteConfigs(RewriteConfigsRequest request)") fmt.Fprintln(os.Stderr, " Response triggerExplicitTaskReconciliation(ExplicitReconciliationSettings settings)") fmt.Fprintln(os.Stderr, " Response triggerImplicitTaskReconciliation()") + fmt.Fprintln(os.Stderr, " Response pruneTasks(TaskQuery query)") fmt.Fprintln(os.Stderr, " Response createJob(JobConfiguration description)") fmt.Fprintln(os.Stderr, " Response scheduleCronJob(JobConfiguration description)") fmt.Fprintln(os.Stderr, " Response descheduleCronJob(JobKey job)") fmt.Fprintln(os.Stderr, " Response startCronJob(JobKey job)") fmt.Fprintln(os.Stderr, " Response restartShards(JobKey job, shardIds)") - fmt.Fprintln(os.Stderr, " Response killTasks(JobKey job, instances)") + fmt.Fprintln(os.Stderr, " Response killTasks(JobKey job, instances, string message)") fmt.Fprintln(os.Stderr, " Response addInstances(InstanceKey key, i32 count)") fmt.Fprintln(os.Stderr, " Response replaceCronTemplate(JobConfiguration config)") fmt.Fprintln(os.Stderr, " Response startJobUpdate(JobUpdateRequest request, string message)") @@ -165,19 +165,19 @@ func main() { } argvalue0 := flag.Arg(1) value0 := argvalue0 - arg352 := flag.Arg(2) - mbTrans353 := thrift.NewTMemoryBufferLen(len(arg352)) - defer mbTrans353.Close() - _, err354 := mbTrans353.WriteString(arg352) - if err354 != nil { + arg353 := flag.Arg(2) + mbTrans354 := thrift.NewTMemoryBufferLen(len(arg353)) + defer mbTrans354.Close() + _, err355 := mbTrans354.WriteString(arg353) + if err355 != nil { Usage() return } - factory355 := thrift.NewTSimpleJSONProtocolFactory() - jsProt356 := factory355.GetProtocol(mbTrans353) + factory356 := thrift.NewTSimpleJSONProtocolFactory() + jsProt357 := factory356.GetProtocol(mbTrans354) argvalue1 := aurora.NewResourceAggregate() - err357 := argvalue1.Read(jsProt356) - if err357 != nil { + err358 := argvalue1.Read(jsProt357) + if err358 != nil { Usage() return } @@ -233,19 +233,19 @@ func main() { fmt.Fprintln(os.Stderr, "QueryRecovery requires 1 args") flag.Usage() } - arg360 := flag.Arg(1) - mbTrans361 := thrift.NewTMemoryBufferLen(len(arg360)) - defer mbTrans361.Close() - _, err362 := mbTrans361.WriteString(arg360) - if err362 != nil { + arg361 := flag.Arg(1) + mbTrans362 := thrift.NewTMemoryBufferLen(len(arg361)) + defer mbTrans362.Close() + _, err363 := mbTrans362.WriteString(arg361) + if err363 != nil { Usage() return } - factory363 := thrift.NewTSimpleJSONProtocolFactory() - jsProt364 := factory363.GetProtocol(mbTrans361) + factory364 := thrift.NewTSimpleJSONProtocolFactory() + jsProt365 := factory364.GetProtocol(mbTrans362) argvalue0 := aurora.NewTaskQuery() - err365 := argvalue0.Read(jsProt364) - if err365 != nil { + err366 := argvalue0.Read(jsProt365) + if err366 != nil { Usage() return } @@ -258,19 +258,19 @@ func main() { fmt.Fprintln(os.Stderr, "DeleteRecoveryTasks requires 1 args") flag.Usage() } - arg366 := flag.Arg(1) - mbTrans367 := thrift.NewTMemoryBufferLen(len(arg366)) - defer mbTrans367.Close() - _, err368 := mbTrans367.WriteString(arg366) - if err368 != nil { + arg367 := flag.Arg(1) + mbTrans368 := thrift.NewTMemoryBufferLen(len(arg367)) + defer mbTrans368.Close() + _, err369 := mbTrans368.WriteString(arg367) + if err369 != nil { Usage() return } - factory369 := thrift.NewTSimpleJSONProtocolFactory() - jsProt370 := factory369.GetProtocol(mbTrans367) + factory370 := thrift.NewTSimpleJSONProtocolFactory() + jsProt371 := factory370.GetProtocol(mbTrans368) argvalue0 := aurora.NewTaskQuery() - err371 := argvalue0.Read(jsProt370) - if err371 != nil { + err372 := argvalue0.Read(jsProt371) + if err372 != nil { Usage() return } @@ -299,19 +299,19 @@ func main() { fmt.Fprintln(os.Stderr, "StartMaintenance requires 1 args") flag.Usage() } - arg372 := flag.Arg(1) - mbTrans373 := thrift.NewTMemoryBufferLen(len(arg372)) - defer mbTrans373.Close() - _, err374 := mbTrans373.WriteString(arg372) - if err374 != nil { + arg373 := flag.Arg(1) + mbTrans374 := thrift.NewTMemoryBufferLen(len(arg373)) + defer mbTrans374.Close() + _, err375 := mbTrans374.WriteString(arg373) + if err375 != nil { Usage() return } - factory375 := thrift.NewTSimpleJSONProtocolFactory() - jsProt376 := factory375.GetProtocol(mbTrans373) + factory376 := thrift.NewTSimpleJSONProtocolFactory() + jsProt377 := factory376.GetProtocol(mbTrans374) argvalue0 := aurora.NewHosts() - err377 := argvalue0.Read(jsProt376) - if err377 != nil { + err378 := argvalue0.Read(jsProt377) + if err378 != nil { Usage() return } @@ -324,19 +324,19 @@ func main() { fmt.Fprintln(os.Stderr, "DrainHosts requires 1 args") flag.Usage() } - arg378 := flag.Arg(1) - mbTrans379 := thrift.NewTMemoryBufferLen(len(arg378)) - defer mbTrans379.Close() - _, err380 := mbTrans379.WriteString(arg378) - if err380 != nil { + arg379 := flag.Arg(1) + mbTrans380 := thrift.NewTMemoryBufferLen(len(arg379)) + defer mbTrans380.Close() + _, err381 := mbTrans380.WriteString(arg379) + if err381 != nil { Usage() return } - factory381 := thrift.NewTSimpleJSONProtocolFactory() - jsProt382 := factory381.GetProtocol(mbTrans379) + factory382 := thrift.NewTSimpleJSONProtocolFactory() + jsProt383 := factory382.GetProtocol(mbTrans380) argvalue0 := aurora.NewHosts() - err383 := argvalue0.Read(jsProt382) - if err383 != nil { + err384 := argvalue0.Read(jsProt383) + if err384 != nil { Usage() return } @@ -349,19 +349,19 @@ func main() { fmt.Fprintln(os.Stderr, "MaintenanceStatus requires 1 args") flag.Usage() } - arg384 := flag.Arg(1) - mbTrans385 := thrift.NewTMemoryBufferLen(len(arg384)) - defer mbTrans385.Close() - _, err386 := mbTrans385.WriteString(arg384) - if err386 != nil { + arg385 := flag.Arg(1) + mbTrans386 := thrift.NewTMemoryBufferLen(len(arg385)) + defer mbTrans386.Close() + _, err387 := mbTrans386.WriteString(arg385) + if err387 != nil { Usage() return } - factory387 := thrift.NewTSimpleJSONProtocolFactory() - jsProt388 := factory387.GetProtocol(mbTrans385) + factory388 := thrift.NewTSimpleJSONProtocolFactory() + jsProt389 := factory388.GetProtocol(mbTrans386) argvalue0 := aurora.NewHosts() - err389 := argvalue0.Read(jsProt388) - if err389 != nil { + err390 := argvalue0.Read(jsProt389) + if err390 != nil { Usage() return } @@ -374,19 +374,19 @@ func main() { fmt.Fprintln(os.Stderr, "EndMaintenance requires 1 args") flag.Usage() } - arg390 := flag.Arg(1) - mbTrans391 := thrift.NewTMemoryBufferLen(len(arg390)) - defer mbTrans391.Close() - _, err392 := mbTrans391.WriteString(arg390) - if err392 != nil { + arg391 := flag.Arg(1) + mbTrans392 := thrift.NewTMemoryBufferLen(len(arg391)) + defer mbTrans392.Close() + _, err393 := mbTrans392.WriteString(arg391) + if err393 != nil { Usage() return } - factory393 := thrift.NewTSimpleJSONProtocolFactory() - jsProt394 := factory393.GetProtocol(mbTrans391) + factory394 := thrift.NewTSimpleJSONProtocolFactory() + jsProt395 := factory394.GetProtocol(mbTrans392) argvalue0 := aurora.NewHosts() - err395 := argvalue0.Read(jsProt394) - if err395 != nil { + err396 := argvalue0.Read(jsProt395) + if err396 != nil { Usage() return } @@ -402,49 +402,24 @@ func main() { fmt.Print(client.Snapshot()) fmt.Print("\n") break - case "rewriteConfigs": - if flag.NArg()-1 != 1 { - fmt.Fprintln(os.Stderr, "RewriteConfigs requires 1 args") - flag.Usage() - } - arg396 := flag.Arg(1) - mbTrans397 := thrift.NewTMemoryBufferLen(len(arg396)) - defer mbTrans397.Close() - _, err398 := mbTrans397.WriteString(arg396) - if err398 != nil { - Usage() - return - } - factory399 := thrift.NewTSimpleJSONProtocolFactory() - jsProt400 := factory399.GetProtocol(mbTrans397) - argvalue0 := aurora.NewRewriteConfigsRequest() - err401 := argvalue0.Read(jsProt400) - if err401 != nil { - Usage() - return - } - value0 := argvalue0 - fmt.Print(client.RewriteConfigs(value0)) - fmt.Print("\n") - break case "triggerExplicitTaskReconciliation": if flag.NArg()-1 != 1 { fmt.Fprintln(os.Stderr, "TriggerExplicitTaskReconciliation requires 1 args") flag.Usage() } - arg402 := flag.Arg(1) - mbTrans403 := thrift.NewTMemoryBufferLen(len(arg402)) - defer mbTrans403.Close() - _, err404 := mbTrans403.WriteString(arg402) - if err404 != nil { + arg397 := flag.Arg(1) + mbTrans398 := thrift.NewTMemoryBufferLen(len(arg397)) + defer mbTrans398.Close() + _, err399 := mbTrans398.WriteString(arg397) + if err399 != nil { Usage() return } - factory405 := thrift.NewTSimpleJSONProtocolFactory() - jsProt406 := factory405.GetProtocol(mbTrans403) + factory400 := thrift.NewTSimpleJSONProtocolFactory() + jsProt401 := factory400.GetProtocol(mbTrans398) argvalue0 := aurora.NewExplicitReconciliationSettings() - err407 := argvalue0.Read(jsProt406) - if err407 != nil { + err402 := argvalue0.Read(jsProt401) + if err402 != nil { Usage() return } @@ -460,24 +435,49 @@ func main() { fmt.Print(client.TriggerImplicitTaskReconciliation()) fmt.Print("\n") break + case "pruneTasks": + if flag.NArg()-1 != 1 { + fmt.Fprintln(os.Stderr, "PruneTasks requires 1 args") + flag.Usage() + } + arg403 := flag.Arg(1) + mbTrans404 := thrift.NewTMemoryBufferLen(len(arg403)) + defer mbTrans404.Close() + _, err405 := mbTrans404.WriteString(arg403) + if err405 != nil { + Usage() + return + } + factory406 := thrift.NewTSimpleJSONProtocolFactory() + jsProt407 := factory406.GetProtocol(mbTrans404) + argvalue0 := aurora.NewTaskQuery() + err408 := argvalue0.Read(jsProt407) + if err408 != nil { + Usage() + return + } + value0 := argvalue0 + fmt.Print(client.PruneTasks(value0)) + fmt.Print("\n") + break case "createJob": if flag.NArg()-1 != 1 { fmt.Fprintln(os.Stderr, "CreateJob requires 1 args") flag.Usage() } - arg408 := flag.Arg(1) - mbTrans409 := thrift.NewTMemoryBufferLen(len(arg408)) - defer mbTrans409.Close() - _, err410 := mbTrans409.WriteString(arg408) - if err410 != nil { + arg409 := flag.Arg(1) + mbTrans410 := thrift.NewTMemoryBufferLen(len(arg409)) + defer mbTrans410.Close() + _, err411 := mbTrans410.WriteString(arg409) + if err411 != nil { Usage() return } - factory411 := thrift.NewTSimpleJSONProtocolFactory() - jsProt412 := factory411.GetProtocol(mbTrans409) + factory412 := thrift.NewTSimpleJSONProtocolFactory() + jsProt413 := factory412.GetProtocol(mbTrans410) argvalue0 := aurora.NewJobConfiguration() - err413 := argvalue0.Read(jsProt412) - if err413 != nil { + err414 := argvalue0.Read(jsProt413) + if err414 != nil { Usage() return } @@ -490,19 +490,19 @@ func main() { fmt.Fprintln(os.Stderr, "ScheduleCronJob requires 1 args") flag.Usage() } - arg414 := flag.Arg(1) - mbTrans415 := thrift.NewTMemoryBufferLen(len(arg414)) - defer mbTrans415.Close() - _, err416 := mbTrans415.WriteString(arg414) - if err416 != nil { + arg415 := flag.Arg(1) + mbTrans416 := thrift.NewTMemoryBufferLen(len(arg415)) + defer mbTrans416.Close() + _, err417 := mbTrans416.WriteString(arg415) + if err417 != nil { Usage() return } - factory417 := thrift.NewTSimpleJSONProtocolFactory() - jsProt418 := factory417.GetProtocol(mbTrans415) + factory418 := thrift.NewTSimpleJSONProtocolFactory() + jsProt419 := factory418.GetProtocol(mbTrans416) argvalue0 := aurora.NewJobConfiguration() - err419 := argvalue0.Read(jsProt418) - if err419 != nil { + err420 := argvalue0.Read(jsProt419) + if err420 != nil { Usage() return } @@ -515,19 +515,19 @@ func main() { fmt.Fprintln(os.Stderr, "DescheduleCronJob requires 1 args") flag.Usage() } - arg420 := flag.Arg(1) - mbTrans421 := thrift.NewTMemoryBufferLen(len(arg420)) - defer mbTrans421.Close() - _, err422 := mbTrans421.WriteString(arg420) - if err422 != nil { + arg421 := flag.Arg(1) + mbTrans422 := thrift.NewTMemoryBufferLen(len(arg421)) + defer mbTrans422.Close() + _, err423 := mbTrans422.WriteString(arg421) + if err423 != nil { Usage() return } - factory423 := thrift.NewTSimpleJSONProtocolFactory() - jsProt424 := factory423.GetProtocol(mbTrans421) + factory424 := thrift.NewTSimpleJSONProtocolFactory() + jsProt425 := factory424.GetProtocol(mbTrans422) argvalue0 := aurora.NewJobKey() - err425 := argvalue0.Read(jsProt424) - if err425 != nil { + err426 := argvalue0.Read(jsProt425) + if err426 != nil { Usage() return } @@ -540,19 +540,19 @@ func main() { fmt.Fprintln(os.Stderr, "StartCronJob requires 1 args") flag.Usage() } - arg426 := flag.Arg(1) - mbTrans427 := thrift.NewTMemoryBufferLen(len(arg426)) - defer mbTrans427.Close() - _, err428 := mbTrans427.WriteString(arg426) - if err428 != nil { + arg427 := flag.Arg(1) + mbTrans428 := thrift.NewTMemoryBufferLen(len(arg427)) + defer mbTrans428.Close() + _, err429 := mbTrans428.WriteString(arg427) + if err429 != nil { Usage() return } - factory429 := thrift.NewTSimpleJSONProtocolFactory() - jsProt430 := factory429.GetProtocol(mbTrans427) + factory430 := thrift.NewTSimpleJSONProtocolFactory() + jsProt431 := factory430.GetProtocol(mbTrans428) argvalue0 := aurora.NewJobKey() - err431 := argvalue0.Read(jsProt430) - if err431 != nil { + err432 := argvalue0.Read(jsProt431) + if err432 != nil { Usage() return } @@ -565,36 +565,36 @@ func main() { fmt.Fprintln(os.Stderr, "RestartShards requires 2 args") flag.Usage() } - arg432 := flag.Arg(1) - mbTrans433 := thrift.NewTMemoryBufferLen(len(arg432)) - defer mbTrans433.Close() - _, err434 := mbTrans433.WriteString(arg432) - if err434 != nil { + arg433 := flag.Arg(1) + mbTrans434 := thrift.NewTMemoryBufferLen(len(arg433)) + defer mbTrans434.Close() + _, err435 := mbTrans434.WriteString(arg433) + if err435 != nil { Usage() return } - factory435 := thrift.NewTSimpleJSONProtocolFactory() - jsProt436 := factory435.GetProtocol(mbTrans433) + factory436 := thrift.NewTSimpleJSONProtocolFactory() + jsProt437 := factory436.GetProtocol(mbTrans434) argvalue0 := aurora.NewJobKey() - err437 := argvalue0.Read(jsProt436) - if err437 != nil { + err438 := argvalue0.Read(jsProt437) + if err438 != nil { Usage() return } value0 := argvalue0 - arg438 := flag.Arg(2) - mbTrans439 := thrift.NewTMemoryBufferLen(len(arg438)) - defer mbTrans439.Close() - _, err440 := mbTrans439.WriteString(arg438) - if err440 != nil { + arg439 := flag.Arg(2) + mbTrans440 := thrift.NewTMemoryBufferLen(len(arg439)) + defer mbTrans440.Close() + _, err441 := mbTrans440.WriteString(arg439) + if err441 != nil { Usage() return } - factory441 := thrift.NewTSimpleJSONProtocolFactory() - jsProt442 := factory441.GetProtocol(mbTrans439) + factory442 := thrift.NewTSimpleJSONProtocolFactory() + jsProt443 := factory442.GetProtocol(mbTrans440) containerStruct1 := aurora.NewAuroraAdminRestartShardsArgs() - err443 := containerStruct1.ReadField2(jsProt442) - if err443 != nil { + err444 := containerStruct1.ReadField2(jsProt443) + if err444 != nil { Usage() return } @@ -604,46 +604,48 @@ func main() { fmt.Print("\n") break case "killTasks": - if flag.NArg()-1 != 2 { - fmt.Fprintln(os.Stderr, "KillTasks requires 2 args") + if flag.NArg()-1 != 3 { + fmt.Fprintln(os.Stderr, "KillTasks requires 3 args") flag.Usage() } - arg444 := flag.Arg(1) - mbTrans445 := thrift.NewTMemoryBufferLen(len(arg444)) - defer mbTrans445.Close() - _, err446 := mbTrans445.WriteString(arg444) - if err446 != nil { + arg445 := flag.Arg(1) + mbTrans446 := thrift.NewTMemoryBufferLen(len(arg445)) + defer mbTrans446.Close() + _, err447 := mbTrans446.WriteString(arg445) + if err447 != nil { Usage() return } - factory447 := thrift.NewTSimpleJSONProtocolFactory() - jsProt448 := factory447.GetProtocol(mbTrans445) + factory448 := thrift.NewTSimpleJSONProtocolFactory() + jsProt449 := factory448.GetProtocol(mbTrans446) argvalue0 := aurora.NewJobKey() - err449 := argvalue0.Read(jsProt448) - if err449 != nil { + err450 := argvalue0.Read(jsProt449) + if err450 != nil { Usage() return } value0 := argvalue0 - arg450 := flag.Arg(2) - mbTrans451 := thrift.NewTMemoryBufferLen(len(arg450)) - defer mbTrans451.Close() - _, err452 := mbTrans451.WriteString(arg450) - if err452 != nil { + arg451 := flag.Arg(2) + mbTrans452 := thrift.NewTMemoryBufferLen(len(arg451)) + defer mbTrans452.Close() + _, err453 := mbTrans452.WriteString(arg451) + if err453 != nil { Usage() return } - factory453 := thrift.NewTSimpleJSONProtocolFactory() - jsProt454 := factory453.GetProtocol(mbTrans451) + factory454 := thrift.NewTSimpleJSONProtocolFactory() + jsProt455 := factory454.GetProtocol(mbTrans452) containerStruct1 := aurora.NewAuroraAdminKillTasksArgs() - err455 := containerStruct1.ReadField2(jsProt454) - if err455 != nil { + err456 := containerStruct1.ReadField2(jsProt455) + if err456 != nil { Usage() return } argvalue1 := containerStruct1.Instances value1 := argvalue1 - fmt.Print(client.KillTasks(value0, value1)) + argvalue2 := flag.Arg(3) + value2 := argvalue2 + fmt.Print(client.KillTasks(value0, value1, value2)) fmt.Print("\n") break case "addInstances": @@ -651,25 +653,25 @@ func main() { fmt.Fprintln(os.Stderr, "AddInstances requires 2 args") flag.Usage() } - arg456 := flag.Arg(1) - mbTrans457 := thrift.NewTMemoryBufferLen(len(arg456)) - defer mbTrans457.Close() - _, err458 := mbTrans457.WriteString(arg456) - if err458 != nil { + arg458 := flag.Arg(1) + mbTrans459 := thrift.NewTMemoryBufferLen(len(arg458)) + defer mbTrans459.Close() + _, err460 := mbTrans459.WriteString(arg458) + if err460 != nil { Usage() return } - factory459 := thrift.NewTSimpleJSONProtocolFactory() - jsProt460 := factory459.GetProtocol(mbTrans457) + factory461 := thrift.NewTSimpleJSONProtocolFactory() + jsProt462 := factory461.GetProtocol(mbTrans459) argvalue0 := aurora.NewInstanceKey() - err461 := argvalue0.Read(jsProt460) - if err461 != nil { + err463 := argvalue0.Read(jsProt462) + if err463 != nil { Usage() return } value0 := argvalue0 - tmp1, err462 := (strconv.Atoi(flag.Arg(2))) - if err462 != nil { + tmp1, err464 := (strconv.Atoi(flag.Arg(2))) + if err464 != nil { Usage() return } @@ -683,19 +685,19 @@ func main() { fmt.Fprintln(os.Stderr, "ReplaceCronTemplate requires 1 args") flag.Usage() } - arg463 := flag.Arg(1) - mbTrans464 := thrift.NewTMemoryBufferLen(len(arg463)) - defer mbTrans464.Close() - _, err465 := mbTrans464.WriteString(arg463) - if err465 != nil { + arg465 := flag.Arg(1) + mbTrans466 := thrift.NewTMemoryBufferLen(len(arg465)) + defer mbTrans466.Close() + _, err467 := mbTrans466.WriteString(arg465) + if err467 != nil { Usage() return } - factory466 := thrift.NewTSimpleJSONProtocolFactory() - jsProt467 := factory466.GetProtocol(mbTrans464) + factory468 := thrift.NewTSimpleJSONProtocolFactory() + jsProt469 := factory468.GetProtocol(mbTrans466) argvalue0 := aurora.NewJobConfiguration() - err468 := argvalue0.Read(jsProt467) - if err468 != nil { + err470 := argvalue0.Read(jsProt469) + if err470 != nil { Usage() return } @@ -708,19 +710,19 @@ func main() { fmt.Fprintln(os.Stderr, "StartJobUpdate requires 2 args") flag.Usage() } - arg469 := flag.Arg(1) - mbTrans470 := thrift.NewTMemoryBufferLen(len(arg469)) - defer mbTrans470.Close() - _, err471 := mbTrans470.WriteString(arg469) - if err471 != nil { + arg471 := flag.Arg(1) + mbTrans472 := thrift.NewTMemoryBufferLen(len(arg471)) + defer mbTrans472.Close() + _, err473 := mbTrans472.WriteString(arg471) + if err473 != nil { Usage() return } - factory472 := thrift.NewTSimpleJSONProtocolFactory() - jsProt473 := factory472.GetProtocol(mbTrans470) + factory474 := thrift.NewTSimpleJSONProtocolFactory() + jsProt475 := factory474.GetProtocol(mbTrans472) argvalue0 := aurora.NewJobUpdateRequest() - err474 := argvalue0.Read(jsProt473) - if err474 != nil { + err476 := argvalue0.Read(jsProt475) + if err476 != nil { Usage() return } @@ -735,19 +737,19 @@ func main() { fmt.Fprintln(os.Stderr, "PauseJobUpdate requires 2 args") flag.Usage() } - arg476 := flag.Arg(1) - mbTrans477 := thrift.NewTMemoryBufferLen(len(arg476)) - defer mbTrans477.Close() - _, err478 := mbTrans477.WriteString(arg476) - if err478 != nil { + arg478 := flag.Arg(1) + mbTrans479 := thrift.NewTMemoryBufferLen(len(arg478)) + defer mbTrans479.Close() + _, err480 := mbTrans479.WriteString(arg478) + if err480 != nil { Usage() return } - factory479 := thrift.NewTSimpleJSONProtocolFactory() - jsProt480 := factory479.GetProtocol(mbTrans477) + factory481 := thrift.NewTSimpleJSONProtocolFactory() + jsProt482 := factory481.GetProtocol(mbTrans479) argvalue0 := aurora.NewJobUpdateKey() - err481 := argvalue0.Read(jsProt480) - if err481 != nil { + err483 := argvalue0.Read(jsProt482) + if err483 != nil { Usage() return } @@ -762,19 +764,19 @@ func main() { fmt.Fprintln(os.Stderr, "ResumeJobUpdate requires 2 args") flag.Usage() } - arg483 := flag.Arg(1) - mbTrans484 := thrift.NewTMemoryBufferLen(len(arg483)) - defer mbTrans484.Close() - _, err485 := mbTrans484.WriteString(arg483) - if err485 != nil { + arg485 := flag.Arg(1) + mbTrans486 := thrift.NewTMemoryBufferLen(len(arg485)) + defer mbTrans486.Close() + _, err487 := mbTrans486.WriteString(arg485) + if err487 != nil { Usage() return } - factory486 := thrift.NewTSimpleJSONProtocolFactory() - jsProt487 := factory486.GetProtocol(mbTrans484) + factory488 := thrift.NewTSimpleJSONProtocolFactory() + jsProt489 := factory488.GetProtocol(mbTrans486) argvalue0 := aurora.NewJobUpdateKey() - err488 := argvalue0.Read(jsProt487) - if err488 != nil { + err490 := argvalue0.Read(jsProt489) + if err490 != nil { Usage() return } @@ -789,19 +791,19 @@ func main() { fmt.Fprintln(os.Stderr, "AbortJobUpdate requires 2 args") flag.Usage() } - arg490 := flag.Arg(1) - mbTrans491 := thrift.NewTMemoryBufferLen(len(arg490)) - defer mbTrans491.Close() - _, err492 := mbTrans491.WriteString(arg490) - if err492 != nil { + arg492 := flag.Arg(1) + mbTrans493 := thrift.NewTMemoryBufferLen(len(arg492)) + defer mbTrans493.Close() + _, err494 := mbTrans493.WriteString(arg492) + if err494 != nil { Usage() return } - factory493 := thrift.NewTSimpleJSONProtocolFactory() - jsProt494 := factory493.GetProtocol(mbTrans491) + factory495 := thrift.NewTSimpleJSONProtocolFactory() + jsProt496 := factory495.GetProtocol(mbTrans493) argvalue0 := aurora.NewJobUpdateKey() - err495 := argvalue0.Read(jsProt494) - if err495 != nil { + err497 := argvalue0.Read(jsProt496) + if err497 != nil { Usage() return } @@ -816,19 +818,19 @@ func main() { fmt.Fprintln(os.Stderr, "RollbackJobUpdate requires 2 args") flag.Usage() } - arg497 := flag.Arg(1) - mbTrans498 := thrift.NewTMemoryBufferLen(len(arg497)) - defer mbTrans498.Close() - _, err499 := mbTrans498.WriteString(arg497) - if err499 != nil { + arg499 := flag.Arg(1) + mbTrans500 := thrift.NewTMemoryBufferLen(len(arg499)) + defer mbTrans500.Close() + _, err501 := mbTrans500.WriteString(arg499) + if err501 != nil { Usage() return } - factory500 := thrift.NewTSimpleJSONProtocolFactory() - jsProt501 := factory500.GetProtocol(mbTrans498) + factory502 := thrift.NewTSimpleJSONProtocolFactory() + jsProt503 := factory502.GetProtocol(mbTrans500) argvalue0 := aurora.NewJobUpdateKey() - err502 := argvalue0.Read(jsProt501) - if err502 != nil { + err504 := argvalue0.Read(jsProt503) + if err504 != nil { Usage() return } @@ -843,19 +845,19 @@ func main() { fmt.Fprintln(os.Stderr, "PulseJobUpdate requires 1 args") flag.Usage() } - arg504 := flag.Arg(1) - mbTrans505 := thrift.NewTMemoryBufferLen(len(arg504)) - defer mbTrans505.Close() - _, err506 := mbTrans505.WriteString(arg504) - if err506 != nil { + arg506 := flag.Arg(1) + mbTrans507 := thrift.NewTMemoryBufferLen(len(arg506)) + defer mbTrans507.Close() + _, err508 := mbTrans507.WriteString(arg506) + if err508 != nil { Usage() return } - factory507 := thrift.NewTSimpleJSONProtocolFactory() - jsProt508 := factory507.GetProtocol(mbTrans505) + factory509 := thrift.NewTSimpleJSONProtocolFactory() + jsProt510 := factory509.GetProtocol(mbTrans507) argvalue0 := aurora.NewJobUpdateKey() - err509 := argvalue0.Read(jsProt508) - if err509 != nil { + err511 := argvalue0.Read(jsProt510) + if err511 != nil { Usage() return } @@ -886,19 +888,19 @@ func main() { fmt.Fprintln(os.Stderr, "GetTasksStatus requires 1 args") flag.Usage() } - arg511 := flag.Arg(1) - mbTrans512 := thrift.NewTMemoryBufferLen(len(arg511)) - defer mbTrans512.Close() - _, err513 := mbTrans512.WriteString(arg511) - if err513 != nil { + arg513 := flag.Arg(1) + mbTrans514 := thrift.NewTMemoryBufferLen(len(arg513)) + defer mbTrans514.Close() + _, err515 := mbTrans514.WriteString(arg513) + if err515 != nil { Usage() return } - factory514 := thrift.NewTSimpleJSONProtocolFactory() - jsProt515 := factory514.GetProtocol(mbTrans512) + factory516 := thrift.NewTSimpleJSONProtocolFactory() + jsProt517 := factory516.GetProtocol(mbTrans514) argvalue0 := aurora.NewTaskQuery() - err516 := argvalue0.Read(jsProt515) - if err516 != nil { + err518 := argvalue0.Read(jsProt517) + if err518 != nil { Usage() return } @@ -911,19 +913,19 @@ func main() { fmt.Fprintln(os.Stderr, "GetTasksWithoutConfigs requires 1 args") flag.Usage() } - arg517 := flag.Arg(1) - mbTrans518 := thrift.NewTMemoryBufferLen(len(arg517)) - defer mbTrans518.Close() - _, err519 := mbTrans518.WriteString(arg517) - if err519 != nil { + arg519 := flag.Arg(1) + mbTrans520 := thrift.NewTMemoryBufferLen(len(arg519)) + defer mbTrans520.Close() + _, err521 := mbTrans520.WriteString(arg519) + if err521 != nil { Usage() return } - factory520 := thrift.NewTSimpleJSONProtocolFactory() - jsProt521 := factory520.GetProtocol(mbTrans518) + factory522 := thrift.NewTSimpleJSONProtocolFactory() + jsProt523 := factory522.GetProtocol(mbTrans520) argvalue0 := aurora.NewTaskQuery() - err522 := argvalue0.Read(jsProt521) - if err522 != nil { + err524 := argvalue0.Read(jsProt523) + if err524 != nil { Usage() return } @@ -936,19 +938,19 @@ func main() { fmt.Fprintln(os.Stderr, "GetPendingReason requires 1 args") flag.Usage() } - arg523 := flag.Arg(1) - mbTrans524 := thrift.NewTMemoryBufferLen(len(arg523)) - defer mbTrans524.Close() - _, err525 := mbTrans524.WriteString(arg523) - if err525 != nil { + arg525 := flag.Arg(1) + mbTrans526 := thrift.NewTMemoryBufferLen(len(arg525)) + defer mbTrans526.Close() + _, err527 := mbTrans526.WriteString(arg525) + if err527 != nil { Usage() return } - factory526 := thrift.NewTSimpleJSONProtocolFactory() - jsProt527 := factory526.GetProtocol(mbTrans524) + factory528 := thrift.NewTSimpleJSONProtocolFactory() + jsProt529 := factory528.GetProtocol(mbTrans526) argvalue0 := aurora.NewTaskQuery() - err528 := argvalue0.Read(jsProt527) - if err528 != nil { + err530 := argvalue0.Read(jsProt529) + if err530 != nil { Usage() return } @@ -961,19 +963,19 @@ func main() { fmt.Fprintln(os.Stderr, "GetConfigSummary requires 1 args") flag.Usage() } - arg529 := flag.Arg(1) - mbTrans530 := thrift.NewTMemoryBufferLen(len(arg529)) - defer mbTrans530.Close() - _, err531 := mbTrans530.WriteString(arg529) - if err531 != nil { + arg531 := flag.Arg(1) + mbTrans532 := thrift.NewTMemoryBufferLen(len(arg531)) + defer mbTrans532.Close() + _, err533 := mbTrans532.WriteString(arg531) + if err533 != nil { Usage() return } - factory532 := thrift.NewTSimpleJSONProtocolFactory() - jsProt533 := factory532.GetProtocol(mbTrans530) + factory534 := thrift.NewTSimpleJSONProtocolFactory() + jsProt535 := factory534.GetProtocol(mbTrans532) argvalue0 := aurora.NewJobKey() - err534 := argvalue0.Read(jsProt533) - if err534 != nil { + err536 := argvalue0.Read(jsProt535) + if err536 != nil { Usage() return } @@ -1006,19 +1008,19 @@ func main() { fmt.Fprintln(os.Stderr, "PopulateJobConfig requires 1 args") flag.Usage() } - arg537 := flag.Arg(1) - mbTrans538 := thrift.NewTMemoryBufferLen(len(arg537)) - defer mbTrans538.Close() - _, err539 := mbTrans538.WriteString(arg537) - if err539 != nil { + arg539 := flag.Arg(1) + mbTrans540 := thrift.NewTMemoryBufferLen(len(arg539)) + defer mbTrans540.Close() + _, err541 := mbTrans540.WriteString(arg539) + if err541 != nil { Usage() return } - factory540 := thrift.NewTSimpleJSONProtocolFactory() - jsProt541 := factory540.GetProtocol(mbTrans538) + factory542 := thrift.NewTSimpleJSONProtocolFactory() + jsProt543 := factory542.GetProtocol(mbTrans540) argvalue0 := aurora.NewJobConfiguration() - err542 := argvalue0.Read(jsProt541) - if err542 != nil { + err544 := argvalue0.Read(jsProt543) + if err544 != nil { Usage() return } @@ -1031,19 +1033,19 @@ func main() { fmt.Fprintln(os.Stderr, "GetJobUpdateSummaries requires 1 args") flag.Usage() } - arg543 := flag.Arg(1) - mbTrans544 := thrift.NewTMemoryBufferLen(len(arg543)) - defer mbTrans544.Close() - _, err545 := mbTrans544.WriteString(arg543) - if err545 != nil { + arg545 := flag.Arg(1) + mbTrans546 := thrift.NewTMemoryBufferLen(len(arg545)) + defer mbTrans546.Close() + _, err547 := mbTrans546.WriteString(arg545) + if err547 != nil { Usage() return } - factory546 := thrift.NewTSimpleJSONProtocolFactory() - jsProt547 := factory546.GetProtocol(mbTrans544) + factory548 := thrift.NewTSimpleJSONProtocolFactory() + jsProt549 := factory548.GetProtocol(mbTrans546) argvalue0 := aurora.NewJobUpdateQuery() - err548 := argvalue0.Read(jsProt547) - if err548 != nil { + err550 := argvalue0.Read(jsProt549) + if err550 != nil { Usage() return } @@ -1056,19 +1058,19 @@ func main() { fmt.Fprintln(os.Stderr, "GetJobUpdateDetails requires 1 args") flag.Usage() } - arg549 := flag.Arg(1) - mbTrans550 := thrift.NewTMemoryBufferLen(len(arg549)) - defer mbTrans550.Close() - _, err551 := mbTrans550.WriteString(arg549) - if err551 != nil { + arg551 := flag.Arg(1) + mbTrans552 := thrift.NewTMemoryBufferLen(len(arg551)) + defer mbTrans552.Close() + _, err553 := mbTrans552.WriteString(arg551) + if err553 != nil { Usage() return } - factory552 := thrift.NewTSimpleJSONProtocolFactory() - jsProt553 := factory552.GetProtocol(mbTrans550) + factory554 := thrift.NewTSimpleJSONProtocolFactory() + jsProt555 := factory554.GetProtocol(mbTrans552) argvalue0 := aurora.NewJobUpdateQuery() - err554 := argvalue0.Read(jsProt553) - if err554 != nil { + err556 := argvalue0.Read(jsProt555) + if err556 != nil { Usage() return } @@ -1081,19 +1083,19 @@ func main() { fmt.Fprintln(os.Stderr, "GetJobUpdateDiff requires 1 args") flag.Usage() } - arg555 := flag.Arg(1) - mbTrans556 := thrift.NewTMemoryBufferLen(len(arg555)) - defer mbTrans556.Close() - _, err557 := mbTrans556.WriteString(arg555) - if err557 != nil { + arg557 := flag.Arg(1) + mbTrans558 := thrift.NewTMemoryBufferLen(len(arg557)) + defer mbTrans558.Close() + _, err559 := mbTrans558.WriteString(arg557) + if err559 != nil { Usage() return } - factory558 := thrift.NewTSimpleJSONProtocolFactory() - jsProt559 := factory558.GetProtocol(mbTrans556) + factory560 := thrift.NewTSimpleJSONProtocolFactory() + jsProt561 := factory560.GetProtocol(mbTrans558) argvalue0 := aurora.NewJobUpdateRequest() - err560 := argvalue0.Read(jsProt559) - if err560 != nil { + err562 := argvalue0.Read(jsProt561) + if err562 != nil { Usage() return } diff --git a/gen-go/apache/aurora/aurora_scheduler_manager-remote/aurora_scheduler_manager-remote.go b/gen-go/apache/aurora/aurora_scheduler_manager-remote/aurora_scheduler_manager-remote.go index f5fc45c..463e867 100755 --- a/gen-go/apache/aurora/aurora_scheduler_manager-remote/aurora_scheduler_manager-remote.go +++ b/gen-go/apache/aurora/aurora_scheduler_manager-remote/aurora_scheduler_manager-remote.go @@ -25,7 +25,7 @@ func Usage() { fmt.Fprintln(os.Stderr, " Response descheduleCronJob(JobKey job)") fmt.Fprintln(os.Stderr, " Response startCronJob(JobKey job)") fmt.Fprintln(os.Stderr, " Response restartShards(JobKey job, shardIds)") - fmt.Fprintln(os.Stderr, " Response killTasks(JobKey job, instances)") + fmt.Fprintln(os.Stderr, " Response killTasks(JobKey job, instances, string message)") fmt.Fprintln(os.Stderr, " Response addInstances(InstanceKey key, i32 count)") fmt.Fprintln(os.Stderr, " Response replaceCronTemplate(JobConfiguration config)") fmt.Fprintln(os.Stderr, " Response startJobUpdate(JobUpdateRequest request, string message)") @@ -285,8 +285,8 @@ func main() { fmt.Print("\n") break case "killTasks": - if flag.NArg()-1 != 2 { - fmt.Fprintln(os.Stderr, "KillTasks requires 2 args") + if flag.NArg()-1 != 3 { + fmt.Fprintln(os.Stderr, "KillTasks requires 3 args") flag.Usage() } arg199 := flag.Arg(1) @@ -324,7 +324,9 @@ func main() { } argvalue1 := containerStruct1.Instances value1 := argvalue1 - fmt.Print(client.KillTasks(value0, value1)) + argvalue2 := flag.Arg(3) + value2 := argvalue2 + fmt.Print(client.KillTasks(value0, value1, value2)) fmt.Print("\n") break case "addInstances": @@ -332,25 +334,25 @@ func main() { fmt.Fprintln(os.Stderr, "AddInstances requires 2 args") flag.Usage() } - arg211 := flag.Arg(1) - mbTrans212 := thrift.NewTMemoryBufferLen(len(arg211)) - defer mbTrans212.Close() - _, err213 := mbTrans212.WriteString(arg211) - if err213 != nil { + arg212 := flag.Arg(1) + mbTrans213 := thrift.NewTMemoryBufferLen(len(arg212)) + defer mbTrans213.Close() + _, err214 := mbTrans213.WriteString(arg212) + if err214 != nil { Usage() return } - factory214 := thrift.NewTSimpleJSONProtocolFactory() - jsProt215 := factory214.GetProtocol(mbTrans212) + factory215 := thrift.NewTSimpleJSONProtocolFactory() + jsProt216 := factory215.GetProtocol(mbTrans213) argvalue0 := aurora.NewInstanceKey() - err216 := argvalue0.Read(jsProt215) - if err216 != nil { + err217 := argvalue0.Read(jsProt216) + if err217 != nil { Usage() return } value0 := argvalue0 - tmp1, err217 := (strconv.Atoi(flag.Arg(2))) - if err217 != nil { + tmp1, err218 := (strconv.Atoi(flag.Arg(2))) + if err218 != nil { Usage() return } @@ -364,19 +366,19 @@ func main() { fmt.Fprintln(os.Stderr, "ReplaceCronTemplate requires 1 args") flag.Usage() } - arg218 := flag.Arg(1) - mbTrans219 := thrift.NewTMemoryBufferLen(len(arg218)) - defer mbTrans219.Close() - _, err220 := mbTrans219.WriteString(arg218) - if err220 != nil { + arg219 := flag.Arg(1) + mbTrans220 := thrift.NewTMemoryBufferLen(len(arg219)) + defer mbTrans220.Close() + _, err221 := mbTrans220.WriteString(arg219) + if err221 != nil { Usage() return } - factory221 := thrift.NewTSimpleJSONProtocolFactory() - jsProt222 := factory221.GetProtocol(mbTrans219) + factory222 := thrift.NewTSimpleJSONProtocolFactory() + jsProt223 := factory222.GetProtocol(mbTrans220) argvalue0 := aurora.NewJobConfiguration() - err223 := argvalue0.Read(jsProt222) - if err223 != nil { + err224 := argvalue0.Read(jsProt223) + if err224 != nil { Usage() return } @@ -389,19 +391,19 @@ func main() { fmt.Fprintln(os.Stderr, "StartJobUpdate requires 2 args") flag.Usage() } - arg224 := flag.Arg(1) - mbTrans225 := thrift.NewTMemoryBufferLen(len(arg224)) - defer mbTrans225.Close() - _, err226 := mbTrans225.WriteString(arg224) - if err226 != nil { + arg225 := flag.Arg(1) + mbTrans226 := thrift.NewTMemoryBufferLen(len(arg225)) + defer mbTrans226.Close() + _, err227 := mbTrans226.WriteString(arg225) + if err227 != nil { Usage() return } - factory227 := thrift.NewTSimpleJSONProtocolFactory() - jsProt228 := factory227.GetProtocol(mbTrans225) + factory228 := thrift.NewTSimpleJSONProtocolFactory() + jsProt229 := factory228.GetProtocol(mbTrans226) argvalue0 := aurora.NewJobUpdateRequest() - err229 := argvalue0.Read(jsProt228) - if err229 != nil { + err230 := argvalue0.Read(jsProt229) + if err230 != nil { Usage() return } @@ -416,19 +418,19 @@ func main() { fmt.Fprintln(os.Stderr, "PauseJobUpdate requires 2 args") flag.Usage() } - arg231 := flag.Arg(1) - mbTrans232 := thrift.NewTMemoryBufferLen(len(arg231)) - defer mbTrans232.Close() - _, err233 := mbTrans232.WriteString(arg231) - if err233 != nil { + arg232 := flag.Arg(1) + mbTrans233 := thrift.NewTMemoryBufferLen(len(arg232)) + defer mbTrans233.Close() + _, err234 := mbTrans233.WriteString(arg232) + if err234 != nil { Usage() return } - factory234 := thrift.NewTSimpleJSONProtocolFactory() - jsProt235 := factory234.GetProtocol(mbTrans232) + factory235 := thrift.NewTSimpleJSONProtocolFactory() + jsProt236 := factory235.GetProtocol(mbTrans233) argvalue0 := aurora.NewJobUpdateKey() - err236 := argvalue0.Read(jsProt235) - if err236 != nil { + err237 := argvalue0.Read(jsProt236) + if err237 != nil { Usage() return } @@ -443,19 +445,19 @@ func main() { fmt.Fprintln(os.Stderr, "ResumeJobUpdate requires 2 args") flag.Usage() } - arg238 := flag.Arg(1) - mbTrans239 := thrift.NewTMemoryBufferLen(len(arg238)) - defer mbTrans239.Close() - _, err240 := mbTrans239.WriteString(arg238) - if err240 != nil { + arg239 := flag.Arg(1) + mbTrans240 := thrift.NewTMemoryBufferLen(len(arg239)) + defer mbTrans240.Close() + _, err241 := mbTrans240.WriteString(arg239) + if err241 != nil { Usage() return } - factory241 := thrift.NewTSimpleJSONProtocolFactory() - jsProt242 := factory241.GetProtocol(mbTrans239) + factory242 := thrift.NewTSimpleJSONProtocolFactory() + jsProt243 := factory242.GetProtocol(mbTrans240) argvalue0 := aurora.NewJobUpdateKey() - err243 := argvalue0.Read(jsProt242) - if err243 != nil { + err244 := argvalue0.Read(jsProt243) + if err244 != nil { Usage() return } @@ -470,19 +472,19 @@ func main() { fmt.Fprintln(os.Stderr, "AbortJobUpdate requires 2 args") flag.Usage() } - arg245 := flag.Arg(1) - mbTrans246 := thrift.NewTMemoryBufferLen(len(arg245)) - defer mbTrans246.Close() - _, err247 := mbTrans246.WriteString(arg245) - if err247 != nil { + arg246 := flag.Arg(1) + mbTrans247 := thrift.NewTMemoryBufferLen(len(arg246)) + defer mbTrans247.Close() + _, err248 := mbTrans247.WriteString(arg246) + if err248 != nil { Usage() return } - factory248 := thrift.NewTSimpleJSONProtocolFactory() - jsProt249 := factory248.GetProtocol(mbTrans246) + factory249 := thrift.NewTSimpleJSONProtocolFactory() + jsProt250 := factory249.GetProtocol(mbTrans247) argvalue0 := aurora.NewJobUpdateKey() - err250 := argvalue0.Read(jsProt249) - if err250 != nil { + err251 := argvalue0.Read(jsProt250) + if err251 != nil { Usage() return } @@ -497,19 +499,19 @@ func main() { fmt.Fprintln(os.Stderr, "RollbackJobUpdate requires 2 args") flag.Usage() } - arg252 := flag.Arg(1) - mbTrans253 := thrift.NewTMemoryBufferLen(len(arg252)) - defer mbTrans253.Close() - _, err254 := mbTrans253.WriteString(arg252) - if err254 != nil { + arg253 := flag.Arg(1) + mbTrans254 := thrift.NewTMemoryBufferLen(len(arg253)) + defer mbTrans254.Close() + _, err255 := mbTrans254.WriteString(arg253) + if err255 != nil { Usage() return } - factory255 := thrift.NewTSimpleJSONProtocolFactory() - jsProt256 := factory255.GetProtocol(mbTrans253) + factory256 := thrift.NewTSimpleJSONProtocolFactory() + jsProt257 := factory256.GetProtocol(mbTrans254) argvalue0 := aurora.NewJobUpdateKey() - err257 := argvalue0.Read(jsProt256) - if err257 != nil { + err258 := argvalue0.Read(jsProt257) + if err258 != nil { Usage() return } @@ -524,19 +526,19 @@ func main() { fmt.Fprintln(os.Stderr, "PulseJobUpdate requires 1 args") flag.Usage() } - arg259 := flag.Arg(1) - mbTrans260 := thrift.NewTMemoryBufferLen(len(arg259)) - defer mbTrans260.Close() - _, err261 := mbTrans260.WriteString(arg259) - if err261 != nil { + arg260 := flag.Arg(1) + mbTrans261 := thrift.NewTMemoryBufferLen(len(arg260)) + defer mbTrans261.Close() + _, err262 := mbTrans261.WriteString(arg260) + if err262 != nil { Usage() return } - factory262 := thrift.NewTSimpleJSONProtocolFactory() - jsProt263 := factory262.GetProtocol(mbTrans260) + factory263 := thrift.NewTSimpleJSONProtocolFactory() + jsProt264 := factory263.GetProtocol(mbTrans261) argvalue0 := aurora.NewJobUpdateKey() - err264 := argvalue0.Read(jsProt263) - if err264 != nil { + err265 := argvalue0.Read(jsProt264) + if err265 != nil { Usage() return } @@ -567,19 +569,19 @@ func main() { fmt.Fprintln(os.Stderr, "GetTasksStatus requires 1 args") flag.Usage() } - arg266 := flag.Arg(1) - mbTrans267 := thrift.NewTMemoryBufferLen(len(arg266)) - defer mbTrans267.Close() - _, err268 := mbTrans267.WriteString(arg266) - if err268 != nil { + arg267 := flag.Arg(1) + mbTrans268 := thrift.NewTMemoryBufferLen(len(arg267)) + defer mbTrans268.Close() + _, err269 := mbTrans268.WriteString(arg267) + if err269 != nil { Usage() return } - factory269 := thrift.NewTSimpleJSONProtocolFactory() - jsProt270 := factory269.GetProtocol(mbTrans267) + factory270 := thrift.NewTSimpleJSONProtocolFactory() + jsProt271 := factory270.GetProtocol(mbTrans268) argvalue0 := aurora.NewTaskQuery() - err271 := argvalue0.Read(jsProt270) - if err271 != nil { + err272 := argvalue0.Read(jsProt271) + if err272 != nil { Usage() return } @@ -592,19 +594,19 @@ func main() { fmt.Fprintln(os.Stderr, "GetTasksWithoutConfigs requires 1 args") flag.Usage() } - arg272 := flag.Arg(1) - mbTrans273 := thrift.NewTMemoryBufferLen(len(arg272)) - defer mbTrans273.Close() - _, err274 := mbTrans273.WriteString(arg272) - if err274 != nil { + arg273 := flag.Arg(1) + mbTrans274 := thrift.NewTMemoryBufferLen(len(arg273)) + defer mbTrans274.Close() + _, err275 := mbTrans274.WriteString(arg273) + if err275 != nil { Usage() return } - factory275 := thrift.NewTSimpleJSONProtocolFactory() - jsProt276 := factory275.GetProtocol(mbTrans273) + factory276 := thrift.NewTSimpleJSONProtocolFactory() + jsProt277 := factory276.GetProtocol(mbTrans274) argvalue0 := aurora.NewTaskQuery() - err277 := argvalue0.Read(jsProt276) - if err277 != nil { + err278 := argvalue0.Read(jsProt277) + if err278 != nil { Usage() return } @@ -617,19 +619,19 @@ func main() { fmt.Fprintln(os.Stderr, "GetPendingReason requires 1 args") flag.Usage() } - arg278 := flag.Arg(1) - mbTrans279 := thrift.NewTMemoryBufferLen(len(arg278)) - defer mbTrans279.Close() - _, err280 := mbTrans279.WriteString(arg278) - if err280 != nil { + arg279 := flag.Arg(1) + mbTrans280 := thrift.NewTMemoryBufferLen(len(arg279)) + defer mbTrans280.Close() + _, err281 := mbTrans280.WriteString(arg279) + if err281 != nil { Usage() return } - factory281 := thrift.NewTSimpleJSONProtocolFactory() - jsProt282 := factory281.GetProtocol(mbTrans279) + factory282 := thrift.NewTSimpleJSONProtocolFactory() + jsProt283 := factory282.GetProtocol(mbTrans280) argvalue0 := aurora.NewTaskQuery() - err283 := argvalue0.Read(jsProt282) - if err283 != nil { + err284 := argvalue0.Read(jsProt283) + if err284 != nil { Usage() return } @@ -642,19 +644,19 @@ func main() { fmt.Fprintln(os.Stderr, "GetConfigSummary requires 1 args") flag.Usage() } - arg284 := flag.Arg(1) - mbTrans285 := thrift.NewTMemoryBufferLen(len(arg284)) - defer mbTrans285.Close() - _, err286 := mbTrans285.WriteString(arg284) - if err286 != nil { + arg285 := flag.Arg(1) + mbTrans286 := thrift.NewTMemoryBufferLen(len(arg285)) + defer mbTrans286.Close() + _, err287 := mbTrans286.WriteString(arg285) + if err287 != nil { Usage() return } - factory287 := thrift.NewTSimpleJSONProtocolFactory() - jsProt288 := factory287.GetProtocol(mbTrans285) + factory288 := thrift.NewTSimpleJSONProtocolFactory() + jsProt289 := factory288.GetProtocol(mbTrans286) argvalue0 := aurora.NewJobKey() - err289 := argvalue0.Read(jsProt288) - if err289 != nil { + err290 := argvalue0.Read(jsProt289) + if err290 != nil { Usage() return } @@ -687,19 +689,19 @@ func main() { fmt.Fprintln(os.Stderr, "PopulateJobConfig requires 1 args") flag.Usage() } - arg292 := flag.Arg(1) - mbTrans293 := thrift.NewTMemoryBufferLen(len(arg292)) - defer mbTrans293.Close() - _, err294 := mbTrans293.WriteString(arg292) - if err294 != nil { + arg293 := flag.Arg(1) + mbTrans294 := thrift.NewTMemoryBufferLen(len(arg293)) + defer mbTrans294.Close() + _, err295 := mbTrans294.WriteString(arg293) + if err295 != nil { Usage() return } - factory295 := thrift.NewTSimpleJSONProtocolFactory() - jsProt296 := factory295.GetProtocol(mbTrans293) + factory296 := thrift.NewTSimpleJSONProtocolFactory() + jsProt297 := factory296.GetProtocol(mbTrans294) argvalue0 := aurora.NewJobConfiguration() - err297 := argvalue0.Read(jsProt296) - if err297 != nil { + err298 := argvalue0.Read(jsProt297) + if err298 != nil { Usage() return } @@ -712,19 +714,19 @@ func main() { fmt.Fprintln(os.Stderr, "GetJobUpdateSummaries requires 1 args") flag.Usage() } - arg298 := flag.Arg(1) - mbTrans299 := thrift.NewTMemoryBufferLen(len(arg298)) - defer mbTrans299.Close() - _, err300 := mbTrans299.WriteString(arg298) - if err300 != nil { + arg299 := flag.Arg(1) + mbTrans300 := thrift.NewTMemoryBufferLen(len(arg299)) + defer mbTrans300.Close() + _, err301 := mbTrans300.WriteString(arg299) + if err301 != nil { Usage() return } - factory301 := thrift.NewTSimpleJSONProtocolFactory() - jsProt302 := factory301.GetProtocol(mbTrans299) + factory302 := thrift.NewTSimpleJSONProtocolFactory() + jsProt303 := factory302.GetProtocol(mbTrans300) argvalue0 := aurora.NewJobUpdateQuery() - err303 := argvalue0.Read(jsProt302) - if err303 != nil { + err304 := argvalue0.Read(jsProt303) + if err304 != nil { Usage() return } @@ -737,19 +739,19 @@ func main() { fmt.Fprintln(os.Stderr, "GetJobUpdateDetails requires 1 args") flag.Usage() } - arg304 := flag.Arg(1) - mbTrans305 := thrift.NewTMemoryBufferLen(len(arg304)) - defer mbTrans305.Close() - _, err306 := mbTrans305.WriteString(arg304) - if err306 != nil { + arg305 := flag.Arg(1) + mbTrans306 := thrift.NewTMemoryBufferLen(len(arg305)) + defer mbTrans306.Close() + _, err307 := mbTrans306.WriteString(arg305) + if err307 != nil { Usage() return } - factory307 := thrift.NewTSimpleJSONProtocolFactory() - jsProt308 := factory307.GetProtocol(mbTrans305) + factory308 := thrift.NewTSimpleJSONProtocolFactory() + jsProt309 := factory308.GetProtocol(mbTrans306) argvalue0 := aurora.NewJobUpdateQuery() - err309 := argvalue0.Read(jsProt308) - if err309 != nil { + err310 := argvalue0.Read(jsProt309) + if err310 != nil { Usage() return } @@ -762,19 +764,19 @@ func main() { fmt.Fprintln(os.Stderr, "GetJobUpdateDiff requires 1 args") flag.Usage() } - arg310 := flag.Arg(1) - mbTrans311 := thrift.NewTMemoryBufferLen(len(arg310)) - defer mbTrans311.Close() - _, err312 := mbTrans311.WriteString(arg310) - if err312 != nil { + arg311 := flag.Arg(1) + mbTrans312 := thrift.NewTMemoryBufferLen(len(arg311)) + defer mbTrans312.Close() + _, err313 := mbTrans312.WriteString(arg311) + if err313 != nil { Usage() return } - factory313 := thrift.NewTSimpleJSONProtocolFactory() - jsProt314 := factory313.GetProtocol(mbTrans311) + factory314 := thrift.NewTSimpleJSONProtocolFactory() + jsProt315 := factory314.GetProtocol(mbTrans312) argvalue0 := aurora.NewJobUpdateRequest() - err315 := argvalue0.Read(jsProt314) - if err315 != nil { + err316 := argvalue0.Read(jsProt315) + if err316 != nil { Usage() return } diff --git a/gen-go/apache/aurora/auroraadmin.go b/gen-go/apache/aurora/auroraadmin.go index 8f29940..3956e5f 100644 --- a/gen-go/apache/aurora/auroraadmin.go +++ b/gen-go/apache/aurora/auroraadmin.go @@ -76,15 +76,6 @@ type AuroraAdmin interface { EndMaintenance(hosts *Hosts) (r *Response, err error) // Start a storage snapshot and block until it completes. Snapshot() (r *Response, err error) - // Forcibly rewrites the stored definition of user configurations. This is intended to be used - // in a controlled setting, primarily to migrate pieces of configurations that are opaque to the - // scheduler (e.g. executorConfig). - // The scheduler may do some validation of the rewritten configurations, but it is important - // that the caller take care to provide valid input and alter only necessary fields. - // - // Parameters: - // - Request - RewriteConfigs(request *RewriteConfigsRequest) (r *Response, err error) // Tell scheduler to trigger an explicit task reconciliation with the given settings. // // Parameters: @@ -92,6 +83,13 @@ type AuroraAdmin interface { TriggerExplicitTaskReconciliation(settings *ExplicitReconciliationSettings) (r *Response, err error) // Tell scheduler to trigger an implicit task reconciliation. TriggerImplicitTaskReconciliation() (r *Response, err error) + // Force prune any (terminal) tasks that match the query. If no statuses are supplied with the + // query, it will default to all terminal task states. If statuses are supplied, they must be + // terminal states. + // + // Parameters: + // - Query + PruneTasks(query *TaskQuery) (r *Response, err error) } type AuroraAdminClient struct { @@ -160,16 +158,16 @@ func (p *AuroraAdminClient) recvSetQuota() (value *Response, err error) { return } if mTypeId == thrift.EXCEPTION { - error316 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception") - var error317 error - error317, err = error316.Read(iprot) + error317 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception") + var error318 error + error318, err = error317.Read(iprot) if err != nil { return } if err = iprot.ReadMessageEnd(); err != nil { return } - err = error317 + err = error318 return } if mTypeId != thrift.REPLY { @@ -243,16 +241,16 @@ func (p *AuroraAdminClient) recvForceTaskState() (value *Response, err error) { return } if mTypeId == thrift.EXCEPTION { - error318 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception") - var error319 error - error319, err = error318.Read(iprot) + error319 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception") + var error320 error + error320, err = error319.Read(iprot) if err != nil { return } if err = iprot.ReadMessageEnd(); err != nil { return } - err = error319 + err = error320 return } if mTypeId != thrift.REPLY { @@ -317,16 +315,16 @@ func (p *AuroraAdminClient) recvPerformBackup() (value *Response, err error) { return } if mTypeId == thrift.EXCEPTION { - error320 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception") - var error321 error - error321, err = error320.Read(iprot) + error321 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception") + var error322 error + error322, err = error321.Read(iprot) if err != nil { return } if err = iprot.ReadMessageEnd(); err != nil { return } - err = error321 + err = error322 return } if mTypeId != thrift.REPLY { @@ -391,16 +389,16 @@ func (p *AuroraAdminClient) recvListBackups() (value *Response, err error) { return } if mTypeId == thrift.EXCEPTION { - error322 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception") - var error323 error - error323, err = error322.Read(iprot) + error323 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception") + var error324 error + error324, err = error323.Read(iprot) if err != nil { return } if err = iprot.ReadMessageEnd(); err != nil { return } - err = error323 + err = error324 return } if mTypeId != thrift.REPLY { @@ -470,16 +468,16 @@ func (p *AuroraAdminClient) recvStageRecovery() (value *Response, err error) { return } if mTypeId == thrift.EXCEPTION { - error324 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception") - var error325 error - error325, err = error324.Read(iprot) + error325 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception") + var error326 error + error326, err = error325.Read(iprot) if err != nil { return } if err = iprot.ReadMessageEnd(); err != nil { return } - err = error325 + err = error326 return } if mTypeId != thrift.REPLY { @@ -549,16 +547,16 @@ func (p *AuroraAdminClient) recvQueryRecovery() (value *Response, err error) { return } if mTypeId == thrift.EXCEPTION { - error326 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception") - var error327 error - error327, err = error326.Read(iprot) + error327 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception") + var error328 error + error328, err = error327.Read(iprot) if err != nil { return } if err = iprot.ReadMessageEnd(); err != nil { return } - err = error327 + err = error328 return } if mTypeId != thrift.REPLY { @@ -628,16 +626,16 @@ func (p *AuroraAdminClient) recvDeleteRecoveryTasks() (value *Response, err erro return } if mTypeId == thrift.EXCEPTION { - error328 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception") - var error329 error - error329, err = error328.Read(iprot) + error329 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception") + var error330 error + error330, err = error329.Read(iprot) if err != nil { return } if err = iprot.ReadMessageEnd(); err != nil { return } - err = error329 + err = error330 return } if mTypeId != thrift.REPLY { @@ -702,16 +700,16 @@ func (p *AuroraAdminClient) recvCommitRecovery() (value *Response, err error) { return } if mTypeId == thrift.EXCEPTION { - error330 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception") - var error331 error - error331, err = error330.Read(iprot) + error331 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception") + var error332 error + error332, err = error331.Read(iprot) if err != nil { return } if err = iprot.ReadMessageEnd(); err != nil { return } - err = error331 + err = error332 return } if mTypeId != thrift.REPLY { @@ -776,16 +774,16 @@ func (p *AuroraAdminClient) recvUnloadRecovery() (value *Response, err error) { return } if mTypeId == thrift.EXCEPTION { - error332 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception") - var error333 error - error333, err = error332.Read(iprot) + error333 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception") + var error334 error + error334, err = error333.Read(iprot) if err != nil { return } if err = iprot.ReadMessageEnd(); err != nil { return } - err = error333 + err = error334 return } if mTypeId != thrift.REPLY { @@ -855,16 +853,16 @@ func (p *AuroraAdminClient) recvStartMaintenance() (value *Response, err error) return } if mTypeId == thrift.EXCEPTION { - error334 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception") - var error335 error - error335, err = error334.Read(iprot) + error335 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception") + var error336 error + error336, err = error335.Read(iprot) if err != nil { return } if err = iprot.ReadMessageEnd(); err != nil { return } - err = error335 + err = error336 return } if mTypeId != thrift.REPLY { @@ -934,16 +932,16 @@ func (p *AuroraAdminClient) recvDrainHosts() (value *Response, err error) { return } if mTypeId == thrift.EXCEPTION { - error336 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception") - var error337 error - error337, err = error336.Read(iprot) + error337 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception") + var error338 error + error338, err = error337.Read(iprot) if err != nil { return } if err = iprot.ReadMessageEnd(); err != nil { return } - err = error337 + err = error338 return } if mTypeId != thrift.REPLY { @@ -1013,16 +1011,16 @@ func (p *AuroraAdminClient) recvMaintenanceStatus() (value *Response, err error) return } if mTypeId == thrift.EXCEPTION { - error338 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception") - var error339 error - error339, err = error338.Read(iprot) + error339 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception") + var error340 error + error340, err = error339.Read(iprot) if err != nil { return } if err = iprot.ReadMessageEnd(); err != nil { return } - err = error339 + err = error340 return } if mTypeId != thrift.REPLY { @@ -1092,16 +1090,16 @@ func (p *AuroraAdminClient) recvEndMaintenance() (value *Response, err error) { return } if mTypeId == thrift.EXCEPTION { - error340 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception") - var error341 error - error341, err = error340.Read(iprot) + error341 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception") + var error342 error + error342, err = error341.Read(iprot) if err != nil { return } if err = iprot.ReadMessageEnd(); err != nil { return } - err = error341 + err = error342 return } if mTypeId != thrift.REPLY { @@ -1166,16 +1164,16 @@ func (p *AuroraAdminClient) recvSnapshot() (value *Response, err error) { return } if mTypeId == thrift.EXCEPTION { - error342 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception") - var error343 error - error343, err = error342.Read(iprot) + error343 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception") + var error344 error + error344, err = error343.Read(iprot) if err != nil { return } if err = iprot.ReadMessageEnd(); err != nil { return } - err = error343 + err = error344 return } if mTypeId != thrift.REPLY { @@ -1193,89 +1191,6 @@ func (p *AuroraAdminClient) recvSnapshot() (value *Response, err error) { return } -// Forcibly rewrites the stored definition of user configurations. This is intended to be used -// in a controlled setting, primarily to migrate pieces of configurations that are opaque to the -// scheduler (e.g. executorConfig). -// The scheduler may do some validation of the rewritten configurations, but it is important -// that the caller take care to provide valid input and alter only necessary fields. -// -// Parameters: -// - Request -func (p *AuroraAdminClient) RewriteConfigs(request *RewriteConfigsRequest) (r *Response, err error) { - if err = p.sendRewriteConfigs(request); err != nil { - return - } - return p.recvRewriteConfigs() -} - -func (p *AuroraAdminClient) sendRewriteConfigs(request *RewriteConfigsRequest) (err error) { - oprot := p.OutputProtocol - if oprot == nil { - oprot = p.ProtocolFactory.GetProtocol(p.Transport) - p.OutputProtocol = oprot - } - p.SeqId++ - if err = oprot.WriteMessageBegin("rewriteConfigs", thrift.CALL, p.SeqId); err != nil { - return - } - args := AuroraAdminRewriteConfigsArgs{ - Request: request, - } - if err = args.Write(oprot); err != nil { - return - } - if err = oprot.WriteMessageEnd(); err != nil { - return - } - return oprot.Flush() -} - -func (p *AuroraAdminClient) recvRewriteConfigs() (value *Response, err error) { - iprot := p.InputProtocol - if iprot == nil { - iprot = p.ProtocolFactory.GetProtocol(p.Transport) - p.InputProtocol = iprot - } - method, mTypeId, seqId, err := iprot.ReadMessageBegin() - if err != nil { - return - } - if method != "rewriteConfigs" { - err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "rewriteConfigs failed: wrong method name") - return - } - if p.SeqId != seqId { - err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "rewriteConfigs failed: out of sequence response") - return - } - if mTypeId == thrift.EXCEPTION { - error344 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception") - var error345 error - error345, err = error344.Read(iprot) - if err != nil { - return - } - if err = iprot.ReadMessageEnd(); err != nil { - return - } - err = error345 - return - } - if mTypeId != thrift.REPLY { - err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "rewriteConfigs failed: invalid message type") - return - } - result := AuroraAdminRewriteConfigsResult{} - if err = result.Read(iprot); err != nil { - return - } - if err = iprot.ReadMessageEnd(); err != nil { - return - } - value = result.GetSuccess() - return -} - // Tell scheduler to trigger an explicit task reconciliation with the given settings. // // Parameters: @@ -1328,16 +1243,16 @@ func (p *AuroraAdminClient) recvTriggerExplicitTaskReconciliation() (value *Resp return } if mTypeId == thrift.EXCEPTION { - error346 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception") - var error347 error - error347, err = error346.Read(iprot) + error345 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception") + var error346 error + error346, err = error345.Read(iprot) if err != nil { return } if err = iprot.ReadMessageEnd(); err != nil { return } - err = error347 + err = error346 return } if mTypeId != thrift.REPLY { @@ -1402,16 +1317,16 @@ func (p *AuroraAdminClient) recvTriggerImplicitTaskReconciliation() (value *Resp return } if mTypeId == thrift.EXCEPTION { - error348 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception") - var error349 error - error349, err = error348.Read(iprot) + error347 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception") + var error348 error + error348, err = error347.Read(iprot) if err != nil { return } if err = iprot.ReadMessageEnd(); err != nil { return } - err = error349 + err = error348 return } if mTypeId != thrift.REPLY { @@ -1429,30 +1344,111 @@ func (p *AuroraAdminClient) recvTriggerImplicitTaskReconciliation() (value *Resp return } +// Force prune any (terminal) tasks that match the query. If no statuses are supplied with the +// query, it will default to all terminal task states. If statuses are supplied, they must be +// terminal states. +// +// Parameters: +// - Query +func (p *AuroraAdminClient) PruneTasks(query *TaskQuery) (r *Response, err error) { + if err = p.sendPruneTasks(query); err != nil { + return + } + return p.recvPruneTasks() +} + +func (p *AuroraAdminClient) sendPruneTasks(query *TaskQuery) (err error) { + oprot := p.OutputProtocol + if oprot == nil { + oprot = p.ProtocolFactory.GetProtocol(p.Transport) + p.OutputProtocol = oprot + } + p.SeqId++ + if err = oprot.WriteMessageBegin("pruneTasks", thrift.CALL, p.SeqId); err != nil { + return + } + args := AuroraAdminPruneTasksArgs{ + Query: query, + } + if err = args.Write(oprot); err != nil { + return + } + if err = oprot.WriteMessageEnd(); err != nil { + return + } + return oprot.Flush() +} + +func (p *AuroraAdminClient) recvPruneTasks() (value *Response, err error) { + iprot := p.InputProtocol + if iprot == nil { + iprot = p.ProtocolFactory.GetProtocol(p.Transport) + p.InputProtocol = iprot + } + method, mTypeId, seqId, err := iprot.ReadMessageBegin() + if err != nil { + return + } + if method != "pruneTasks" { + err = thrift.NewTApplicationException(thrift.WRONG_METHOD_NAME, "pruneTasks failed: wrong method name") + return + } + if p.SeqId != seqId { + err = thrift.NewTApplicationException(thrift.BAD_SEQUENCE_ID, "pruneTasks failed: out of sequence response") + return + } + if mTypeId == thrift.EXCEPTION { + error349 := thrift.NewTApplicationException(thrift.UNKNOWN_APPLICATION_EXCEPTION, "Unknown Exception") + var error350 error + error350, err = error349.Read(iprot) + if err != nil { + return + } + if err = iprot.ReadMessageEnd(); err != nil { + return + } + err = error350 + return + } + if mTypeId != thrift.REPLY { + err = thrift.NewTApplicationException(thrift.INVALID_MESSAGE_TYPE_EXCEPTION, "pruneTasks failed: invalid message type") + return + } + result := AuroraAdminPruneTasksResult{} + if err = result.Read(iprot); err != nil { + return + } + if err = iprot.ReadMessageEnd(); err != nil { + return + } + value = result.GetSuccess() + return +} + type AuroraAdminProcessor struct { *AuroraSchedulerManagerProcessor } func NewAuroraAdminProcessor(handler AuroraAdmin) *AuroraAdminProcessor { - self350 := &AuroraAdminProcessor{NewAuroraSchedulerManagerProcessor(handler)} - self350.AddToProcessorMap("setQuota", &auroraAdminProcessorSetQuota{handler: handler}) - self350.AddToProcessorMap("forceTaskState", &auroraAdminProcessorForceTaskState{handler: handler}) - self350.AddToProcessorMap("performBackup", &auroraAdminProcessorPerformBackup{handler: handler}) - self350.AddToProcessorMap("listBackups", &auroraAdminProcessorListBackups{handler: handler}) - self350.AddToProcessorMap("stageRecovery", &auroraAdminProcessorStageRecovery{handler: handler}) - self350.AddToProcessorMap("queryRecovery", &auroraAdminProcessorQueryRecovery{handler: handler}) - self350.AddToProcessorMap("deleteRecoveryTasks", &auroraAdminProcessorDeleteRecoveryTasks{handler: handler}) - self350.AddToProcessorMap("commitRecovery", &auroraAdminProcessorCommitRecovery{handler: handler}) - self350.AddToProcessorMap("unloadRecovery", &auroraAdminProcessorUnloadRecovery{handler: handler}) - self350.AddToProcessorMap("startMaintenance", &auroraAdminProcessorStartMaintenance{handler: handler}) - self350.AddToProcessorMap("drainHosts", &auroraAdminProcessorDrainHosts{handler: handler}) - self350.AddToProcessorMap("maintenanceStatus", &auroraAdminProcessorMaintenanceStatus{handler: handler}) - self350.AddToProcessorMap("endMaintenance", &auroraAdminProcessorEndMaintenance{handler: handler}) - self350.AddToProcessorMap("snapshot", &auroraAdminProcessorSnapshot{handler: handler}) - self350.AddToProcessorMap("rewriteConfigs", &auroraAdminProcessorRewriteConfigs{handler: handler}) - self350.AddToProcessorMap("triggerExplicitTaskReconciliation", &auroraAdminProcessorTriggerExplicitTaskReconciliation{handler: handler}) - self350.AddToProcessorMap("triggerImplicitTaskReconciliation", &auroraAdminProcessorTriggerImplicitTaskReconciliation{handler: handler}) - return self350 + self351 := &AuroraAdminProcessor{NewAuroraSchedulerManagerProcessor(handler)} + self351.AddToProcessorMap("setQuota", &auroraAdminProcessorSetQuota{handler: handler}) + self351.AddToProcessorMap("forceTaskState", &auroraAdminProcessorForceTaskState{handler: handler}) + self351.AddToProcessorMap("performBackup", &auroraAdminProcessorPerformBackup{handler: handler}) + self351.AddToProcessorMap("listBackups", &auroraAdminProcessorListBackups{handler: handler}) + self351.AddToProcessorMap("stageRecovery", &auroraAdminProcessorStageRecovery{handler: handler}) + self351.AddToProcessorMap("queryRecovery", &auroraAdminProcessorQueryRecovery{handler: handler}) + self351.AddToProcessorMap("deleteRecoveryTasks", &auroraAdminProcessorDeleteRecoveryTasks{handler: handler}) + self351.AddToProcessorMap("commitRecovery", &auroraAdminProcessorCommitRecovery{handler: handler}) + self351.AddToProcessorMap("unloadRecovery", &auroraAdminProcessorUnloadRecovery{handler: handler}) + self351.AddToProcessorMap("startMaintenance", &auroraAdminProcessorStartMaintenance{handler: handler}) + self351.AddToProcessorMap("drainHosts", &auroraAdminProcessorDrainHosts{handler: handler}) + self351.AddToProcessorMap("maintenanceStatus", &auroraAdminProcessorMaintenanceStatus{handler: handler}) + self351.AddToProcessorMap("endMaintenance", &auroraAdminProcessorEndMaintenance{handler: handler}) + self351.AddToProcessorMap("snapshot", &auroraAdminProcessorSnapshot{handler: handler}) + self351.AddToProcessorMap("triggerExplicitTaskReconciliation", &auroraAdminProcessorTriggerExplicitTaskReconciliation{handler: handler}) + self351.AddToProcessorMap("triggerImplicitTaskReconciliation", &auroraAdminProcessorTriggerImplicitTaskReconciliation{handler: handler}) + self351.AddToProcessorMap("pruneTasks", &auroraAdminProcessorPruneTasks{handler: handler}) + return self351 } type auroraAdminProcessorSetQuota struct { @@ -2127,54 +2123,6 @@ func (p *auroraAdminProcessorSnapshot) Process(seqId int32, iprot, oprot thrift. return true, err } -type auroraAdminProcessorRewriteConfigs struct { - handler AuroraAdmin -} - -func (p *auroraAdminProcessorRewriteConfigs) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { - args := AuroraAdminRewriteConfigsArgs{} - if err = args.Read(iprot); err != nil { - iprot.ReadMessageEnd() - x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) - oprot.WriteMessageBegin("rewriteConfigs", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush() - return false, err - } - - iprot.ReadMessageEnd() - result := AuroraAdminRewriteConfigsResult{} - var retval *Response - var err2 error - if retval, err2 = p.handler.RewriteConfigs(args.Request); err2 != nil { - x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing rewriteConfigs: "+err2.Error()) - oprot.WriteMessageBegin("rewriteConfigs", thrift.EXCEPTION, seqId) - x.Write(oprot) - oprot.WriteMessageEnd() - oprot.Flush() - return true, err2 - } else { - result.Success = retval - } - if err2 = oprot.WriteMessageBegin("rewriteConfigs", thrift.REPLY, seqId); err2 != nil { - err = err2 - } - if err2 = result.Write(oprot); err == nil && err2 != nil { - err = err2 - } - if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { - err = err2 - } - if err2 = oprot.Flush(); err == nil && err2 != nil { - err = err2 - } - if err != nil { - return - } - return true, err -} - type auroraAdminProcessorTriggerExplicitTaskReconciliation struct { handler AuroraAdmin } @@ -2271,6 +2219,54 @@ func (p *auroraAdminProcessorTriggerImplicitTaskReconciliation) Process(seqId in return true, err } +type auroraAdminProcessorPruneTasks struct { + handler AuroraAdmin +} + +func (p *auroraAdminProcessorPruneTasks) Process(seqId int32, iprot, oprot thrift.TProtocol) (success bool, err thrift.TException) { + args := AuroraAdminPruneTasksArgs{} + if err = args.Read(iprot); err != nil { + iprot.ReadMessageEnd() + x := thrift.NewTApplicationException(thrift.PROTOCOL_ERROR, err.Error()) + oprot.WriteMessageBegin("pruneTasks", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush() + return false, err + } + + iprot.ReadMessageEnd() + result := AuroraAdminPruneTasksResult{} + var retval *Response + var err2 error + if retval, err2 = p.handler.PruneTasks(args.Query); err2 != nil { + x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing pruneTasks: "+err2.Error()) + oprot.WriteMessageBegin("pruneTasks", thrift.EXCEPTION, seqId) + x.Write(oprot) + oprot.WriteMessageEnd() + oprot.Flush() + return true, err2 + } else { + result.Success = retval + } + if err2 = oprot.WriteMessageBegin("pruneTasks", thrift.REPLY, seqId); err2 != nil { + err = err2 + } + if err2 = result.Write(oprot); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.WriteMessageEnd(); err == nil && err2 != nil { + err = err2 + } + if err2 = oprot.Flush(); err == nil && err2 != nil { + err = err2 + } + if err != nil { + return + } + return true, err +} + // HELPER FUNCTIONS AND STRUCTURES // Attributes: @@ -4898,206 +4894,6 @@ func (p *AuroraAdminSnapshotResult) String() string { return fmt.Sprintf("AuroraAdminSnapshotResult(%+v)", *p) } -// Attributes: -// - Request -type AuroraAdminRewriteConfigsArgs struct { - Request *RewriteConfigsRequest `thrift:"request,1" json:"request"` -} - -func NewAuroraAdminRewriteConfigsArgs() *AuroraAdminRewriteConfigsArgs { - return &AuroraAdminRewriteConfigsArgs{} -} - -var AuroraAdminRewriteConfigsArgs_Request_DEFAULT *RewriteConfigsRequest - -func (p *AuroraAdminRewriteConfigsArgs) GetRequest() *RewriteConfigsRequest { - if !p.IsSetRequest() { - return AuroraAdminRewriteConfigsArgs_Request_DEFAULT - } - return p.Request -} -func (p *AuroraAdminRewriteConfigsArgs) IsSetRequest() bool { - return p.Request != nil -} - -func (p *AuroraAdminRewriteConfigsArgs) Read(iprot thrift.TProtocol) error { - if _, err := iprot.ReadStructBegin(); err != nil { - return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err) - } - - for { - _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin() - if err != nil { - return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err) - } - if fieldTypeId == thrift.STOP { - break - } - switch fieldId { - case 1: - if err := p.readField1(iprot); err != nil { - return err - } - default: - if err := iprot.Skip(fieldTypeId); err != nil { - return err - } - } - if err := iprot.ReadFieldEnd(); err != nil { - return err - } - } - if err := iprot.ReadStructEnd(); err != nil { - return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) - } - return nil -} - -func (p *AuroraAdminRewriteConfigsArgs) readField1(iprot thrift.TProtocol) error { - p.Request = &RewriteConfigsRequest{} - if err := p.Request.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Request), err) - } - return nil -} - -func (p *AuroraAdminRewriteConfigsArgs) Write(oprot thrift.TProtocol) error { - if err := oprot.WriteStructBegin("rewriteConfigs_args"); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) - } - if err := p.writeField1(oprot); err != nil { - return err - } - if err := oprot.WriteFieldStop(); err != nil { - return thrift.PrependError("write field stop error: ", err) - } - if err := oprot.WriteStructEnd(); err != nil { - return thrift.PrependError("write struct stop error: ", err) - } - return nil -} - -func (p *AuroraAdminRewriteConfigsArgs) writeField1(oprot thrift.TProtocol) (err error) { - if err := oprot.WriteFieldBegin("request", thrift.STRUCT, 1); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:request: ", p), err) - } - if err := p.Request.Write(oprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Request), err) - } - if err := oprot.WriteFieldEnd(); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write field end error 1:request: ", p), err) - } - return err -} - -func (p *AuroraAdminRewriteConfigsArgs) String() string { - if p == nil { - return "" - } - return fmt.Sprintf("AuroraAdminRewriteConfigsArgs(%+v)", *p) -} - -// Attributes: -// - Success -type AuroraAdminRewriteConfigsResult struct { - Success *Response `thrift:"success,0" json:"success,omitempty"` -} - -func NewAuroraAdminRewriteConfigsResult() *AuroraAdminRewriteConfigsResult { - return &AuroraAdminRewriteConfigsResult{} -} - -var AuroraAdminRewriteConfigsResult_Success_DEFAULT *Response - -func (p *AuroraAdminRewriteConfigsResult) GetSuccess() *Response { - if !p.IsSetSuccess() { - return AuroraAdminRewriteConfigsResult_Success_DEFAULT - } - return p.Success -} -func (p *AuroraAdminRewriteConfigsResult) IsSetSuccess() bool { - return p.Success != nil -} - -func (p *AuroraAdminRewriteConfigsResult) Read(iprot thrift.TProtocol) error { - if _, err := iprot.ReadStructBegin(); err != nil { - return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err) - } - - for { - _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin() - if err != nil { - return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err) - } - if fieldTypeId == thrift.STOP { - break - } - switch fieldId { - case 0: - if err := p.readField0(iprot); err != nil { - return err - } - default: - if err := iprot.Skip(fieldTypeId); err != nil { - return err - } - } - if err := iprot.ReadFieldEnd(); err != nil { - return err - } - } - if err := iprot.ReadStructEnd(); err != nil { - return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) - } - return nil -} - -func (p *AuroraAdminRewriteConfigsResult) readField0(iprot thrift.TProtocol) error { - p.Success = &Response{} - if err := p.Success.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err) - } - return nil -} - -func (p *AuroraAdminRewriteConfigsResult) Write(oprot thrift.TProtocol) error { - if err := oprot.WriteStructBegin("rewriteConfigs_result"); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) - } - if err := p.writeField0(oprot); err != nil { - return err - } - if err := oprot.WriteFieldStop(); err != nil { - return thrift.PrependError("write field stop error: ", err) - } - if err := oprot.WriteStructEnd(); err != nil { - return thrift.PrependError("write struct stop error: ", err) - } - return nil -} - -func (p *AuroraAdminRewriteConfigsResult) writeField0(oprot thrift.TProtocol) (err error) { - if p.IsSetSuccess() { - if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) - } - if err := p.Success.Write(oprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err) - } - if err := oprot.WriteFieldEnd(); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) - } - } - return err -} - -func (p *AuroraAdminRewriteConfigsResult) String() string { - if p == nil { - return "" - } - return fmt.Sprintf("AuroraAdminRewriteConfigsResult(%+v)", *p) -} - // Attributes: // - Settings type AuroraAdminTriggerExplicitTaskReconciliationArgs struct { @@ -5451,3 +5247,203 @@ func (p *AuroraAdminTriggerImplicitTaskReconciliationResult) String() string { } return fmt.Sprintf("AuroraAdminTriggerImplicitTaskReconciliationResult(%+v)", *p) } + +// Attributes: +// - Query +type AuroraAdminPruneTasksArgs struct { + Query *TaskQuery `thrift:"query,1" json:"query"` +} + +func NewAuroraAdminPruneTasksArgs() *AuroraAdminPruneTasksArgs { + return &AuroraAdminPruneTasksArgs{} +} + +var AuroraAdminPruneTasksArgs_Query_DEFAULT *TaskQuery + +func (p *AuroraAdminPruneTasksArgs) GetQuery() *TaskQuery { + if !p.IsSetQuery() { + return AuroraAdminPruneTasksArgs_Query_DEFAULT + } + return p.Query +} +func (p *AuroraAdminPruneTasksArgs) IsSetQuery() bool { + return p.Query != nil +} + +func (p *AuroraAdminPruneTasksArgs) Read(iprot thrift.TProtocol) error { + if _, err := iprot.ReadStructBegin(); err != nil { + return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err) + } + + for { + _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin() + if err != nil { + return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err) + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 1: + if err := p.readField1(iprot); err != nil { + return err + } + default: + if err := iprot.Skip(fieldTypeId); err != nil { + return err + } + } + if err := iprot.ReadFieldEnd(); err != nil { + return err + } + } + if err := iprot.ReadStructEnd(); err != nil { + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) + } + return nil +} + +func (p *AuroraAdminPruneTasksArgs) readField1(iprot thrift.TProtocol) error { + p.Query = &TaskQuery{} + if err := p.Query.Read(iprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Query), err) + } + return nil +} + +func (p *AuroraAdminPruneTasksArgs) Write(oprot thrift.TProtocol) error { + if err := oprot.WriteStructBegin("pruneTasks_args"); err != nil { + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) + } + if err := p.writeField1(oprot); err != nil { + return err + } + if err := oprot.WriteFieldStop(); err != nil { + return thrift.PrependError("write field stop error: ", err) + } + if err := oprot.WriteStructEnd(); err != nil { + return thrift.PrependError("write struct stop error: ", err) + } + return nil +} + +func (p *AuroraAdminPruneTasksArgs) writeField1(oprot thrift.TProtocol) (err error) { + if err := oprot.WriteFieldBegin("query", thrift.STRUCT, 1); err != nil { + return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:query: ", p), err) + } + if err := p.Query.Write(oprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Query), err) + } + if err := oprot.WriteFieldEnd(); err != nil { + return thrift.PrependError(fmt.Sprintf("%T write field end error 1:query: ", p), err) + } + return err +} + +func (p *AuroraAdminPruneTasksArgs) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("AuroraAdminPruneTasksArgs(%+v)", *p) +} + +// Attributes: +// - Success +type AuroraAdminPruneTasksResult struct { + Success *Response `thrift:"success,0" json:"success,omitempty"` +} + +func NewAuroraAdminPruneTasksResult() *AuroraAdminPruneTasksResult { + return &AuroraAdminPruneTasksResult{} +} + +var AuroraAdminPruneTasksResult_Success_DEFAULT *Response + +func (p *AuroraAdminPruneTasksResult) GetSuccess() *Response { + if !p.IsSetSuccess() { + return AuroraAdminPruneTasksResult_Success_DEFAULT + } + return p.Success +} +func (p *AuroraAdminPruneTasksResult) IsSetSuccess() bool { + return p.Success != nil +} + +func (p *AuroraAdminPruneTasksResult) Read(iprot thrift.TProtocol) error { + if _, err := iprot.ReadStructBegin(); err != nil { + return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err) + } + + for { + _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin() + if err != nil { + return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err) + } + if fieldTypeId == thrift.STOP { + break + } + switch fieldId { + case 0: + if err := p.readField0(iprot); err != nil { + return err + } + default: + if err := iprot.Skip(fieldTypeId); err != nil { + return err + } + } + if err := iprot.ReadFieldEnd(); err != nil { + return err + } + } + if err := iprot.ReadStructEnd(); err != nil { + return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) + } + return nil +} + +func (p *AuroraAdminPruneTasksResult) readField0(iprot thrift.TProtocol) error { + p.Success = &Response{} + if err := p.Success.Read(iprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.Success), err) + } + return nil +} + +func (p *AuroraAdminPruneTasksResult) Write(oprot thrift.TProtocol) error { + if err := oprot.WriteStructBegin("pruneTasks_result"); err != nil { + return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) + } + if err := p.writeField0(oprot); err != nil { + return err + } + if err := oprot.WriteFieldStop(); err != nil { + return thrift.PrependError("write field stop error: ", err) + } + if err := oprot.WriteStructEnd(); err != nil { + return thrift.PrependError("write struct stop error: ", err) + } + return nil +} + +func (p *AuroraAdminPruneTasksResult) writeField0(oprot thrift.TProtocol) (err error) { + if p.IsSetSuccess() { + if err := oprot.WriteFieldBegin("success", thrift.STRUCT, 0); err != nil { + return thrift.PrependError(fmt.Sprintf("%T write field begin error 0:success: ", p), err) + } + if err := p.Success.Write(oprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.Success), err) + } + if err := oprot.WriteFieldEnd(); err != nil { + return thrift.PrependError(fmt.Sprintf("%T write field end error 0:success: ", p), err) + } + } + return err +} + +func (p *AuroraAdminPruneTasksResult) String() string { + if p == nil { + return "" + } + return fmt.Sprintf("AuroraAdminPruneTasksResult(%+v)", *p) +} diff --git a/gen-go/apache/aurora/auroraschedulermanager.go b/gen-go/apache/aurora/auroraschedulermanager.go index 26865dc..33757e8 100644 --- a/gen-go/apache/aurora/auroraschedulermanager.go +++ b/gen-go/apache/aurora/auroraschedulermanager.go @@ -53,7 +53,8 @@ type AuroraSchedulerManager interface { // Parameters: // - Job // - Instances - KillTasks(job *JobKey, instances map[int32]bool) (r *Response, err error) + // - Message + KillTasks(job *JobKey, instances map[int32]bool, message string) (r *Response, err error) // Adds new instances with the TaskConfig of the existing instance pointed by the key. // // Parameters: @@ -524,14 +525,15 @@ func (p *AuroraSchedulerManagerClient) recvRestartShards() (value *Response, err // Parameters: // - Job // - Instances -func (p *AuroraSchedulerManagerClient) KillTasks(job *JobKey, instances map[int32]bool) (r *Response, err error) { - if err = p.sendKillTasks(job, instances); err != nil { +// - Message +func (p *AuroraSchedulerManagerClient) KillTasks(job *JobKey, instances map[int32]bool, message string) (r *Response, err error) { + if err = p.sendKillTasks(job, instances, message); err != nil { return } return p.recvKillTasks() } -func (p *AuroraSchedulerManagerClient) sendKillTasks(job *JobKey, instances map[int32]bool) (err error) { +func (p *AuroraSchedulerManagerClient) sendKillTasks(job *JobKey, instances map[int32]bool, message string) (err error) { oprot := p.OutputProtocol if oprot == nil { oprot = p.ProtocolFactory.GetProtocol(p.Transport) @@ -544,6 +546,7 @@ func (p *AuroraSchedulerManagerClient) sendKillTasks(job *JobKey, instances map[ args := AuroraSchedulerManagerKillTasksArgs{ Job: job, Instances: instances, + Message: message, } if err = args.Write(oprot); err != nil { return @@ -1530,7 +1533,7 @@ func (p *auroraSchedulerManagerProcessorKillTasks) Process(seqId int32, iprot, o result := AuroraSchedulerManagerKillTasksResult{} var retval *Response var err2 error - if retval, err2 = p.handler.KillTasks(args.Job, args.Instances); err2 != nil { + if retval, err2 = p.handler.KillTasks(args.Job, args.Instances, args.Message); err2 != nil { x := thrift.NewTApplicationException(thrift.INTERNAL_ERROR, "Internal error processing killTasks: "+err2.Error()) oprot.WriteMessageBegin("killTasks", thrift.EXCEPTION, seqId) x.Write(oprot) @@ -3007,10 +3010,12 @@ func (p *AuroraSchedulerManagerRestartShardsResult) String() string { // Attributes: // - Job // - Instances +// - Message type AuroraSchedulerManagerKillTasksArgs struct { // unused fields # 1 to 3 Job *JobKey `thrift:"job,4" json:"job"` Instances map[int32]bool `thrift:"instances,5" json:"instances"` + Message string `thrift:"message,6" json:"message"` } func NewAuroraSchedulerManagerKillTasksArgs() *AuroraSchedulerManagerKillTasksArgs { @@ -3029,6 +3034,10 @@ func (p *AuroraSchedulerManagerKillTasksArgs) GetJob() *JobKey { func (p *AuroraSchedulerManagerKillTasksArgs) GetInstances() map[int32]bool { return p.Instances } + +func (p *AuroraSchedulerManagerKillTasksArgs) GetMessage() string { + return p.Message +} func (p *AuroraSchedulerManagerKillTasksArgs) IsSetJob() bool { return p.Job != nil } @@ -3055,6 +3064,10 @@ func (p *AuroraSchedulerManagerKillTasksArgs) Read(iprot thrift.TProtocol) error if err := p.readField5(iprot); err != nil { return err } + case 6: + if err := p.readField6(iprot); err != nil { + return err + } default: if err := iprot.Skip(fieldTypeId); err != nil { return err @@ -3100,6 +3113,15 @@ func (p *AuroraSchedulerManagerKillTasksArgs) readField5(iprot thrift.TProtocol) return nil } +func (p *AuroraSchedulerManagerKillTasksArgs) readField6(iprot thrift.TProtocol) error { + if v, err := iprot.ReadString(); err != nil { + return thrift.PrependError("error reading field 6: ", err) + } else { + p.Message = v + } + return nil +} + func (p *AuroraSchedulerManagerKillTasksArgs) Write(oprot thrift.TProtocol) error { if err := oprot.WriteStructBegin("killTasks_args"); err != nil { return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) @@ -3110,6 +3132,9 @@ func (p *AuroraSchedulerManagerKillTasksArgs) Write(oprot thrift.TProtocol) erro if err := p.writeField5(oprot); err != nil { return err } + if err := p.writeField6(oprot); err != nil { + return err + } if err := oprot.WriteFieldStop(); err != nil { return thrift.PrependError("write field stop error: ", err) } @@ -3153,6 +3178,19 @@ func (p *AuroraSchedulerManagerKillTasksArgs) writeField5(oprot thrift.TProtocol return err } +func (p *AuroraSchedulerManagerKillTasksArgs) writeField6(oprot thrift.TProtocol) (err error) { + if err := oprot.WriteFieldBegin("message", thrift.STRING, 6); err != nil { + return thrift.PrependError(fmt.Sprintf("%T write field begin error 6:message: ", p), err) + } + if err := oprot.WriteString(string(p.Message)); err != nil { + return thrift.PrependError(fmt.Sprintf("%T.message (6) field write error: ", p), err) + } + if err := oprot.WriteFieldEnd(); err != nil { + return thrift.PrependError(fmt.Sprintf("%T write field end error 6:message: ", p), err) + } + return err +} + func (p *AuroraSchedulerManagerKillTasksArgs) String() string { if p == nil { return "" diff --git a/gen-go/apache/aurora/constants.go b/gen-go/apache/aurora/constants.go index 073d675..84211aa 100644 --- a/gen-go/apache/aurora/constants.go +++ b/gen-go/apache/aurora/constants.go @@ -26,6 +26,7 @@ const GOOD_IDENTIFIER_PATTERN_JVM = "^[\\w\\-\\.]+$" const GOOD_IDENTIFIER_PATTERN_PYTHON = "^[\\w\\-\\.]+$" var ACTIVE_JOB_UPDATE_STATES map[JobUpdateStatus]bool +var AWAITNG_PULSE_JOB_UPDATE_STATES map[JobUpdateStatus]bool const BYPASS_LEADER_REDIRECT_HEADER_NAME = "Bypass-Leader-Redirect" const TASK_FILESYSTEM_MOUNT_POINT = "taskfs" @@ -77,4 +78,9 @@ func init() { 10: true, } + AWAITNG_PULSE_JOB_UPDATE_STATES = map[JobUpdateStatus]bool{ + 9: true, + 10: true, + } + } diff --git a/gen-go/apache/aurora/ttypes.go b/gen-go/apache/aurora/ttypes.go index 564ecc1..4d8fa54 100644 --- a/gen-go/apache/aurora/ttypes.go +++ b/gen-go/apache/aurora/ttypes.go @@ -19,13 +19,13 @@ var GoUnusedProtection__ int type ResponseCode int64 const ( - ResponseCode_INVALID_REQUEST ResponseCode = 0 - ResponseCode_OK ResponseCode = 1 - ResponseCode_ERROR ResponseCode = 2 - ResponseCode_WARNING ResponseCode = 3 - ResponseCode_AUTH_FAILED ResponseCode = 4 - ResponseCode_LOCK_ERROR ResponseCode = 5 - ResponseCode_ERROR_TRANSIENT ResponseCode = 6 + ResponseCode_INVALID_REQUEST ResponseCode = 0 + ResponseCode_OK ResponseCode = 1 + ResponseCode_ERROR ResponseCode = 2 + ResponseCode_WARNING ResponseCode = 3 + ResponseCode_AUTH_FAILED ResponseCode = 4 + ResponseCode_JOB_UPDATING_ERROR ResponseCode = 5 + ResponseCode_ERROR_TRANSIENT ResponseCode = 6 ) func (p ResponseCode) String() string { @@ -40,8 +40,8 @@ func (p ResponseCode) String() string { return "WARNING" case ResponseCode_AUTH_FAILED: return "AUTH_FAILED" - case ResponseCode_LOCK_ERROR: - return "LOCK_ERROR" + case ResponseCode_JOB_UPDATING_ERROR: + return "JOB_UPDATING_ERROR" case ResponseCode_ERROR_TRANSIENT: return "ERROR_TRANSIENT" } @@ -60,8 +60,8 @@ func ResponseCodeFromString(s string) (ResponseCode, error) { return ResponseCode_WARNING, nil case "AUTH_FAILED": return ResponseCode_AUTH_FAILED, nil - case "LOCK_ERROR": - return ResponseCode_LOCK_ERROR, nil + case "JOB_UPDATING_ERROR": + return ResponseCode_JOB_UPDATING_ERROR, nil case "ERROR_TRANSIENT": return ResponseCode_ERROR_TRANSIENT, nil } @@ -3400,8 +3400,10 @@ func (p *Image) String() string { // // Attributes: // - Image: the optional filesystem image to use when launching this task. +// - Volumes: the optional list of volumes to mount into the task. type MesosContainer struct { - Image *Image `thrift:"image,1" json:"image,omitempty"` + Image *Image `thrift:"image,1" json:"image,omitempty"` + Volumes []*Volume `thrift:"volumes,2" json:"volumes,omitempty"` } func NewMesosContainer() *MesosContainer { @@ -3416,10 +3418,20 @@ func (p *MesosContainer) GetImage() *Image { } return p.Image } + +var MesosContainer_Volumes_DEFAULT []*Volume + +func (p *MesosContainer) GetVolumes() []*Volume { + return p.Volumes +} func (p *MesosContainer) IsSetImage() bool { return p.Image != nil } +func (p *MesosContainer) IsSetVolumes() bool { + return p.Volumes != nil +} + func (p *MesosContainer) Read(iprot thrift.TProtocol) error { if _, err := iprot.ReadStructBegin(); err != nil { return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err) @@ -3438,6 +3450,10 @@ func (p *MesosContainer) Read(iprot thrift.TProtocol) error { if err := p.readField1(iprot); err != nil { return err } + case 2: + if err := p.readField2(iprot); err != nil { + return err + } default: if err := iprot.Skip(fieldTypeId); err != nil { return err @@ -3461,6 +3477,26 @@ func (p *MesosContainer) readField1(iprot thrift.TProtocol) error { return nil } +func (p *MesosContainer) readField2(iprot thrift.TProtocol) error { + _, size, err := iprot.ReadListBegin() + if err != nil { + return thrift.PrependError("error reading list begin: ", err) + } + tSlice := make([]*Volume, 0, size) + p.Volumes = tSlice + for i := 0; i < size; i++ { + _elem3 := &Volume{} + if err := _elem3.Read(iprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem3), err) + } + p.Volumes = append(p.Volumes, _elem3) + } + if err := iprot.ReadListEnd(); err != nil { + return thrift.PrependError("error reading list end: ", err) + } + return nil +} + func (p *MesosContainer) Write(oprot thrift.TProtocol) error { if err := oprot.WriteStructBegin("MesosContainer"); err != nil { return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) @@ -3468,6 +3504,9 @@ func (p *MesosContainer) Write(oprot thrift.TProtocol) error { if err := p.writeField1(oprot); err != nil { return err } + if err := p.writeField2(oprot); err != nil { + return err + } if err := oprot.WriteFieldStop(); err != nil { return thrift.PrependError("write field stop error: ", err) } @@ -3492,6 +3531,29 @@ func (p *MesosContainer) writeField1(oprot thrift.TProtocol) (err error) { return err } +func (p *MesosContainer) writeField2(oprot thrift.TProtocol) (err error) { + if p.IsSetVolumes() { + if err := oprot.WriteFieldBegin("volumes", thrift.LIST, 2); err != nil { + return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:volumes: ", p), err) + } + if err := oprot.WriteListBegin(thrift.STRUCT, len(p.Volumes)); err != nil { + return thrift.PrependError("error writing list begin: ", err) + } + for _, v := range p.Volumes { + if err := v.Write(oprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err) + } + } + if err := oprot.WriteListEnd(); err != nil { + return thrift.PrependError("error writing list end: ", err) + } + if err := oprot.WriteFieldEnd(); err != nil { + return thrift.PrependError(fmt.Sprintf("%T write field end error 2:volumes: ", p), err) + } + } + return err +} + func (p *MesosContainer) String() string { if p == nil { return "" @@ -3708,11 +3770,11 @@ func (p *DockerContainer) readField2(iprot thrift.TProtocol) error { tSlice := make([]*DockerParameter, 0, size) p.Parameters = tSlice for i := 0; i < size; i++ { - _elem3 := &DockerParameter{} - if err := _elem3.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem3), err) + _elem4 := &DockerParameter{} + if err := _elem4.Read(iprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem4), err) } - p.Parameters = append(p.Parameters, _elem3) + p.Parameters = append(p.Parameters, _elem4) } if err := iprot.ReadListEnd(); err != nil { return thrift.PrependError("error reading list end: ", err) @@ -4673,11 +4735,11 @@ func (p *TaskConfig) readField32(iprot thrift.TProtocol) error { tSet := make(map[*Resource]bool, size) p.Resources = tSet for i := 0; i < size; i++ { - _elem4 := &Resource{} - if err := _elem4.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem4), err) + _elem5 := &Resource{} + if err := _elem5.Read(iprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem5), err) } - p.Resources[_elem4] = true + p.Resources[_elem5] = true } if err := iprot.ReadSetEnd(); err != nil { return thrift.PrependError("error reading set end: ", err) @@ -4693,11 +4755,11 @@ func (p *TaskConfig) readField20(iprot thrift.TProtocol) error { tSet := make(map[*Constraint]bool, size) p.Constraints = tSet for i := 0; i < size; i++ { - _elem5 := &Constraint{} - if err := _elem5.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem5), err) + _elem6 := &Constraint{} + if err := _elem6.Read(iprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem6), err) } - p.Constraints[_elem5] = true + p.Constraints[_elem6] = true } if err := iprot.ReadSetEnd(); err != nil { return thrift.PrependError("error reading set end: ", err) @@ -4713,13 +4775,13 @@ func (p *TaskConfig) readField21(iprot thrift.TProtocol) error { tSet := make(map[string]bool, size) p.RequestedPorts = tSet for i := 0; i < size; i++ { - var _elem6 string + var _elem7 string if v, err := iprot.ReadString(); err != nil { return thrift.PrependError("error reading field 0: ", err) } else { - _elem6 = v + _elem7 = v } - p.RequestedPorts[_elem6] = true + p.RequestedPorts[_elem7] = true } if err := iprot.ReadSetEnd(); err != nil { return thrift.PrependError("error reading set end: ", err) @@ -4735,11 +4797,11 @@ func (p *TaskConfig) readField33(iprot thrift.TProtocol) error { tSet := make(map[*MesosFetcherURI]bool, size) p.MesosFetcherUris = tSet for i := 0; i < size; i++ { - _elem7 := &MesosFetcherURI{} - if err := _elem7.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem7), err) + _elem8 := &MesosFetcherURI{} + if err := _elem8.Read(iprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem8), err) } - p.MesosFetcherUris[_elem7] = true + p.MesosFetcherUris[_elem8] = true } if err := iprot.ReadSetEnd(); err != nil { return thrift.PrependError("error reading set end: ", err) @@ -4755,19 +4817,19 @@ func (p *TaskConfig) readField22(iprot thrift.TProtocol) error { tMap := make(map[string]string, size) p.TaskLinks = tMap for i := 0; i < size; i++ { - var _key8 string + var _key9 string if v, err := iprot.ReadString(); err != nil { return thrift.PrependError("error reading field 0: ", err) } else { - _key8 = v + _key9 = v } - var _val9 string + var _val10 string if v, err := iprot.ReadString(); err != nil { return thrift.PrependError("error reading field 0: ", err) } else { - _val9 = v + _val10 = v } - p.TaskLinks[_key8] = _val9 + p.TaskLinks[_key9] = _val10 } if err := iprot.ReadMapEnd(); err != nil { return thrift.PrependError("error reading map end: ", err) @@ -4800,11 +4862,11 @@ func (p *TaskConfig) readField27(iprot thrift.TProtocol) error { tSet := make(map[*Metadata]bool, size) p.Metadata = tSet for i := 0; i < size; i++ { - _elem10 := &Metadata{} - if err := _elem10.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem10), err) + _elem11 := &Metadata{} + if err := _elem11.Read(iprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem11), err) } - p.Metadata[_elem10] = true + p.Metadata[_elem11] = true } if err := iprot.ReadSetEnd(); err != nil { return thrift.PrependError("error reading set end: ", err) @@ -5320,11 +5382,11 @@ func (p *ResourceAggregate) readField4(iprot thrift.TProtocol) error { tSet := make(map[*Resource]bool, size) p.Resources = tSet for i := 0; i < size; i++ { - _elem11 := &Resource{} - if err := _elem11.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem11), err) + _elem12 := &Resource{} + if err := _elem12.Read(iprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem12), err) } - p.Resources[_elem11] = true + p.Resources[_elem12] = true } if err := iprot.ReadSetEnd(); err != nil { return thrift.PrependError("error reading set end: ", err) @@ -6325,11 +6387,11 @@ func (p *ConfigGroup) readField3(iprot thrift.TProtocol) error { tSet := make(map[*Range]bool, size) p.Instances = tSet for i := 0; i < size; i++ { - _elem12 := &Range{} - if err := _elem12.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem12), err) + _elem13 := &Range{} + if err := _elem13.Read(iprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem13), err) } - p.Instances[_elem12] = true + p.Instances[_elem13] = true } if err := iprot.ReadSetEnd(); err != nil { return thrift.PrependError("error reading set end: ", err) @@ -6478,11 +6540,11 @@ func (p *ConfigSummary) readField2(iprot thrift.TProtocol) error { tSet := make(map[*ConfigGroup]bool, size) p.Groups = tSet for i := 0; i < size; i++ { - _elem13 := &ConfigGroup{} - if err := _elem13.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem13), err) + _elem14 := &ConfigGroup{} + if err := _elem14.Read(iprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem14), err) } - p.Groups[_elem13] = true + p.Groups[_elem14] = true } if err := iprot.ReadSetEnd(); err != nil { return thrift.PrependError("error reading set end: ", err) @@ -7303,19 +7365,19 @@ func (p *AssignedTask) readField5(iprot thrift.TProtocol) error { tMap := make(map[string]int32, size) p.AssignedPorts = tMap for i := 0; i < size; i++ { - var _key14 string + var _key15 string if v, err := iprot.ReadString(); err != nil { return thrift.PrependError("error reading field 0: ", err) } else { - _key14 = v + _key15 = v } - var _val15 int32 + var _val16 int32 if v, err := iprot.ReadI32(); err != nil { return thrift.PrependError("error reading field 0: ", err) } else { - _val15 = v + _val16 = v } - p.AssignedPorts[_key14] = _val15 + p.AssignedPorts[_key15] = _val16 } if err := iprot.ReadMapEnd(); err != nil { return thrift.PrependError("error reading map end: ", err) @@ -7593,11 +7655,11 @@ func (p *ScheduledTask) readField4(iprot thrift.TProtocol) error { tSlice := make([]*TaskEvent, 0, size) p.TaskEvents = tSlice for i := 0; i < size; i++ { - _elem16 := &TaskEvent{} - if err := _elem16.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem16), err) + _elem17 := &TaskEvent{} + if err := _elem17.Read(iprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem17), err) } - p.TaskEvents = append(p.TaskEvents, _elem16) + p.TaskEvents = append(p.TaskEvents, _elem17) } if err := iprot.ReadListEnd(); err != nil { return thrift.PrependError("error reading list end: ", err) @@ -7776,11 +7838,11 @@ func (p *ScheduleStatusResult_) readField1(iprot thrift.TProtocol) error { tSlice := make([]*ScheduledTask, 0, size) p.Tasks = tSlice for i := 0; i < size; i++ { - _elem17 := &ScheduledTask{} - if err := _elem17.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem17), err) + _elem18 := &ScheduledTask{} + if err := _elem18.Read(iprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem18), err) } - p.Tasks = append(p.Tasks, _elem17) + p.Tasks = append(p.Tasks, _elem18) } if err := iprot.ReadListEnd(); err != nil { return thrift.PrependError("error reading list end: ", err) @@ -7886,11 +7948,11 @@ func (p *GetJobsResult_) readField1(iprot thrift.TProtocol) error { tSet := make(map[*JobConfiguration]bool, size) p.Configs = tSet for i := 0; i < size; i++ { - _elem18 := &JobConfiguration{} - if err := _elem18.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem18), err) + _elem19 := &JobConfiguration{} + if err := _elem19.Read(iprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem19), err) } - p.Configs[_elem18] = true + p.Configs[_elem19] = true } if err := iprot.ReadSetEnd(); err != nil { return thrift.PrependError("error reading set end: ", err) @@ -8120,13 +8182,13 @@ func (p *TaskQuery) readField4(iprot thrift.TProtocol) error { tSet := make(map[string]bool, size) p.TaskIds = tSet for i := 0; i < size; i++ { - var _elem19 string + var _elem20 string if v, err := iprot.ReadString(); err != nil { return thrift.PrependError("error reading field 0: ", err) } else { - _elem19 = v + _elem20 = v } - p.TaskIds[_elem19] = true + p.TaskIds[_elem20] = true } if err := iprot.ReadSetEnd(); err != nil { return thrift.PrependError("error reading set end: ", err) @@ -8142,14 +8204,14 @@ func (p *TaskQuery) readField5(iprot thrift.TProtocol) error { tSet := make(map[ScheduleStatus]bool, size) p.Statuses = tSet for i := 0; i < size; i++ { - var _elem20 ScheduleStatus + var _elem21 ScheduleStatus if v, err := iprot.ReadI32(); err != nil { return thrift.PrependError("error reading field 0: ", err) } else { temp := ScheduleStatus(v) - _elem20 = temp + _elem21 = temp } - p.Statuses[_elem20] = true + p.Statuses[_elem21] = true } if err := iprot.ReadSetEnd(); err != nil { return thrift.PrependError("error reading set end: ", err) @@ -8165,13 +8227,13 @@ func (p *TaskQuery) readField7(iprot thrift.TProtocol) error { tSet := make(map[int32]bool, size) p.InstanceIds = tSet for i := 0; i < size; i++ { - var _elem21 int32 + var _elem22 int32 if v, err := iprot.ReadI32(); err != nil { return thrift.PrependError("error reading field 0: ", err) } else { - _elem21 = v + _elem22 = v } - p.InstanceIds[_elem21] = true + p.InstanceIds[_elem22] = true } if err := iprot.ReadSetEnd(); err != nil { return thrift.PrependError("error reading set end: ", err) @@ -8187,13 +8249,13 @@ func (p *TaskQuery) readField10(iprot thrift.TProtocol) error { tSet := make(map[string]bool, size) p.SlaveHosts = tSet for i := 0; i < size; i++ { - var _elem22 string + var _elem23 string if v, err := iprot.ReadString(); err != nil { return thrift.PrependError("error reading field 0: ", err) } else { - _elem22 = v + _elem23 = v } - p.SlaveHosts[_elem22] = true + p.SlaveHosts[_elem23] = true } if err := iprot.ReadSetEnd(); err != nil { return thrift.PrependError("error reading set end: ", err) @@ -8209,11 +8271,11 @@ func (p *TaskQuery) readField11(iprot thrift.TProtocol) error { tSet := make(map[*JobKey]bool, size) p.JobKeys = tSet for i := 0; i < size; i++ { - _elem23 := &JobKey{} - if err := _elem23.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem23), err) + _elem24 := &JobKey{} + if err := _elem24.Read(iprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem24), err) } - p.JobKeys[_elem23] = true + p.JobKeys[_elem24] = true } if err := iprot.ReadSetEnd(); err != nil { return thrift.PrependError("error reading set end: ", err) @@ -8801,13 +8863,13 @@ func (p *Hosts) readField1(iprot thrift.TProtocol) error { tSet := make(map[string]bool, size) p.HostNames = tSet for i := 0; i < size; i++ { - var _elem24 string + var _elem25 string if v, err := iprot.ReadString(); err != nil { return thrift.PrependError("error reading field 0: ", err) } else { - _elem24 = v + _elem25 = v } - p.HostNames[_elem24] = true + p.HostNames[_elem25] = true } if err := iprot.ReadSetEnd(); err != nil { return thrift.PrependError("error reading set end: ", err) @@ -9306,11 +9368,11 @@ func (p *JobUpdateSettings) readField7(iprot thrift.TProtocol) error { tSet := make(map[*Range]bool, size) p.UpdateOnlyTheseInstances = tSet for i := 0; i < size; i++ { - _elem25 := &Range{} - if err := _elem25.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem25), err) + _elem26 := &Range{} + if err := _elem26.Read(iprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem26), err) } - p.UpdateOnlyTheseInstances[_elem25] = true + p.UpdateOnlyTheseInstances[_elem26] = true } if err := iprot.ReadSetEnd(); err != nil { return thrift.PrependError("error reading set end: ", err) @@ -9963,11 +10025,11 @@ func (p *InstanceTaskConfig) readField2(iprot thrift.TProtocol) error { tSet := make(map[*Range]bool, size) p.Instances = tSet for i := 0; i < size; i++ { - _elem26 := &Range{} - if err := _elem26.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem26), err) + _elem27 := &Range{} + if err := _elem27.Read(iprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem27), err) } - p.Instances[_elem26] = true + p.Instances[_elem27] = true } if err := iprot.ReadSetEnd(); err != nil { return thrift.PrependError("error reading set end: ", err) @@ -10335,11 +10397,11 @@ func (p *JobUpdateSummary) readField6(iprot thrift.TProtocol) error { tSet := make(map[*Metadata]bool, size) p.Metadata = tSet for i := 0; i < size; i++ { - _elem27 := &Metadata{} - if err := _elem27.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem27), err) + _elem28 := &Metadata{} + if err := _elem28.Read(iprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem28), err) } - p.Metadata[_elem27] = true + p.Metadata[_elem28] = true } if err := iprot.ReadSetEnd(); err != nil { return thrift.PrependError("error reading set end: ", err) @@ -10535,11 +10597,11 @@ func (p *JobUpdateInstructions) readField1(iprot thrift.TProtocol) error { tSet := make(map[*InstanceTaskConfig]bool, size) p.InitialState = tSet for i := 0; i < size; i++ { - _elem28 := &InstanceTaskConfig{} - if err := _elem28.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem28), err) + _elem29 := &InstanceTaskConfig{} + if err := _elem29.Read(iprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem29), err) } - p.InitialState[_elem28] = true + p.InitialState[_elem29] = true } if err := iprot.ReadSetEnd(); err != nil { return thrift.PrependError("error reading set end: ", err) @@ -10874,11 +10936,11 @@ func (p *JobUpdateDetails) readField2(iprot thrift.TProtocol) error { tSlice := make([]*JobUpdateEvent, 0, size) p.UpdateEvents = tSlice for i := 0; i < size; i++ { - _elem29 := &JobUpdateEvent{} - if err := _elem29.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem29), err) + _elem30 := &JobUpdateEvent{} + if err := _elem30.Read(iprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem30), err) } - p.UpdateEvents = append(p.UpdateEvents, _elem29) + p.UpdateEvents = append(p.UpdateEvents, _elem30) } if err := iprot.ReadListEnd(); err != nil { return thrift.PrependError("error reading list end: ", err) @@ -10894,11 +10956,11 @@ func (p *JobUpdateDetails) readField3(iprot thrift.TProtocol) error { tSlice := make([]*JobInstanceUpdateEvent, 0, size) p.InstanceEvents = tSlice for i := 0; i < size; i++ { - _elem30 := &JobInstanceUpdateEvent{} - if err := _elem30.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem30), err) + _elem31 := &JobInstanceUpdateEvent{} + if err := _elem31.Read(iprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem31), err) } - p.InstanceEvents = append(p.InstanceEvents, _elem30) + p.InstanceEvents = append(p.InstanceEvents, _elem31) } if err := iprot.ReadListEnd(); err != nil { return thrift.PrependError("error reading list end: ", err) @@ -11125,11 +11187,11 @@ func (p *JobUpdateRequest) readField4(iprot thrift.TProtocol) error { tSet := make(map[*Metadata]bool, size) p.Metadata = tSet for i := 0; i < size; i++ { - _elem31 := &Metadata{} - if err := _elem31.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem31), err) + _elem32 := &Metadata{} + if err := _elem32.Read(iprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem32), err) } - p.Metadata[_elem31] = true + p.Metadata[_elem32] = true } if err := iprot.ReadSetEnd(); err != nil { return thrift.PrependError("error reading set end: ", err) @@ -11425,14 +11487,14 @@ func (p *JobUpdateQuery) readField5(iprot thrift.TProtocol) error { tSet := make(map[JobUpdateStatus]bool, size) p.UpdateStatuses = tSet for i := 0; i < size; i++ { - var _elem32 JobUpdateStatus + var _elem33 JobUpdateStatus if v, err := iprot.ReadI32(); err != nil { return thrift.PrependError("error reading field 0: ", err) } else { temp := JobUpdateStatus(v) - _elem32 = temp + _elem33 = temp } - p.UpdateStatuses[_elem32] = true + p.UpdateStatuses[_elem33] = true } if err := iprot.ReadSetEnd(); err != nil { return thrift.PrependError("error reading set end: ", err) @@ -11662,13 +11724,13 @@ func (p *ListBackupsResult_) readField1(iprot thrift.TProtocol) error { tSet := make(map[string]bool, size) p.Backups = tSet for i := 0; i < size; i++ { - var _elem33 string + var _elem34 string if v, err := iprot.ReadString(); err != nil { return thrift.PrependError("error reading field 0: ", err) } else { - _elem33 = v + _elem34 = v } - p.Backups[_elem33] = true + p.Backups[_elem34] = true } if err := iprot.ReadSetEnd(); err != nil { return thrift.PrependError("error reading set end: ", err) @@ -11774,11 +11836,11 @@ func (p *StartMaintenanceResult_) readField1(iprot thrift.TProtocol) error { tSet := make(map[*HostStatus]bool, size) p.Statuses = tSet for i := 0; i < size; i++ { - _elem34 := &HostStatus{} - if err := _elem34.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem34), err) + _elem35 := &HostStatus{} + if err := _elem35.Read(iprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem35), err) } - p.Statuses[_elem34] = true + p.Statuses[_elem35] = true } if err := iprot.ReadSetEnd(); err != nil { return thrift.PrependError("error reading set end: ", err) @@ -11884,11 +11946,11 @@ func (p *DrainHostsResult_) readField1(iprot thrift.TProtocol) error { tSet := make(map[*HostStatus]bool, size) p.Statuses = tSet for i := 0; i < size; i++ { - _elem35 := &HostStatus{} - if err := _elem35.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem35), err) + _elem36 := &HostStatus{} + if err := _elem36.Read(iprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem36), err) } - p.Statuses[_elem35] = true + p.Statuses[_elem36] = true } if err := iprot.ReadSetEnd(); err != nil { return thrift.PrependError("error reading set end: ", err) @@ -11994,11 +12056,11 @@ func (p *QueryRecoveryResult_) readField1(iprot thrift.TProtocol) error { tSet := make(map[*ScheduledTask]bool, size) p.Tasks = tSet for i := 0; i < size; i++ { - _elem36 := &ScheduledTask{} - if err := _elem36.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem36), err) + _elem37 := &ScheduledTask{} + if err := _elem37.Read(iprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem37), err) } - p.Tasks[_elem36] = true + p.Tasks[_elem37] = true } if err := iprot.ReadSetEnd(); err != nil { return thrift.PrependError("error reading set end: ", err) @@ -12104,11 +12166,11 @@ func (p *MaintenanceStatusResult_) readField1(iprot thrift.TProtocol) error { tSet := make(map[*HostStatus]bool, size) p.Statuses = tSet for i := 0; i < size; i++ { - _elem37 := &HostStatus{} - if err := _elem37.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem37), err) + _elem38 := &HostStatus{} + if err := _elem38.Read(iprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem38), err) } - p.Statuses[_elem37] = true + p.Statuses[_elem38] = true } if err := iprot.ReadSetEnd(); err != nil { return thrift.PrependError("error reading set end: ", err) @@ -12214,11 +12276,11 @@ func (p *EndMaintenanceResult_) readField1(iprot thrift.TProtocol) error { tSet := make(map[*HostStatus]bool, size) p.Statuses = tSet for i := 0; i < size; i++ { - _elem38 := &HostStatus{} - if err := _elem38.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem38), err) + _elem39 := &HostStatus{} + if err := _elem39.Read(iprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem39), err) } - p.Statuses[_elem38] = true + p.Statuses[_elem39] = true } if err := iprot.ReadSetEnd(); err != nil { return thrift.PrependError("error reading set end: ", err) @@ -12324,11 +12386,11 @@ func (p *RoleSummaryResult_) readField1(iprot thrift.TProtocol) error { tSet := make(map[*RoleSummary]bool, size) p.Summaries = tSet for i := 0; i < size; i++ { - _elem39 := &RoleSummary{} - if err := _elem39.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem39), err) + _elem40 := &RoleSummary{} + if err := _elem40.Read(iprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem40), err) } - p.Summaries[_elem39] = true + p.Summaries[_elem40] = true } if err := iprot.ReadSetEnd(); err != nil { return thrift.PrependError("error reading set end: ", err) @@ -12434,11 +12496,11 @@ func (p *JobSummaryResult_) readField1(iprot thrift.TProtocol) error { tSet := make(map[*JobSummary]bool, size) p.Summaries = tSet for i := 0; i < size; i++ { - _elem40 := &JobSummary{} - if err := _elem40.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem40), err) + _elem41 := &JobSummary{} + if err := _elem41.Read(iprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem41), err) } - p.Summaries[_elem40] = true + p.Summaries[_elem41] = true } if err := iprot.ReadSetEnd(); err != nil { return thrift.PrependError("error reading set end: ", err) @@ -12643,11 +12705,11 @@ func (p *GetPendingReasonResult_) readField1(iprot thrift.TProtocol) error { tSet := make(map[*PendingReason]bool, size) p.Reasons = tSet for i := 0; i < size; i++ { - _elem41 := &PendingReason{} - if err := _elem41.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem41), err) + _elem42 := &PendingReason{} + if err := _elem42.Read(iprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem42), err) } - p.Reasons[_elem41] = true + p.Reasons[_elem42] = true } if err := iprot.ReadSetEnd(); err != nil { return thrift.PrependError("error reading set end: ", err) @@ -12901,11 +12963,11 @@ func (p *GetJobUpdateSummariesResult_) readField1(iprot thrift.TProtocol) error tSlice := make([]*JobUpdateSummary, 0, size) p.UpdateSummaries = tSlice for i := 0; i < size; i++ { - _elem42 := &JobUpdateSummary{} - if err := _elem42.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem42), err) + _elem43 := &JobUpdateSummary{} + if err := _elem43.Read(iprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem43), err) } - p.UpdateSummaries = append(p.UpdateSummaries, _elem42) + p.UpdateSummaries = append(p.UpdateSummaries, _elem43) } if err := iprot.ReadListEnd(); err != nil { return thrift.PrependError("error reading list end: ", err) @@ -13040,11 +13102,11 @@ func (p *GetJobUpdateDetailsResult_) readField2(iprot thrift.TProtocol) error { tSlice := make([]*JobUpdateDetails, 0, size) p.DetailsList = tSlice for i := 0; i < size; i++ { - _elem43 := &JobUpdateDetails{} - if err := _elem43.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem43), err) + _elem44 := &JobUpdateDetails{} + if err := _elem44.Read(iprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem44), err) } - p.DetailsList = append(p.DetailsList, _elem43) + p.DetailsList = append(p.DetailsList, _elem44) } if err := iprot.ReadListEnd(); err != nil { return thrift.PrependError("error reading list end: ", err) @@ -13290,11 +13352,11 @@ func (p *GetJobUpdateDiffResult_) readField1(iprot thrift.TProtocol) error { tSet := make(map[*ConfigGroup]bool, size) p.Add = tSet for i := 0; i < size; i++ { - _elem44 := &ConfigGroup{} - if err := _elem44.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem44), err) + _elem45 := &ConfigGroup{} + if err := _elem45.Read(iprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem45), err) } - p.Add[_elem44] = true + p.Add[_elem45] = true } if err := iprot.ReadSetEnd(); err != nil { return thrift.PrependError("error reading set end: ", err) @@ -13310,11 +13372,11 @@ func (p *GetJobUpdateDiffResult_) readField2(iprot thrift.TProtocol) error { tSet := make(map[*ConfigGroup]bool, size) p.Remove = tSet for i := 0; i < size; i++ { - _elem45 := &ConfigGroup{} - if err := _elem45.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem45), err) + _elem46 := &ConfigGroup{} + if err := _elem46.Read(iprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem46), err) } - p.Remove[_elem45] = true + p.Remove[_elem46] = true } if err := iprot.ReadSetEnd(); err != nil { return thrift.PrependError("error reading set end: ", err) @@ -13330,11 +13392,11 @@ func (p *GetJobUpdateDiffResult_) readField3(iprot thrift.TProtocol) error { tSet := make(map[*ConfigGroup]bool, size) p.Update = tSet for i := 0; i < size; i++ { - _elem46 := &ConfigGroup{} - if err := _elem46.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem46), err) + _elem47 := &ConfigGroup{} + if err := _elem47.Read(iprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem47), err) } - p.Update[_elem46] = true + p.Update[_elem47] = true } if err := iprot.ReadSetEnd(); err != nil { return thrift.PrependError("error reading set end: ", err) @@ -13350,11 +13412,11 @@ func (p *GetJobUpdateDiffResult_) readField4(iprot thrift.TProtocol) error { tSet := make(map[*ConfigGroup]bool, size) p.Unchanged = tSet for i := 0; i < size; i++ { - _elem47 := &ConfigGroup{} - if err := _elem47.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem47), err) + _elem48 := &ConfigGroup{} + if err := _elem48.Read(iprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem48), err) } - p.Unchanged[_elem47] = true + p.Unchanged[_elem48] = true } if err := iprot.ReadSetEnd(); err != nil { return thrift.PrependError("error reading set end: ", err) @@ -13553,19 +13615,19 @@ func (p *TierConfig) readField2(iprot thrift.TProtocol) error { tMap := make(map[string]string, size) p.Settings = tMap for i := 0; i < size; i++ { - var _key48 string + var _key49 string if v, err := iprot.ReadString(); err != nil { return thrift.PrependError("error reading field 0: ", err) } else { - _key48 = v + _key49 = v } - var _val49 string + var _val50 string if v, err := iprot.ReadString(); err != nil { return thrift.PrependError("error reading field 0: ", err) } else { - _val49 = v + _val50 = v } - p.Settings[_key48] = _val49 + p.Settings[_key49] = _val50 } if err := iprot.ReadMapEnd(); err != nil { return thrift.PrependError("error reading map end: ", err) @@ -13711,11 +13773,11 @@ func (p *GetTierConfigResult_) readField2(iprot thrift.TProtocol) error { tSet := make(map[*TierConfig]bool, size) p.Tiers = tSet for i := 0; i < size; i++ { - _elem50 := &TierConfig{} - if err := _elem50.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem50), err) + _elem51 := &TierConfig{} + if err := _elem51.Read(iprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem51), err) } - p.Tiers[_elem50] = true + p.Tiers[_elem51] = true } if err := iprot.ReadSetEnd(); err != nil { return thrift.PrependError("error reading set end: ", err) @@ -15162,11 +15224,11 @@ func (p *Response) readField6(iprot thrift.TProtocol) error { tSlice := make([]*ResponseDetail, 0, size) p.Details = tSlice for i := 0; i < size; i++ { - _elem51 := &ResponseDetail{} - if err := _elem51.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem51), err) + _elem52 := &ResponseDetail{} + if err := _elem52.Read(iprot); err != nil { + return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem52), err) } - p.Details = append(p.Details, _elem51) + p.Details = append(p.Details, _elem52) } if err := iprot.ReadListEnd(); err != nil { return thrift.PrependError("error reading list end: ", err) @@ -15268,604 +15330,6 @@ func (p *Response) String() string { return fmt.Sprintf("Response(%+v)", *p) } -// Attributes: -// - InstanceKey: Key for the task to rewrite. -// - OldTask: The original configuration. -// - RewrittenTask: The rewritten configuration. -type InstanceConfigRewrite struct { - InstanceKey *InstanceKey `thrift:"instanceKey,1" json:"instanceKey"` - OldTask *TaskConfig `thrift:"oldTask,2" json:"oldTask"` - RewrittenTask *TaskConfig `thrift:"rewrittenTask,3" json:"rewrittenTask"` -} - -func NewInstanceConfigRewrite() *InstanceConfigRewrite { - return &InstanceConfigRewrite{} -} - -var InstanceConfigRewrite_InstanceKey_DEFAULT *InstanceKey - -func (p *InstanceConfigRewrite) GetInstanceKey() *InstanceKey { - if !p.IsSetInstanceKey() { - return InstanceConfigRewrite_InstanceKey_DEFAULT - } - return p.InstanceKey -} - -var InstanceConfigRewrite_OldTask_DEFAULT *TaskConfig - -func (p *InstanceConfigRewrite) GetOldTask() *TaskConfig { - if !p.IsSetOldTask() { - return InstanceConfigRewrite_OldTask_DEFAULT - } - return p.OldTask -} - -var InstanceConfigRewrite_RewrittenTask_DEFAULT *TaskConfig - -func (p *InstanceConfigRewrite) GetRewrittenTask() *TaskConfig { - if !p.IsSetRewrittenTask() { - return InstanceConfigRewrite_RewrittenTask_DEFAULT - } - return p.RewrittenTask -} -func (p *InstanceConfigRewrite) IsSetInstanceKey() bool { - return p.InstanceKey != nil -} - -func (p *InstanceConfigRewrite) IsSetOldTask() bool { - return p.OldTask != nil -} - -func (p *InstanceConfigRewrite) IsSetRewrittenTask() bool { - return p.RewrittenTask != nil -} - -func (p *InstanceConfigRewrite) Read(iprot thrift.TProtocol) error { - if _, err := iprot.ReadStructBegin(); err != nil { - return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err) - } - - for { - _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin() - if err != nil { - return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err) - } - if fieldTypeId == thrift.STOP { - break - } - switch fieldId { - case 1: - if err := p.readField1(iprot); err != nil { - return err - } - case 2: - if err := p.readField2(iprot); err != nil { - return err - } - case 3: - if err := p.readField3(iprot); err != nil { - return err - } - default: - if err := iprot.Skip(fieldTypeId); err != nil { - return err - } - } - if err := iprot.ReadFieldEnd(); err != nil { - return err - } - } - if err := iprot.ReadStructEnd(); err != nil { - return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) - } - return nil -} - -func (p *InstanceConfigRewrite) readField1(iprot thrift.TProtocol) error { - p.InstanceKey = &InstanceKey{} - if err := p.InstanceKey.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.InstanceKey), err) - } - return nil -} - -func (p *InstanceConfigRewrite) readField2(iprot thrift.TProtocol) error { - p.OldTask = &TaskConfig{} - if err := p.OldTask.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.OldTask), err) - } - return nil -} - -func (p *InstanceConfigRewrite) readField3(iprot thrift.TProtocol) error { - p.RewrittenTask = &TaskConfig{} - if err := p.RewrittenTask.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.RewrittenTask), err) - } - return nil -} - -func (p *InstanceConfigRewrite) Write(oprot thrift.TProtocol) error { - if err := oprot.WriteStructBegin("InstanceConfigRewrite"); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) - } - if err := p.writeField1(oprot); err != nil { - return err - } - if err := p.writeField2(oprot); err != nil { - return err - } - if err := p.writeField3(oprot); err != nil { - return err - } - if err := oprot.WriteFieldStop(); err != nil { - return thrift.PrependError("write field stop error: ", err) - } - if err := oprot.WriteStructEnd(); err != nil { - return thrift.PrependError("write struct stop error: ", err) - } - return nil -} - -func (p *InstanceConfigRewrite) writeField1(oprot thrift.TProtocol) (err error) { - if err := oprot.WriteFieldBegin("instanceKey", thrift.STRUCT, 1); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:instanceKey: ", p), err) - } - if err := p.InstanceKey.Write(oprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.InstanceKey), err) - } - if err := oprot.WriteFieldEnd(); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write field end error 1:instanceKey: ", p), err) - } - return err -} - -func (p *InstanceConfigRewrite) writeField2(oprot thrift.TProtocol) (err error) { - if err := oprot.WriteFieldBegin("oldTask", thrift.STRUCT, 2); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:oldTask: ", p), err) - } - if err := p.OldTask.Write(oprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.OldTask), err) - } - if err := oprot.WriteFieldEnd(); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write field end error 2:oldTask: ", p), err) - } - return err -} - -func (p *InstanceConfigRewrite) writeField3(oprot thrift.TProtocol) (err error) { - if err := oprot.WriteFieldBegin("rewrittenTask", thrift.STRUCT, 3); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write field begin error 3:rewrittenTask: ", p), err) - } - if err := p.RewrittenTask.Write(oprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.RewrittenTask), err) - } - if err := oprot.WriteFieldEnd(); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write field end error 3:rewrittenTask: ", p), err) - } - return err -} - -func (p *InstanceConfigRewrite) String() string { - if p == nil { - return "" - } - return fmt.Sprintf("InstanceConfigRewrite(%+v)", *p) -} - -// Attributes: -// - OldJob: The original job configuration. -// - RewrittenJob: The rewritten job configuration. -type JobConfigRewrite struct { - OldJob *JobConfiguration `thrift:"oldJob,1" json:"oldJob"` - RewrittenJob *JobConfiguration `thrift:"rewrittenJob,2" json:"rewrittenJob"` -} - -func NewJobConfigRewrite() *JobConfigRewrite { - return &JobConfigRewrite{} -} - -var JobConfigRewrite_OldJob_DEFAULT *JobConfiguration - -func (p *JobConfigRewrite) GetOldJob() *JobConfiguration { - if !p.IsSetOldJob() { - return JobConfigRewrite_OldJob_DEFAULT - } - return p.OldJob -} - -var JobConfigRewrite_RewrittenJob_DEFAULT *JobConfiguration - -func (p *JobConfigRewrite) GetRewrittenJob() *JobConfiguration { - if !p.IsSetRewrittenJob() { - return JobConfigRewrite_RewrittenJob_DEFAULT - } - return p.RewrittenJob -} -func (p *JobConfigRewrite) IsSetOldJob() bool { - return p.OldJob != nil -} - -func (p *JobConfigRewrite) IsSetRewrittenJob() bool { - return p.RewrittenJob != nil -} - -func (p *JobConfigRewrite) Read(iprot thrift.TProtocol) error { - if _, err := iprot.ReadStructBegin(); err != nil { - return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err) - } - - for { - _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin() - if err != nil { - return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err) - } - if fieldTypeId == thrift.STOP { - break - } - switch fieldId { - case 1: - if err := p.readField1(iprot); err != nil { - return err - } - case 2: - if err := p.readField2(iprot); err != nil { - return err - } - default: - if err := iprot.Skip(fieldTypeId); err != nil { - return err - } - } - if err := iprot.ReadFieldEnd(); err != nil { - return err - } - } - if err := iprot.ReadStructEnd(); err != nil { - return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) - } - return nil -} - -func (p *JobConfigRewrite) readField1(iprot thrift.TProtocol) error { - p.OldJob = &JobConfiguration{} - if err := p.OldJob.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.OldJob), err) - } - return nil -} - -func (p *JobConfigRewrite) readField2(iprot thrift.TProtocol) error { - p.RewrittenJob = &JobConfiguration{} - if err := p.RewrittenJob.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.RewrittenJob), err) - } - return nil -} - -func (p *JobConfigRewrite) Write(oprot thrift.TProtocol) error { - if err := oprot.WriteStructBegin("JobConfigRewrite"); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) - } - if err := p.writeField1(oprot); err != nil { - return err - } - if err := p.writeField2(oprot); err != nil { - return err - } - if err := oprot.WriteFieldStop(); err != nil { - return thrift.PrependError("write field stop error: ", err) - } - if err := oprot.WriteStructEnd(); err != nil { - return thrift.PrependError("write struct stop error: ", err) - } - return nil -} - -func (p *JobConfigRewrite) writeField1(oprot thrift.TProtocol) (err error) { - if err := oprot.WriteFieldBegin("oldJob", thrift.STRUCT, 1); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:oldJob: ", p), err) - } - if err := p.OldJob.Write(oprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.OldJob), err) - } - if err := oprot.WriteFieldEnd(); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write field end error 1:oldJob: ", p), err) - } - return err -} - -func (p *JobConfigRewrite) writeField2(oprot thrift.TProtocol) (err error) { - if err := oprot.WriteFieldBegin("rewrittenJob", thrift.STRUCT, 2); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:rewrittenJob: ", p), err) - } - if err := p.RewrittenJob.Write(oprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.RewrittenJob), err) - } - if err := oprot.WriteFieldEnd(); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write field end error 2:rewrittenJob: ", p), err) - } - return err -} - -func (p *JobConfigRewrite) String() string { - if p == nil { - return "" - } - return fmt.Sprintf("JobConfigRewrite(%+v)", *p) -} - -// Attributes: -// - JobRewrite -// - InstanceRewrite -type ConfigRewrite struct { - JobRewrite *JobConfigRewrite `thrift:"jobRewrite,1" json:"jobRewrite,omitempty"` - InstanceRewrite *InstanceConfigRewrite `thrift:"instanceRewrite,2" json:"instanceRewrite,omitempty"` -} - -func NewConfigRewrite() *ConfigRewrite { - return &ConfigRewrite{} -} - -var ConfigRewrite_JobRewrite_DEFAULT *JobConfigRewrite - -func (p *ConfigRewrite) GetJobRewrite() *JobConfigRewrite { - if !p.IsSetJobRewrite() { - return ConfigRewrite_JobRewrite_DEFAULT - } - return p.JobRewrite -} - -var ConfigRewrite_InstanceRewrite_DEFAULT *InstanceConfigRewrite - -func (p *ConfigRewrite) GetInstanceRewrite() *InstanceConfigRewrite { - if !p.IsSetInstanceRewrite() { - return ConfigRewrite_InstanceRewrite_DEFAULT - } - return p.InstanceRewrite -} -func (p *ConfigRewrite) CountSetFieldsConfigRewrite() int { - count := 0 - if p.IsSetJobRewrite() { - count++ - } - if p.IsSetInstanceRewrite() { - count++ - } - return count - -} - -func (p *ConfigRewrite) IsSetJobRewrite() bool { - return p.JobRewrite != nil -} - -func (p *ConfigRewrite) IsSetInstanceRewrite() bool { - return p.InstanceRewrite != nil -} - -func (p *ConfigRewrite) Read(iprot thrift.TProtocol) error { - if _, err := iprot.ReadStructBegin(); err != nil { - return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err) - } - - for { - _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin() - if err != nil { - return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err) - } - if fieldTypeId == thrift.STOP { - break - } - switch fieldId { - case 1: - if err := p.readField1(iprot); err != nil { - return err - } - case 2: - if err := p.readField2(iprot); err != nil { - return err - } - default: - if err := iprot.Skip(fieldTypeId); err != nil { - return err - } - } - if err := iprot.ReadFieldEnd(); err != nil { - return err - } - } - if err := iprot.ReadStructEnd(); err != nil { - return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) - } - return nil -} - -func (p *ConfigRewrite) readField1(iprot thrift.TProtocol) error { - p.JobRewrite = &JobConfigRewrite{} - if err := p.JobRewrite.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.JobRewrite), err) - } - return nil -} - -func (p *ConfigRewrite) readField2(iprot thrift.TProtocol) error { - p.InstanceRewrite = &InstanceConfigRewrite{} - if err := p.InstanceRewrite.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", p.InstanceRewrite), err) - } - return nil -} - -func (p *ConfigRewrite) Write(oprot thrift.TProtocol) error { - if c := p.CountSetFieldsConfigRewrite(); c != 1 { - return fmt.Errorf("%T write union: exactly one field must be set (%d set).", p, c) - } - if err := oprot.WriteStructBegin("ConfigRewrite"); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) - } - if err := p.writeField1(oprot); err != nil { - return err - } - if err := p.writeField2(oprot); err != nil { - return err - } - if err := oprot.WriteFieldStop(); err != nil { - return thrift.PrependError("write field stop error: ", err) - } - if err := oprot.WriteStructEnd(); err != nil { - return thrift.PrependError("write struct stop error: ", err) - } - return nil -} - -func (p *ConfigRewrite) writeField1(oprot thrift.TProtocol) (err error) { - if p.IsSetJobRewrite() { - if err := oprot.WriteFieldBegin("jobRewrite", thrift.STRUCT, 1); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:jobRewrite: ", p), err) - } - if err := p.JobRewrite.Write(oprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.JobRewrite), err) - } - if err := oprot.WriteFieldEnd(); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write field end error 1:jobRewrite: ", p), err) - } - } - return err -} - -func (p *ConfigRewrite) writeField2(oprot thrift.TProtocol) (err error) { - if p.IsSetInstanceRewrite() { - if err := oprot.WriteFieldBegin("instanceRewrite", thrift.STRUCT, 2); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write field begin error 2:instanceRewrite: ", p), err) - } - if err := p.InstanceRewrite.Write(oprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", p.InstanceRewrite), err) - } - if err := oprot.WriteFieldEnd(); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write field end error 2:instanceRewrite: ", p), err) - } - } - return err -} - -func (p *ConfigRewrite) String() string { - if p == nil { - return "" - } - return fmt.Sprintf("ConfigRewrite(%+v)", *p) -} - -// Attributes: -// - RewriteCommands -type RewriteConfigsRequest struct { - RewriteCommands []*ConfigRewrite `thrift:"rewriteCommands,1" json:"rewriteCommands"` -} - -func NewRewriteConfigsRequest() *RewriteConfigsRequest { - return &RewriteConfigsRequest{} -} - -func (p *RewriteConfigsRequest) GetRewriteCommands() []*ConfigRewrite { - return p.RewriteCommands -} -func (p *RewriteConfigsRequest) Read(iprot thrift.TProtocol) error { - if _, err := iprot.ReadStructBegin(); err != nil { - return thrift.PrependError(fmt.Sprintf("%T read error: ", p), err) - } - - for { - _, fieldTypeId, fieldId, err := iprot.ReadFieldBegin() - if err != nil { - return thrift.PrependError(fmt.Sprintf("%T field %d read error: ", p, fieldId), err) - } - if fieldTypeId == thrift.STOP { - break - } - switch fieldId { - case 1: - if err := p.readField1(iprot); err != nil { - return err - } - default: - if err := iprot.Skip(fieldTypeId); err != nil { - return err - } - } - if err := iprot.ReadFieldEnd(); err != nil { - return err - } - } - if err := iprot.ReadStructEnd(); err != nil { - return thrift.PrependError(fmt.Sprintf("%T read struct end error: ", p), err) - } - return nil -} - -func (p *RewriteConfigsRequest) readField1(iprot thrift.TProtocol) error { - _, size, err := iprot.ReadListBegin() - if err != nil { - return thrift.PrependError("error reading list begin: ", err) - } - tSlice := make([]*ConfigRewrite, 0, size) - p.RewriteCommands = tSlice - for i := 0; i < size; i++ { - _elem52 := &ConfigRewrite{} - if err := _elem52.Read(iprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error reading struct: ", _elem52), err) - } - p.RewriteCommands = append(p.RewriteCommands, _elem52) - } - if err := iprot.ReadListEnd(); err != nil { - return thrift.PrependError("error reading list end: ", err) - } - return nil -} - -func (p *RewriteConfigsRequest) Write(oprot thrift.TProtocol) error { - if err := oprot.WriteStructBegin("RewriteConfigsRequest"); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write struct begin error: ", p), err) - } - if err := p.writeField1(oprot); err != nil { - return err - } - if err := oprot.WriteFieldStop(); err != nil { - return thrift.PrependError("write field stop error: ", err) - } - if err := oprot.WriteStructEnd(); err != nil { - return thrift.PrependError("write struct stop error: ", err) - } - return nil -} - -func (p *RewriteConfigsRequest) writeField1(oprot thrift.TProtocol) (err error) { - if err := oprot.WriteFieldBegin("rewriteCommands", thrift.LIST, 1); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write field begin error 1:rewriteCommands: ", p), err) - } - if err := oprot.WriteListBegin(thrift.STRUCT, len(p.RewriteCommands)); err != nil { - return thrift.PrependError("error writing list begin: ", err) - } - for _, v := range p.RewriteCommands { - if err := v.Write(oprot); err != nil { - return thrift.PrependError(fmt.Sprintf("%T error writing struct: ", v), err) - } - } - if err := oprot.WriteListEnd(); err != nil { - return thrift.PrependError("error writing list end: ", err) - } - if err := oprot.WriteFieldEnd(); err != nil { - return thrift.PrependError(fmt.Sprintf("%T write field end error 1:rewriteCommands: ", p), err) - } - return err -} - -func (p *RewriteConfigsRequest) String() string { - if p == nil { - return "" - } - return fmt.Sprintf("RewriteConfigsRequest(%+v)", *p) -} - // Attributes: // - BatchSize type ExplicitReconciliationSettings struct { diff --git a/realis.go b/realis.go index d9177b6..5bf4436 100644 --- a/realis.go +++ b/realis.go @@ -267,7 +267,7 @@ func NewRealisClient(options ...ClientOption) (Realis, error) { config.protoFactory = thrift.NewTBinaryProtocolFactoryDefault() } - config.logger.Printf("gorealis config url: %+v\n", config.url) + config.logger.Printf("gorealis config url: %+v\n", url) //Basic Authentication. if config.username != "" && config.password != "" { @@ -579,7 +579,7 @@ func (r *realisClient) KillInstances(key *aurora.JobKey, instances ...int32) (*a retryErr := ExponentialBackoff(*r.config.backoff, func() (bool, error) { resp, clientErr = CheckAndRetryConn(r, func() (*aurora.Response, error) { - return r.client.KillTasks(key, instanceIds) + return r.client.KillTasks(key, instanceIds, "") }) if clientErr != nil && clientErr.Error() == RetryConnErr.Error() { return false, nil @@ -614,7 +614,7 @@ func (r *realisClient) KillJob(key *aurora.JobKey) (*aurora.Response, error) { if len(instanceIds) > 0 { retryErr := ExponentialBackoff(*r.config.backoff, func() (bool, error) { resp, clientErr = CheckAndRetryConn(r, func() (*aurora.Response, error) { - return r.client.KillTasks(key, instanceIds) + return r.client.KillTasks(key, instanceIds, "") }) if clientErr != nil && clientErr.Error() == RetryConnErr.Error() { return false, nil