This is an automated email from the ASF dual-hosted git repository.
ccondit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/yunikorn-core.git
The following commit(s) were added to refs/heads/master by this push:
new 9dd3df7d [YUNIKORN-1979] Correct misspelled ApplicationID field (#648)
9dd3df7d is described below
commit 9dd3df7dadb29a19de0d5f5971137df8fa674ea5
Author: Craig Condit <[email protected]>
AuthorDate: Thu Sep 14 10:05:17 2023 -0500
[YUNIKORN-1979] Correct misspelled ApplicationID field (#648)
Closes: #648
---
go.mod | 14 +++++++-------
go.sum | 14 +++++++-------
pkg/scheduler/scheduler.go | 8 ++++----
pkg/scheduler/tests/plugin_test.go | 2 +-
4 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/go.mod b/go.mod
index d0d9feb4..b74bf299 100644
--- a/go.mod
+++ b/go.mod
@@ -22,7 +22,7 @@ module github.com/apache/yunikorn-core
go 1.20
require (
- github.com/apache/yunikorn-scheduler-interface
v0.0.0-20230831133811-e7622cf54e95
+ github.com/apache/yunikorn-scheduler-interface
v0.0.0-20230914150238-ff06224fc98d
github.com/google/btree v1.1.2
github.com/google/go-cmp v0.5.9
github.com/google/uuid v1.3.0
@@ -35,7 +35,7 @@ require (
github.com/uber/jaeger-client-go v2.25.0+incompatible
github.com/uber/jaeger-lib v2.4.0+incompatible
go.uber.org/zap v1.24.0
- golang.org/x/net v0.14.0
+ golang.org/x/net v0.15.0
google.golang.org/grpc v1.56.0
gopkg.in/yaml.v3 v3.0.1
gotest.tools/v3 v3.0.3
@@ -52,18 +52,18 @@ require (
github.com/prometheus/procfs v0.8.0 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
- golang.org/x/sys v0.11.0 // indirect
- golang.org/x/text v0.12.0 // indirect
+ golang.org/x/sys v0.12.0 // indirect
+ golang.org/x/text v0.13.0 // indirect
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 //
indirect
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
)
replace (
- golang.org/x/crypto => golang.org/x/crypto v0.12.0
+ golang.org/x/crypto => golang.org/x/crypto v0.13.0
golang.org/x/lint => golang.org/x/lint
v0.0.0-20210508222113-6edffad5e616
- golang.org/x/net => golang.org/x/net v0.14.0
+ golang.org/x/net => golang.org/x/net v0.15.0
golang.org/x/sys => golang.org/x/sys v0.12.0
golang.org/x/text => golang.org/x/text v0.13.0
- golang.org/x/tools => golang.org/x/tools v0.12.0
+ golang.org/x/tools => golang.org/x/tools v0.13.0
)
diff --git a/go.sum b/go.sum
index cbc67be7..5c820947 100644
--- a/go.sum
+++ b/go.sum
@@ -40,8 +40,8 @@ github.com/alecthomas/template
v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod
h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod
h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod
h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
-github.com/apache/yunikorn-scheduler-interface
v0.0.0-20230831133811-e7622cf54e95
h1:ssLPAWkGdrBJwfPEPiv0np99IgynCmmR402TM0FxgPg=
-github.com/apache/yunikorn-scheduler-interface
v0.0.0-20230831133811-e7622cf54e95/go.mod
h1:/n67iTTOytyVor6wETVjleqzsp/NxCUmPslHcTvJ+Nw=
+github.com/apache/yunikorn-scheduler-interface
v0.0.0-20230914150238-ff06224fc98d
h1:yf+zASomlYmZok2p5syO4kQOrM88hDgzNLUMi4tgJuU=
+github.com/apache/yunikorn-scheduler-interface
v0.0.0-20230914150238-ff06224fc98d/go.mod
h1:xhVO5T9chrzf7pLDRZJ9UZI+9/denP+VbLzKAbpcwMg=
github.com/benbjohnson/clock v1.1.0
h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod
h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
github.com/beorn7/perks v1.0.0/go.mod
h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
@@ -237,7 +237,7 @@ go.uber.org/multierr v1.6.0
h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
go.uber.org/multierr v1.6.0/go.mod
h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
-golang.org/x/crypto v0.12.0/go.mod
h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw=
+golang.org/x/crypto v0.13.0/go.mod
h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod
h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod
h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod
h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -261,8 +261,8 @@ golang.org/x/mod v0.2.0/go.mod
h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14=
-golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
+golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8=
+golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod
h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod
h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod
h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -282,13 +282,13 @@ golang.org/x/sync
v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJ
golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.11.0/go.mod
h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU=
+golang.org/x/term v0.12.0/go.mod
h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
golang.org/x/text v0.13.0/go.mod
h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod
h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod
h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod
h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/tools v0.12.0/go.mod
h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM=
+golang.org/x/tools v0.13.0/go.mod
h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod
h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod
h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod
h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/pkg/scheduler/scheduler.go b/pkg/scheduler/scheduler.go
index 9f2cf782..fc7737ad 100644
--- a/pkg/scheduler/scheduler.go
+++ b/pkg/scheduler/scheduler.go
@@ -167,10 +167,10 @@ func (s *Scheduler) inspectOutstandingRequests() {
// they can fit into the max head room, but
they are pending because lack of partition resources
if updater :=
plugins.GetResourceManagerCallbackPlugin(); updater != nil {
updater.UpdateContainerSchedulingState(&si.UpdateContainerSchedulingStateRequest{
- ApplicartionID:
ask.GetApplicationID(),
- AllocationKey:
ask.GetAllocationKey(),
- State:
si.UpdateContainerSchedulingStateRequest_FAILED,
- Reason: "request is
waiting for cluster resources become available",
+ ApplicationID:
ask.GetApplicationID(),
+ AllocationKey:
ask.GetAllocationKey(),
+ State:
si.UpdateContainerSchedulingStateRequest_FAILED,
+ Reason: "request is
waiting for cluster resources become available",
})
}
}
diff --git a/pkg/scheduler/tests/plugin_test.go
b/pkg/scheduler/tests/plugin_test.go
index 5ee616c8..3b9f5de6 100644
--- a/pkg/scheduler/tests/plugin_test.go
+++ b/pkg/scheduler/tests/plugin_test.go
@@ -150,7 +150,7 @@ partitions:
err = common.WaitFor(100*time.Millisecond, 3000*time.Millisecond,
func() bool {
reqSent := fk.getContainerUpdateRequest()
- return reqSent != nil && reqSent.ApplicartionID == appID1 &&
+ return reqSent != nil && reqSent.ApplicationID == appID1 &&
reqSent.GetState() ==
si.UpdateContainerSchedulingStateRequest_FAILED
})
assert.NilError(t, err)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
