You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by st...@apache.org on 2014/10/22 15:35:49 UTC
[3/3] git commit: YARN-2692 ktutil test hanging on some
machines/ktutil versions (stevel)
YARN-2692 ktutil test hanging on some machines/ktutil versions (stevel)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/85a88649
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/85a88649
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/85a88649
Branch: refs/heads/trunk
Commit: 85a88649c3f3fb7280aa511b2035104bcef28a6f
Parents: 7e3b5e6
Author: Steve Loughran <st...@apache.org>
Authored: Wed Oct 22 14:34:57 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Wed Oct 22 14:35:31 2014 +0100
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 2 +
.../hadoop/registry/RegistryTestHelper.java | 42 --------------------
.../registry/secure/TestSecureLogins.java | 13 ------
3 files changed, 2 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/85a88649/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 4a71b6b..168409a 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -681,6 +681,8 @@ Release 2.6.0 - UNRELEASED
YARN-2689 TestSecureRMRegistryOperations failing on windows:
secure ZK won't start (stevel)
+ YARN-2692 ktutil test hanging on some machines/ktutil versions (stevel)
+
---
YARN-2598 GHS should show N/A instead of null for the inaccessible information
http://git-wip-us.apache.org/repos/asf/hadoop/blob/85a88649/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/test/java/org/apache/hadoop/registry/RegistryTestHelper.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/test/java/org/apache/hadoop/registry/RegistryTestHelper.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/test/java/org/apache/hadoop/registry/RegistryTestHelper.java
index 38cc2cb..460ecad 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/test/java/org/apache/hadoop/registry/RegistryTestHelper.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/test/java/org/apache/hadoop/registry/RegistryTestHelper.java
@@ -326,48 +326,6 @@ public class RegistryTestHelper extends Assert {
}
/**
- * Exec the native <code>ktutil</code> to list the keys
- * (primarily to verify that the generated keytabs are compatible).
- * This operation is not executed on windows. On other platforms
- * it requires <code>ktutil</code> to be installed and on the path
- * <pre>
- * ktutil --keytab=target/kdc/zookeeper.keytab list --keys
- * </pre>
- * @param keytab keytab to list
- * @throws IOException on any execution problem, including the executable
- * being missing
- */
- public static String ktList(File keytab) throws IOException {
- if (!Shell.WINDOWS) {
- String path = keytab.getAbsolutePath();
- String out = Shell.execCommand(
- KTUTIL,
- "--keytab=" + path,
- "list",
- "--keys"
- );
- LOG.info("Listing of keytab {}:\n{}\n", path, out);
- return out;
- }
- return "";
- }
-
- /**
- * Perform a robust <code>ktutils -l</code> ... catches and ignores
- * exceptions, otherwise the output is logged.
- * @param keytab keytab to list
- * @return the result of the operation, or "" on any problem
- */
- public static String ktListRobust(File keytab) {
- try {
- return ktList(keytab);
- } catch (IOException e) {
- // probably not on the path
- return "";
- }
- }
-
- /**
* Login via a UGI. Requres UGI to have been set up
* @param user username
* @param keytab keytab to list
http://git-wip-us.apache.org/repos/asf/hadoop/blob/85a88649/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/test/java/org/apache/hadoop/registry/secure/TestSecureLogins.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/test/java/org/apache/hadoop/registry/secure/TestSecureLogins.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/test/java/org/apache/hadoop/registry/secure/TestSecureLogins.java
index 9a90a45..5592e19 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/test/java/org/apache/hadoop/registry/secure/TestSecureLogins.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/test/java/org/apache/hadoop/registry/secure/TestSecureLogins.java
@@ -57,19 +57,6 @@ public class TestSecureLogins extends AbstractSecureRegistryTest {
LoggerFactory.getLogger(TestSecureLogins.class);
@Test
- public void testZKinKeytab() throws Throwable {
- Assume.assumeTrue(!Shell.WINDOWS);
- try {
- String listing = ktList(keytab_zk);
- assertTrue("no " + ZOOKEEPER_LOCALHOST + " in " + listing,
- listing.contains(ZOOKEEPER_LOCALHOST));
- } catch (IOException e) {
- LOG.debug(KTUTIL + " failure: {}", e, e);
- Assume.assumeTrue("Failed to run "+ KTUTIL+": " + e, false );
- }
- }
-
- @Test
public void testHasRealm() throws Throwable {
assertNotNull(getRealm());
LOG.info("ZK principal = {}", getPrincipalAndRealm(ZOOKEEPER_LOCALHOST));