Skip to content

Add retries for webhook fails at conformance tests #4045

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
knative-prow-robot merged 3 commits into from
Sep 15, 2020
Merged

Add retries for webhook fails at conformance tests #4045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4bf6b92
Add retries for webhook fails at conformance tests
aliok Sep 14, 2020
f9f5e63
Add retries for webhook fails at conformance tests
aliok Sep 14, 2020
2a01787
Add retries for webhook fails at conformance tests
aliok Sep 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions test/conformance/helpers/broker_control_plane_test_helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,17 @@ func triggerV1Beta1ReadyAfterBrokerIncludesSubURI(t *testing.T, triggerName, bro

client.WaitForResourceReadyOrFail(triggerName, testlib.TriggerTypeMeta)

tr, err := client.Eventing.EventingV1beta1().Triggers(client.Namespace).Get(context.Background(), triggerName, metav1.GetOptions{})
var tr *eventingv1beta1.Trigger
triggers := client.Eventing.EventingV1beta1().Triggers(client.Namespace)
err = client.RetryWebhookErrors(func(attempts int) (err error) {
var e error
client.T.Logf("Getting v1beta1 trigger %s", triggerName)
tr, e = triggers.Get(context.Background(), triggerName, metav1.GetOptions{})
if e != nil {
client.T.Logf("Failed to get trigger %q: %v", triggerName, e)
}
return err
})
if err != nil {
Copy link
Copy Markdown
Member

@pierDipi pierDipi Sep 14, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After retrying we sometimes got an already exists error, can you add a check for that?

eventing/test/lib/creation.go

Lines 81 to 92 in c5fabfd

var gvr schema.GroupVersionResource
err := c.RetryWebhookErrors(func(attempts int) (err error) {
var e error
gvr, e = duck.CreateGenericChannelObject(c.Dynamic, metaResource)
if e != nil {
c.T.Logf("Failed to create %q %q: %v", channelTypeMeta.Kind, name, e)
}
return e
})
if err != nil && !errors.IsAlreadyExists(err) {
c.T.Fatalf("Failed to create %q %q: %v", channelTypeMeta.Kind, name, err)
}

Suggested change
if err != nil {
if err != nil && !apierrors.IsAlreadyExists(err) {

The same applies for the others below.

Copy link
Copy Markdown
Member Author

@aliok aliok Sep 15, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I only added retries for GET operations and I don't think we would get that error in this case.

And, all the other operations already have retries.

Let me know what you think @pierDipi

Copy link
Copy Markdown
Member

@pierDipi pierDipi Sep 15, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It sounds good, thanks!
/lgtm

t.Fatalf("Error: Could not get trigger %s: %v", triggerName, err)
}
Expand All @@ -147,7 +157,17 @@ func triggerV1Beta1ReadyAfterBrokerIncludesSubURI(t *testing.T, triggerName, bro

func triggerV1Beta1ReadyIncludesSubURI(t *testing.T, triggerName string, client *testlib.Client) {
client.WaitForResourceReadyOrFail(triggerName, testlib.TriggerTypeMeta)
tr, err := client.Eventing.EventingV1beta1().Triggers(client.Namespace).Get(context.Background(), triggerName, metav1.GetOptions{})
var tr *eventingv1beta1.Trigger
triggers := client.Eventing.EventingV1beta1().Triggers(client.Namespace)
err := client.RetryWebhookErrors(func(attempts int) (err error) {
var e error
client.T.Logf("Getting v1beta1 trigger %s", triggerName)
tr, e = triggers.Get(context.Background(), triggerName, metav1.GetOptions{})
if e != nil {
client.T.Logf("Failed to get trigger %q: %v", triggerName, e)
}
return err
})
if err != nil {
t.Fatalf("Error: Could not get trigger %s: %v", triggerName, err)
}
Expand Down
13 changes: 11 additions & 2 deletions test/conformance/helpers/broker_data_plane_test_helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ var podMeta = metav1.TypeMeta{

func BrokerDataPlaneSetupHelper(ctx context.Context, client *testlib.Client, brokerClass string, brokerTestRunner testlib.ComponentsTestRunner) *eventingv1beta1.Broker {
var broker *eventingv1beta1.Broker
var err error
brokerName := brokerTestRunner.ComponentName
brokerNamespace := brokerTestRunner.ComponentNamespace
if brokerName == "" || brokerNamespace == "" {
Expand All @@ -54,7 +53,17 @@ func BrokerDataPlaneSetupHelper(ctx context.Context, client *testlib.Client, bro
)
client.WaitForResourceReadyOrFail(broker.Name, testlib.BrokerTypeMeta)
} else {
if broker, err = client.Eventing.EventingV1beta1().Brokers(brokerNamespace).Get(ctx, brokerName, metav1.GetOptions{}); err != nil {
brokers := client.Eventing.EventingV1beta1().Brokers(brokerNamespace)
err := client.RetryWebhookErrors(func(attempts int) (err error) {
var e error
client.T.Logf("Getting v1beta1 broker %s", brokerName)
broker, e = brokers.Get(context.Background(), brokerName, metav1.GetOptions{})
if e != nil {
client.T.Logf("Failed to get broker %q: %v", brokerName, e)
}
return err
})
if err != nil {
client.T.Fatalf("Could not Get broker %s/%s: %v", brokerNamespace, brokerName, err)
}
}
Expand Down