Skip to content
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.

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

Add configuration to support broker SSL #493

Merged
merged 7 commits into from
Aug 6, 2015
Merged

Conversation

uovobw
Copy link
Contributor

@uovobw uovobw commented Jul 23, 2015

as mentioned in #154 this has been rebased on current master and can be merged

eapache and others added 2 commits March 23, 2015 13:17
Possibly implements IBM#154, if my assumptions about the implementation are
correct.
Conflicts:
	broker.go
	config.go
@uovobw uovobw mentioned this pull request Jul 23, 2015
dialer := net.Dialer{
Timeout: conf.Net.DialTimeout,
KeepAlive: conf.Net.KeepAlive,
dialer := &net.Dialer{
Copy link
Contributor

Choose a reason for hiding this comment

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

this struct should not have changed at all

Copy link
Contributor Author

Choose a reason for hiding this comment

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

not sure why it did in the first place, changed it back to have the keepalive and use the reference to it in the tls.DialWithDialer call

@wvanbergen
Copy link
Contributor

We don't really have the guarantee that SSL will work with this once it lands in Kafka proper. I am OK with merging this, with the caveat that once proper SSL support lands in Kafka, and for some reason it doesn't work with this code, we will not maintain backwards compatibility for this code.

@eapache
Copy link
Contributor

eapache commented Jul 27, 2015

we will not maintain backwards compatibility for this code.

Good point, a comment to that effect on the config values is definitely needed.

@uovobw
Copy link
Contributor Author

uovobw commented Jul 28, 2015

i am busy with other pieces of the infra at the moment but i still intend to complete - or at least contribute to - this. i will address the various notes but please note that i did only rebase the old branch for the previous pull request to current master and opened the review .

@eapache
Copy link
Contributor

eapache commented Jul 28, 2015

Most of the comments are re. changes to the example program, not the original rebased code. To keep it simple I've updated #156 appropriately and will merge that if it looks good. You are welcome to resubmit the example changes if you wish.

@uovobw
Copy link
Contributor Author

uovobw commented Aug 5, 2015

merged from master and addressed your comments, thanks again

@eapache
Copy link
Contributor

eapache commented Aug 5, 2015

Looks mostly OK to me. @wvanbergen? You wrote the http server example.

We'll have to re-add a comment re. compatibility guarantees but I think that can be done post-merge? Or would it be better to merge #156 and then rebase this to pull the http server changes in separately?

@@ -164,6 +195,11 @@ func newDataCollector(brokerList []string) sarama.SyncProducer {
config := sarama.NewConfig()
config.Producer.RequiredAcks = sarama.WaitForAll // Wait for all in-sync replicas to ack the message
config.Producer.Retry.Max = 10 // Retry up to 10 times to produce the message
tls_config := createTlsConfiguration()
Copy link
Contributor

Choose a reason for hiding this comment

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

Naming nitpick: tlsConfig

@wvanbergen
Copy link
Contributor

Couple of comments, mostly looks good 👍

Add flag for insecureNoVerify for the TLS config
@uovobw
Copy link
Contributor Author

uovobw commented Aug 5, 2015

@wvanbergen addressed your comments

@uovobw
Copy link
Contributor Author

uovobw commented Aug 5, 2015

that is strange, we have failing tests but go test on my host succeeds

@uovobw
Copy link
Contributor Author

uovobw commented Aug 5, 2015

yes i can confirm that the command

go test -v -timeout 60s -race ./...

run on my host (as is from the travis CI test) completes successfully on my host

@wvanbergen
Copy link
Contributor

Seems to have been a temporary fluke - I just did a rebuild and it passed now.

@eapache merge?

eapache added a commit that referenced this pull request Aug 6, 2015
Add configuration to support broker SSL
@eapache eapache merged commit b973736 into IBM:master Aug 6, 2015
@wvanbergen wvanbergen mentioned this pull request Nov 13, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants