This repository has been archived by the owner on Jun 19, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 74
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Backport eventing 4475 in release 0.18 (#1890)
- Loading branch information
1 parent
67cca39
commit c97979d
Showing
7 changed files
with
134 additions
and
56 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 4 additions & 4 deletions
8
vendor/knative.dev/eventing/pkg/client/injection/reconciler/eventing/v1/broker/reconciler.go
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
8 changes: 4 additions & 4 deletions
8
...native.dev/eventing/pkg/client/injection/reconciler/eventing/v1beta1/broker/reconciler.go
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
106 changes: 106 additions & 0 deletions
106
vendor/knative.dev/eventing/pkg/kncloudevents/http_client.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| /* | ||
| Copyright 2020 The Knative Authors | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package kncloudevents | ||
|
|
||
| import ( | ||
| nethttp "net/http" | ||
| "sync" | ||
| "time" | ||
|
|
||
| "go.opencensus.io/plugin/ochttp" | ||
| "knative.dev/pkg/tracing/propagation/tracecontextb3" | ||
| ) | ||
|
|
||
| const ( | ||
| defaultRetryWaitMin = 1 * time.Second | ||
| defaultRetryWaitMax = 30 * time.Second | ||
| ) | ||
|
|
||
| type holder struct { | ||
| clientMutex sync.Mutex | ||
| connectionArgs *ConnectionArgs | ||
| client **nethttp.Client | ||
| } | ||
|
|
||
| var clientHolder = holder{} | ||
|
|
||
| // The used HTTP client is a singleton, so the same http client is reused across all the application. | ||
| // If connection args is modified, client is cleaned and a new one is created. | ||
| func getClient() *nethttp.Client { | ||
| clientHolder.clientMutex.Lock() | ||
| defer clientHolder.clientMutex.Unlock() | ||
|
|
||
| if clientHolder.client == nil { | ||
| // Add connection options to the default transport. | ||
| var base = nethttp.DefaultTransport.(*nethttp.Transport).Clone() | ||
| clientHolder.connectionArgs.configureTransport(base) | ||
| c := &nethttp.Client{ | ||
| // Add output tracing. | ||
| Transport: &ochttp.Transport{ | ||
| Base: base, | ||
| Propagation: tracecontextb3.TraceContextEgress, | ||
| }, | ||
| } | ||
| clientHolder.client = &c | ||
| } | ||
|
|
||
| return *clientHolder.client | ||
| } | ||
|
|
||
| // ConfigureConnectionArgs configures the new connection args. | ||
| // The existing client won't be affected, but a new one will be created. | ||
| // Use sparingly, because it might lead to creating a lot of clients, none of them sharing their connection pool! | ||
| func ConfigureConnectionArgs(ca *ConnectionArgs) { | ||
| clientHolder.clientMutex.Lock() | ||
| defer clientHolder.clientMutex.Unlock() | ||
|
|
||
| // Check if same config | ||
| if clientHolder.connectionArgs != nil && | ||
| ca != nil && | ||
| ca.MaxIdleConns == clientHolder.connectionArgs.MaxIdleConns && | ||
| ca.MaxIdleConnsPerHost == clientHolder.connectionArgs.MaxIdleConnsPerHost { | ||
| return | ||
| } | ||
|
|
||
| if clientHolder.client != nil { | ||
| // Let's try to clean up a bit the existing client | ||
| // Note: this won't remove it nor close it | ||
| (*clientHolder.client).CloseIdleConnections() | ||
|
|
||
| // Setting client to nil | ||
| clientHolder.client = nil | ||
| } | ||
|
|
||
| clientHolder.connectionArgs = ca | ||
| } | ||
|
|
||
| // ConnectionArgs allow to configure connection parameters to the underlying | ||
| // HTTP Client transport. | ||
| type ConnectionArgs struct { | ||
| // MaxIdleConns refers to the max idle connections, as in net/http/transport. | ||
| MaxIdleConns int | ||
| // MaxIdleConnsPerHost refers to the max idle connections per host, as in net/http/transport. | ||
| MaxIdleConnsPerHost int | ||
| } | ||
|
|
||
| func (ca *ConnectionArgs) configureTransport(transport *nethttp.Transport) { | ||
| if ca == nil { | ||
| return | ||
| } | ||
| transport.MaxIdleConns = ca.MaxIdleConns | ||
| transport.MaxIdleConnsPerHost = ca.MaxIdleConnsPerHost | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters