HDDS-753. SCM security protocol server is not starting. Contributed by Ajay Kumar.

This commit is contained in:
Ajay Kumar 2018-11-01 15:48:52 -07:00 committed by Xiaoyu Yao
parent 8b8a3f5435
commit a28ad7ad81
3 changed files with 65 additions and 2 deletions

View File

@ -28,7 +28,7 @@
import org.apache.hadoop.hdds.scm.HddsServerUtil; import org.apache.hadoop.hdds.scm.HddsServerUtil;
import org.apache.hadoop.hdds.scm.ScmConfigKeys; import org.apache.hadoop.hdds.scm.ScmConfigKeys;
import org.apache.hadoop.hdds.protocol.SCMSecurityProtocol; 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.ipc.RPC;
import org.apache.hadoop.security.KerberosInfo; import org.apache.hadoop.security.KerberosInfo;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -60,6 +60,8 @@ public class SCMSecurityProtocolServer implements SCMSecurityProtocol {
rpcAddress = HddsServerUtil rpcAddress = HddsServerUtil
.getScmSecurityInetAddress(conf); .getScmSecurityInetAddress(conf);
// SCM security service RPC service. // SCM security service RPC service.
RPC.setProtocolEngine(conf, SCMSecurityProtocolPB.class,
ProtobufRpcEngine.class);
BlockingService secureProtoPbService = BlockingService secureProtoPbService =
SCMSecurityProtocolProtos.SCMSecurityProtocolService SCMSecurityProtocolProtos.SCMSecurityProtocolService
.newReflectiveBlockingService( .newReflectiveBlockingService(

View File

@ -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();
}
}

View File

@ -298,7 +298,8 @@ public void testSecureKsmInitializationSuccess() throws Exception {
} catch (Exception ex) { } catch (Exception ex) {
// Expects timeout failure from scmClient in KSM but KSM user login via // Expects timeout failure from scmClient in KSM but KSM user login via
// kerberos should succeed // kerberos should succeed
Assert.assertTrue(logs.getOutput().contains("KSM login successful")); Assert.assertTrue(
logs.getOutput().contains("Ozone Manager login successful."));
} }
} }