[infinispan-commits] Infinispan SVN: r2515 - in trunk/server: core/src/test/scala/org/infinispan/server/core and 3 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Mon Oct 18 06:37:36 EDT 2010
Author: galder.zamarreno at jboss.com
Date: 2010-10-18 06:37:35 -0400 (Mon, 18 Oct 2010)
New Revision: 2515
Added:
trunk/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodSingleClusteredTest.scala
Modified:
trunk/server/core/src/main/scala/org/infinispan/server/core/AbstractProtocolServer.scala
trunk/server/core/src/test/scala/org/infinispan/server/core/AbstractProtocolServerTest.scala
trunk/server/hotrod/src/main/scala/org/infinispan/server/hotrod/HotRodServer.scala
trunk/server/websocket/src/main/java/org/infinispan/server/websocket/WebSocketServer.java
Log:
ISPN-702 - RankCalculatorListener registered to late - Merged from 4.2.x (rev 2514)
Modified: trunk/server/core/src/main/scala/org/infinispan/server/core/AbstractProtocolServer.scala
===================================================================
--- trunk/server/core/src/main/scala/org/infinispan/server/core/AbstractProtocolServer.scala 2010-10-18 10:35:04 UTC (rev 2514)
+++ trunk/server/core/src/main/scala/org/infinispan/server/core/AbstractProtocolServer.scala 2010-10-18 10:37:35 UTC (rev 2515)
@@ -62,11 +62,11 @@
cacheManager.addListener(getRankCalculatorListener)
// Start default cache
startDefaultCache
- startTransport(idleTimeout, tcpNoDelay, sendBufSize, recvBufSize)
+ startTransport(idleTimeout, tcpNoDelay, sendBufSize, recvBufSize, typedProps)
}
}
- def startTransport(idleTimeout: Int, tcpNoDelay: Boolean, sendBufSize: Int, recvBufSize: Int) {
+ def startTransport(idleTimeout: Int, tcpNoDelay: Boolean, sendBufSize: Int, recvBufSize: Int, typedProps: TypedProperties) {
val address = new InetSocketAddress(host, port)
val encoder = getEncoder
val nettyEncoder = if (encoder != null) new EncoderAdapter(encoder) else null
@@ -75,7 +75,6 @@
transport.start
}
-
def start(propertiesFileName: String, cacheManager: EmbeddedCacheManager) {
val propsObject = new TypedProperties()
val stream = Util.loadResourceAsStream(propertiesFileName)
Modified: trunk/server/core/src/test/scala/org/infinispan/server/core/AbstractProtocolServerTest.scala
===================================================================
--- trunk/server/core/src/test/scala/org/infinispan/server/core/AbstractProtocolServerTest.scala 2010-10-18 10:35:04 UTC (rev 2514)
+++ trunk/server/core/src/test/scala/org/infinispan/server/core/AbstractProtocolServerTest.scala 2010-10-18 10:37:35 UTC (rev 2515)
@@ -8,6 +8,7 @@
import org.testng.Assert._
import java.net.InetSocketAddress
import java.lang.reflect.Method
+import org.infinispan.util.TypedProperties
/**
* Abstract protocol server test.
@@ -183,7 +184,8 @@
override def getDecoder: Decoder = null
- override def startTransport(idleTimeout: Int, tcpNoDelay: Boolean, sendBufSize: Int, recvBufSize: Int) {
+ override def startTransport(idleTimeout: Int, tcpNoDelay: Boolean, sendBufSize: Int, recvBufSize: Int,
+ typedProps: TypedProperties) {
this.tcpNoDelay = tcpNoDelay
}
}
Modified: trunk/server/hotrod/src/main/scala/org/infinispan/server/hotrod/HotRodServer.scala
===================================================================
--- trunk/server/hotrod/src/main/scala/org/infinispan/server/hotrod/HotRodServer.scala 2010-10-18 10:35:04 UTC (rev 2514)
+++ trunk/server/hotrod/src/main/scala/org/infinispan/server/hotrod/HotRodServer.scala 2010-10-18 10:37:35 UTC (rev 2515)
@@ -13,8 +13,8 @@
import org.infinispan.manager.EmbeddedCacheManager
import java.util.{Properties, Random}
import org.infinispan.server.core.{CacheValue, Logging, AbstractProtocolServer}
-import org.infinispan.util.{ByteArrayKey, Util}
-import org.infinispan.eviction.EvictionStrategy;
+import org.infinispan.eviction.EvictionStrategy
+import org.infinispan.util.{TypedProperties, ByteArrayKey, Util};
import org.infinispan.server.core.Main._
/**
@@ -40,7 +40,13 @@
override def start(p: Properties, cacheManager: EmbeddedCacheManager) {
val properties = if (p == null) new Properties else p
+ super.start(properties, cacheManager, 11311)
+ }
+ override def startTransport(idleTimeout: Int, tcpNoDelay: Boolean, sendBufSize: Int, recvBufSize: Int, typedProps: TypedProperties) {
+ // Start rest of the caches and self to view once we know for sure that we need to start
+ // and we know that the rank calculator listener is registered
+
// Start defined caches to avoid issues with lazily started caches
for (cacheName <- asIterator(cacheManager.getCacheNames.iterator))
cacheManager.getCache(cacheName)
@@ -48,12 +54,12 @@
isClustered = cacheManager.getGlobalConfiguration.getTransportClass != null
// If clustered, set up a cache for topology information
if (isClustered) {
- val externalHost = properties.getProperty(PROP_KEY_PROXY_HOST, getHost)
- val externalPort = properties.getProperty(PROP_KEY_PROXY_PORT, getPort.toString).toInt
+ val externalHost = typedProps.getProperty(PROP_KEY_PROXY_HOST, getHost)
+ val externalPort = typedProps.getIntProperty(PROP_KEY_PROXY_PORT, getPort)
addSelfToTopologyView(externalHost, externalPort, cacheManager)
}
- super.start(properties, cacheManager, 11311)
+ super.startTransport(idleTimeout, tcpNoDelay, sendBufSize, recvBufSize, typedProps)
}
private def addSelfToTopologyView(host: String, port: Int, cacheManager: EmbeddedCacheManager) {
Copied: trunk/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodSingleClusteredTest.scala (from rev 2514, branches/4.2.x/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodSingleClusteredTest.scala)
===================================================================
--- trunk/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodSingleClusteredTest.scala (rev 0)
+++ trunk/server/hotrod/src/test/scala/org/infinispan/server/hotrod/HotRodSingleClusteredTest.scala 2010-10-18 10:37:35 UTC (rev 2515)
@@ -0,0 +1,39 @@
+package org.infinispan.server.hotrod
+
+import org.testng.annotations.Test
+import org.infinispan.config.Configuration
+import test.HotRodClient
+import java.lang.reflect.Method
+import org.infinispan.server.hotrod.OperationStatus._
+import org.infinispan.test.MultipleCacheManagersTest
+import test.HotRodTestingUtil._
+import org.infinispan.test.AbstractCacheTest._
+
+/**
+ * // TODO: Document this
+ * @author Galder Zamarreño
+ * @since // TODO
+ */
+ at Test(groups = Array("functional"), testName = "server.hotrod.HotRodSingleClusteredTest")
+class HotRodSingleClusteredTest extends MultipleCacheManagersTest {
+
+ private var hotRodServer: HotRodServer = _
+ private var hotRodClient: HotRodClient = _
+ private val cacheName = "HotRodCache"
+
+ @Test(enabled=false) // Disable explicitly to avoid TestNG thinking this is a test!!
+ override def createCacheManagers {
+ val cm = addClusterEnabledCacheManager()
+ cm.defineConfiguration(cacheName, getDefaultClusteredConfig(Configuration.CacheMode.REPL_SYNC))
+ hotRodServer = startHotRodServer(cm)
+ hotRodClient = new HotRodClient("127.0.0.1", hotRodServer.getPort, cacheName, 60)
+ }
+
+ def testPutGet(m: Method) {
+ val putSt = hotRodClient.put(k(m) , 0, 0, v(m)).status
+ assertStatus(putSt, Success)
+ assertSuccess(hotRodClient.get(k(m), 0), v(m))
+ }
+
+
+}
\ No newline at end of file
Modified: trunk/server/websocket/src/main/java/org/infinispan/server/websocket/WebSocketServer.java
===================================================================
--- trunk/server/websocket/src/main/java/org/infinispan/server/websocket/WebSocketServer.java 2010-10-18 10:35:04 UTC (rev 2514)
+++ trunk/server/websocket/src/main/java/org/infinispan/server/websocket/WebSocketServer.java 2010-10-18 10:37:35 UTC (rev 2515)
@@ -41,6 +41,7 @@
import org.infinispan.server.websocket.handlers.NotifyHandler;
import org.infinispan.server.websocket.handlers.PutHandler;
import org.infinispan.server.websocket.handlers.RemoveHandler;
+import org.infinispan.util.TypedProperties;
import org.jboss.netty.bootstrap.ServerBootstrap;
import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.channel.ChannelPipelineFactory;
@@ -84,7 +85,7 @@
}
@Override
- public void startTransport(int idleTimeout, boolean tcpNoDelay, int sendBufSize, int recvBufSize) {
+ public void startTransport(int idleTimeout, boolean tcpNoDelay, int sendBufSize, int recvBufSize, TypedProperties typedProps) {
InetSocketAddress address = new InetSocketAddress(getHost(), getPort());
Executor masterExecutor =
masterThreads() == 0 ?
More information about the infinispan-commits
mailing list