kafka git commit: KAFKA-2851 Using random file names for local kdc files to avoid conflicts.

[gu...@apache.org]

Repository: kafka
Updated Branches:
  refs/heads/trunk cff03f8b6 -> 8c3c9548b


KAFKA-2851 Using random file names for local kdc files to avoid conflicts.

I originally tried to solve the problem by using tempfile, and creating and using scp() utility method that created a random local temp file every time it was called. However, it required passing miniKdc object to SecurityConfig setup_node which looked very invasive, since many tests use this method. Here is the PR for that, which I think we will close: https://github.com/apache/kafka/pull/609

This change is the least invasive change to solve conflicts between multiple tests jobs.

Author: Anna Povzner <an...@confluent.io>

Reviewers: Geoff Anderson

Closes #610 from apovzner/kafka_2851_01


Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/8c3c9548
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/8c3c9548
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/8c3c9548

Branch: refs/heads/trunk
Commit: 8c3c9548b636cdf760d2537afe115942d13bc003
Parents: cff03f8
Author: Anna Povzner <an...@confluent.io>
Authored: Wed Dec 2 11:17:23 2015 -0800
Committer: Guozhang Wang <wa...@gmail.com>
Committed: Wed Dec 2 11:17:23 2015 -0800

----------------------------------------------------------------------
 tests/kafkatest/services/security/minikdc.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kafka/blob/8c3c9548/tests/kafkatest/services/security/minikdc.py
----------------------------------------------------------------------
diff --git a/tests/kafkatest/services/security/minikdc.py b/tests/kafkatest/services/security/minikdc.py
index 7ba1611..3b3a5f1 100644
--- a/tests/kafkatest/services/security/minikdc.py
+++ b/tests/kafkatest/services/security/minikdc.py
@@ -21,6 +21,7 @@ from tempfile import mkstemp
 from shutil import move
 from os import remove, close
 from io import open
+import uuid
 
 class MiniKdc(Service):
 
@@ -35,8 +36,8 @@ class MiniKdc(Service):
     KEYTAB_FILE = "/mnt/minikdc/keytab"
     KRB5CONF_FILE = "/mnt/minikdc/krb5.conf"
     LOG_FILE = "/mnt/minikdc/minikdc.log"
-    LOCAL_KEYTAB_FILE = "/tmp/keytab"
-    LOCAL_KRB5CONF_FILE = "/tmp/krb5.conf"
+    LOCAL_KEYTAB_FILE = "/tmp/" + str(uuid.uuid4().get_hex()) + "_keytab"
+    LOCAL_KRB5CONF_FILE = "/tmp/" + str(uuid.uuid4().get_hex()) + "_krb5.conf"
 
     def __init__(self, context, kafka_nodes, extra_principals = ""):
         super(MiniKdc, self).__init__(context, 1)