Skip to content

system tests - adding listener overrides#6981

Merged
rajinisivaram merged 6 commits intoapache:trunkfrom
brianbushree:listener-overrides
Jun 27, 2019
Merged

system tests - adding listener overrides#6981
rajinisivaram merged 6 commits intoapache:trunkfrom
brianbushree:listener-overrides

Conversation

@brianbushree
Copy link
Copy Markdown
Contributor

what

Now that we have an abstraction for listeners, people should be allowed to pass in certain overrides for their listeners. This allows a user to override both client & interbroker listeners with a dictionary of configs.

why

There may be certain listener configs a user would want to override. Currently, to do so, they would either have to completely override all listener configs OR try to shoehorn an override based on the name of the security-protocol or an internal constant. This makes things a bit cleaner such that we handle the prefixing and simply add on some additional configs.

Committer Checklist (excluded from commit message)

  • Verify design and implementation
  • Verify test coverage and CI build status
  • Verify documentation (including upgrade notes)

@ijuma
Copy link
Copy Markdown
Member

ijuma commented Jun 21, 2019

Let's run this with the branch builder before merging.

@brianbushree
Copy link
Copy Markdown
Contributor Author

Copy link
Copy Markdown
Contributor

@rajinisivaram rajinisivaram left a comment

Choose a reason for hiding this comment

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

@brianbushree Thanks for the PR. Left a couple of comments. Also, I think it may be neater to define a new class for listener configs that encapsulates client_listener_overrides, interbroker_listener_overridesanduse_separate_interbroker_listener`. We can then add listener names to that class as well in future. It will provide a neater way to propagate these configs to SecurityConfig as well.

Comment thread tests/kafkatest/services/kafka/kafka.py Outdated
Comment thread tests/kafkatest/services/kafka/templates/kafka.properties

{% if interbroker_listener.name != security_protocol %}
{% for k, v in interbroker_listener_overrides.iteritems() %}
listener.name.{{ interbroker_listener.name.lower() }}.{{ security_config.interbroker_sasl_mechanism.lower() }}.{{ k }}={{ v }}
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Same as before, this assumes listener overrides are only for SASL configs

@brianbushree
Copy link
Copy Markdown
Contributor Author

@rajinisivaram I made the requested changes. Could you take another look?

Also I am running the tests again now

Copy link
Copy Markdown
Contributor

@rajinisivaram rajinisivaram left a comment

Choose a reason for hiding this comment

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

@brianbushree Thanks for the update, looks good. One of the comments on the config prefix was not addressed. I have left an explanation of the scenario.

Comment thread tests/kafkatest/services/kafka/templates/kafka.properties
Comment thread tests/kafkatest/services/security/security_config.py Outdated
@brianbushree
Copy link
Copy Markdown
Contributor Author

out of the two test failures mentioned above, looks like one of them is also failing on trunk at the moment (http://confluent-kafka-system-test-results.s3-us-west-2.amazonaws.com/2019-06-25--001.1561541534--apache--trunk--14d8549/report.html)

@ijuma
Copy link
Copy Markdown
Member

ijuma commented Jun 27, 2019

#7000 is meant to fix the upgrade test. @brianbushree are all other tests passing with this PR?

@brianbushree
Copy link
Copy Markdown
Contributor Author

http://confluent-kafka-branch-builder-system-test-results.s3-us-west-2.amazonaws.com/2019-06-26--001.1561614455--brianbushree--listener-overrides--ddb024d/report.html

@ijuma all but one. however kafkatest.tests.connect.connect_rest_test seems irrelevant to this change. will double check though

@brianbushree
Copy link
Copy Markdown
Contributor Author

Copy link
Copy Markdown
Contributor

@rajinisivaram rajinisivaram left a comment

Choose a reason for hiding this comment

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

@brianbushree Thanks for the updates, LGTM

@rajinisivaram rajinisivaram merged commit 357aede into apache:trunk Jun 27, 2019
rajinisivaram pushed a commit to confluentinc/kafka that referenced this pull request Jun 27, 2019
Reviewers: Rajini Sivaram <rajinisivaram@googlemail.com>
rajinisivaram pushed a commit to confluentinc/kafka that referenced this pull request Jun 27, 2019
Reviewers: Rajini Sivaram <rajinisivaram@googlemail.com>
hachikuji pushed a commit that referenced this pull request May 27, 2020
Reviewers: Rajini Sivaram <rajinisivaram@googlemail.com>
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