squito commented on a change in pull request #284: [LIVY-752][THRIFT] Fix implementation of limits on connections. URL: https://github.com/apache/incubator-livy/pull/284#discussion_r390052468
########## File path: thriftserver/server/src/test/scala/org/apache/livy/thriftserver/TestLivyThriftSessionManager.scala ########## @@ -0,0 +1,127 @@ +/* + * 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.livy.thriftserver + +import org.apache.hive.service.cli.HiveSQLException +import org.junit.Assert._ +import org.junit.Test +import org.mockito.Mockito.mock + +import org.apache.livy.LivyConf +import org.apache.livy.server.AccessManager +import org.apache.livy.server.recovery.{SessionStore, StateStore} +import org.apache.livy.sessions.InteractiveSessionManager + +object ConnectionLimitType extends Enumeration { + type ConnectionLimitType = Value + val User, IpAddress, UserIpAddress = Value +} + +class TestLivyThriftSessionManager { + + import ConnectionLimitType._ + + private def createThriftSessionManager( + limitType: ConnectionLimitType): LivyThriftSessionManager = { + val conf = new LivyConf() + conf.set(LivyConf.LIVY_SPARK_VERSION, sys.env("LIVY_SPARK_VERSION")) + val limit = 3 + val entry = limitType match { + case User => LivyConf.THRIFT_LIMIT_CONNECTIONS_PER_USER + case IpAddress => LivyConf.THRIFT_LIMIT_CONNECTIONS_PER_IPADDRESS + case UserIpAddress => LivyConf.THRIFT_LIMIT_CONNECTIONS_PER_USER_IPADDRESS + } + conf.set(entry, limit) + val server = new LivyThriftServer( + conf, + mock(classOf[InteractiveSessionManager]), + mock(classOf[SessionStore]), + mock(classOf[AccessManager]) + ) + new LivyThriftSessionManager(server, conf) + } + + private def testLimit( + thriftSessionMgr: LivyThriftSessionManager, + user: String, + ipAddress: String, + forwardedAddresses: java.util.List[String], + msg: String): Unit = { + val failureMsg = "Should have thrown HiveSQLException" + try { + thriftSessionMgr.incrementConnections(user, ipAddress, forwardedAddresses) + fail(failureMsg) + } catch { + case e: HiveSQLException => + assertEquals(msg, e.getMessage) + case _: Throwable => + fail(failureMsg) + } + } + + @Test + def testLimitConnectionsByUser(): Unit = { + val thriftSessionMgr = createThriftSessionManager(User) + val user = "alice" + val forwardedAddresses = new java.util.ArrayList[String]() + thriftSessionMgr.incrementConnections(user, "10.20.30.40", forwardedAddresses) + thriftSessionMgr.incrementConnections(user, "10.20.30.41", forwardedAddresses) + thriftSessionMgr.incrementConnections(user, "10.20.30.42", forwardedAddresses) + val msg = s"Connection limit per user reached (user: $user limit: 3)" + testLimit(thriftSessionMgr, user, "10.20.30.43", forwardedAddresses, msg) + } + + @Test + def testLimitConnectionsByIpAddress(): Unit = { + val thriftSessionMgr = createThriftSessionManager(IpAddress) + val ipAddress = "10.20.30.40" + val forwardedAddresses = new java.util.ArrayList[String]() + thriftSessionMgr.incrementConnections("alice", ipAddress, forwardedAddresses) + thriftSessionMgr.incrementConnections("bob", ipAddress, forwardedAddresses) + thriftSessionMgr.incrementConnections("charlie", ipAddress, forwardedAddresses) + val msg = s"Connection limit per ipaddress reached (ipaddress: $ipAddress limit: 3)" + testLimit(thriftSessionMgr, "dan", ipAddress, forwardedAddresses, msg) + } + + @Test + def testLimitConnectionsByUserAndIpAddress(): Unit = { + val thriftSessionMgr = createThriftSessionManager(UserIpAddress) + val user = "alice" + val ipAddress = "10.20.30.40" + val userAndAddress = user + ":" + ipAddress + val forwardedAddresses = new java.util.ArrayList[String]() + thriftSessionMgr.incrementConnections(user, ipAddress, forwardedAddresses) + + // more than 3 connections from the same IP Address is ok if users are different + thriftSessionMgr.incrementConnections("bob", ipAddress, forwardedAddresses) + thriftSessionMgr.incrementConnections("charlie", ipAddress, forwardedAddresses) + thriftSessionMgr.incrementConnections("dan", ipAddress, forwardedAddresses) + + // more than 3 connections from the same user is ok if IP addresses are different + thriftSessionMgr.incrementConnections(user, "10.20.30.41", forwardedAddresses) + thriftSessionMgr.incrementConnections(user, "10.20.30.42", forwardedAddresses) + thriftSessionMgr.incrementConnections(user, "10.20.30.43", forwardedAddresses) + + thriftSessionMgr.incrementConnections(user, ipAddress, forwardedAddresses) + thriftSessionMgr.incrementConnections(user, ipAddress, forwardedAddresses) + val msg = + s"Connection limit per user:ipaddress reached (user:ipaddress: $userAndAddress limit: 3)" + testLimit(thriftSessionMgr, user, ipAddress, forwardedAddresses, msg) + } + Review comment: it might also be nice to add a test for closing connections, and opening new ones, to ensure that does *not* trigger violations. (I agree with your sentiment that you are strictly improving coverage here. this could be done later, but sometimes its easier to just do it while its fresh in your mind, if its not too hard.) ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
