HDDS-753. SCM security protocol server is not starting. Contributed by Ajay Kumar.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/65d16622 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/65d16622 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/65d16622 Branch: refs/heads/HDDS-4 Commit: 65d16622b68349a6e334dcf1567a174e2f8fe21b Parents: b9a0d5d Author: Ajay Kumar <a...@apache.com> Authored: Thu Nov 1 15:48:52 2018 -0700 Committer: Xiaoyu Yao <x...@apache.org> Committed: Tue Dec 4 08:03:16 2018 -0800 ---------------------------------------------------------------------- .../scm/server/SCMSecurityProtocolServer.java | 4 +- .../server/TestSCMSecurityProtocolServer.java | 60 ++++++++++++++++++++ .../hadoop/ozone/TestSecureOzoneCluster.java | 3 +- 3 files changed, 65 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/65d16622/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMSecurityProtocolServer.java ---------------------------------------------------------------------- diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMSecurityProtocolServer.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMSecurityProtocolServer.java index e810c54..ab29c1e 100644 --- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMSecurityProtocolServer.java +++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMSecurityProtocolServer.java @@ -28,7 +28,7 @@ import org.apache.hadoop.hdds.protocolPB.SCMSecurityProtocolServerSideTranslator import org.apache.hadoop.hdds.scm.HddsServerUtil; import org.apache.hadoop.hdds.scm.ScmConfigKeys; import org.apache.hadoop.hdds.protocol.SCMSecurityProtocol; -import org.apache.hadoop.io.IOUtils; +import org.apache.hadoop.ipc.ProtobufRpcEngine; import org.apache.hadoop.ipc.RPC; import org.apache.hadoop.security.KerberosInfo; import org.slf4j.Logger; @@ -60,6 +60,8 @@ public class SCMSecurityProtocolServer implements SCMSecurityProtocol { rpcAddress = HddsServerUtil .getScmSecurityInetAddress(conf); // SCM security service RPC service. + RPC.setProtocolEngine(conf, SCMSecurityProtocolPB.class, + ProtobufRpcEngine.class); BlockingService secureProtoPbService = SCMSecurityProtocolProtos.SCMSecurityProtocolService .newReflectiveBlockingService( http://git-wip-us.apache.org/repos/asf/hadoop/blob/65d16622/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMSecurityProtocolServer.java ---------------------------------------------------------------------- diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMSecurityProtocolServer.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMSecurityProtocolServer.java new file mode 100644 index 0000000..8e7d84c --- /dev/null +++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/server/TestSCMSecurityProtocolServer.java @@ -0,0 +1,60 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with this + * work for additional information regarding copyright ownership. The ASF + * licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package org.apache.hadoop.hdds.scm.server; + +import org.apache.hadoop.hdds.conf.OzoneConfiguration; +import org.junit.After; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.Timeout; + +/** + * Test class for {@link SCMSecurityProtocolServer}. + * */ +public class TestSCMSecurityProtocolServer { + private SCMSecurityProtocolServer securityProtocolServer; + private OzoneConfiguration config; + + @Rule + public Timeout timeout = new Timeout(1000 * 20); + + @Before + public void setUp() throws Exception { + config = new OzoneConfiguration(); + securityProtocolServer = new SCMSecurityProtocolServer(config, null); + } + + @After + public void tearDown() throws Exception { + if (securityProtocolServer != null) { + securityProtocolServer.stop(); + securityProtocolServer = null; + } + config = null; + } + + @Test + public void testStart() { + securityProtocolServer.start(); + } + + @Test + public void testStop() { + securityProtocolServer.stop(); + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/hadoop/blob/65d16622/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java index 5791de9..904e597 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/TestSecureOzoneCluster.java @@ -296,7 +296,8 @@ public final class TestSecureOzoneCluster { } catch (Exception ex) { // Expects timeout failure from scmClient in KSM but KSM user login via // kerberos should succeed - Assert.assertTrue(logs.getOutput().contains("KSM login successful")); + Assert.assertTrue( + logs.getOutput().contains("Ozone Manager login successful.")); } } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
