KAFKA-2825, KAFKA-2851: Controller failover tests added to ducktape replication tests and fix to temp dir #570
+134
−72
Conversation
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
apovzner
changed the title
| @@ -110,7 +111,7 @@ def __init__(self, security_protocol, interbroker_security_protocol=None, sasl_m | |||
| def client_config(self, template_props=""): | |||
| return SecurityConfig(self.security_protocol, sasl_mechanism=self.sasl_mechanism, template_props=template_props) | |||
|
|
|||
| def setup_node(self, node): | |||
| def setup_node(self, node, miniKdc=None): | |||
There was a problem hiding this comment.
Does it make sense to set self.kdc in the constructor? And then having non-None self.kdc would be part of the logic in has_sasl_kerberos
|
@apovzner A few minor comments, and needs rebasing, but this looks good. |
| @@ -127,8 +128,9 @@ def setup_node(self, node): | |||
| jaas_conf = self.render(jaas_conf_file, node=node, is_ibm_jdk=is_ibm_jdk) | |||
| node.account.create_file(SecurityConfig.JAAS_CONF_PATH, jaas_conf) | |||
| if self.has_sasl_kerberos: | |||
| node.account.scp_to(MiniKdc.LOCAL_KEYTAB_FILE, SecurityConfig.KEYTAB_PATH) | |||
| node.account.scp_to(MiniKdc.LOCAL_KRB5CONF_FILE, SecurityConfig.KRB5CONF_PATH) | |||
| scp(miniKdc.nodes[0], MiniKdc.KEYTAB_FILE, node, SecurityConfig.KEYTAB_PATH) | |||
There was a problem hiding this comment.
Maybe just check that minikdc is not None here
…o remote nodes through unique local temp file
…ontroller failover tests
|
@granders I just pushed the changes to address your comments. |
|
Conflicts need resolving on this again unfortunately. |
|
@apovzner, it looks like this was merged via different PRs, would you mind closing this one please? |
|
Closed because the code in this PR was two KAFKA JIRAs so I separated it into two separate PRs and already merged. |
jeffkbkim
pushed a commit
to jeffkbkim/kafka
that referenced
this pull request
Oct 22, 2021
* Sync Jersey version from ccs-kafka 2.8 This is to resolve CVE in Jersey. * Add more fixes from KC-1603
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I closed an original pull request that contained previous comments by Geoff (which are already addressed here), because I got into bad rebase situation. So, I created a new branch and cherry-picked my commits + merged with Ben's changes to fix MiniKDC tests to run on Virtual Box. That change was conflicting with my changes, where I was copying MiniKDC files with new scp method, and temp file was created inside that method. To merge Ben's changes, I added two optional parameters to scp(): 'pattern' and 'subst' to optionally substitute string while spp'ing files, which is needed for krb5.conf file.