[infinispan-commits] Infinispan SVN: r2454 - trunk/server/hotrod/src/main/scala/org/infinispan/server/hotrod.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Thu Sep 30 03:58:11 EDT 2010
Author: galder.zamarreno at jboss.com
Date: 2010-09-30 03:58:11 -0400 (Thu, 30 Sep 2010)
New Revision: 2454
Modified:
trunk/server/hotrod/src/main/scala/org/infinispan/server/hotrod/HotRodServer.scala
Log:
ISPN-669 - Impose Hot Rod topology cache configuration restrictions - Merged from 4.2.x (rev 2453)
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-09-30 07:54:44 UTC (rev 2453)
+++ trunk/server/hotrod/src/main/scala/org/infinispan/server/hotrod/HotRodServer.scala 2010-09-30 07:58:11 UTC (rev 2454)
@@ -13,7 +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.util.{ByteArrayKey, Util}
+import org.infinispan.eviction.EvictionStrategy;
import org.infinispan.server.core.Main._
/**
@@ -39,8 +40,7 @@
override def start(p: Properties, cacheManager: EmbeddedCacheManager) {
val properties = if (p == null) new Properties else p
- super.start(properties, cacheManager, 11311)
-
+
// Start defined caches to avoid issues with lazily started caches
for (cacheName <- asIterator(cacheManager.getCacheNames.iterator))
cacheManager.getCache(cacheName)
@@ -52,6 +52,8 @@
val externalPort = properties.getProperty(PROP_KEY_PROXY_PORT, getPort.toString).toInt
addSelfToTopologyView(externalHost, externalPort, cacheManager)
}
+
+ super.start(properties, cacheManager, 11311)
}
private def addSelfToTopologyView(host: String, port: Int, cacheManager: EmbeddedCacheManager) {
@@ -132,6 +134,9 @@
topologyCacheConfig.setCacheMode(CacheMode.REPL_SYNC)
topologyCacheConfig.setSyncReplTimeout(10000) // Milliseconds
topologyCacheConfig.setFetchInMemoryState(true) // State transfer required
+ topologyCacheConfig.setEvictionStrategy(EvictionStrategy.NONE); // No eviction
+ topologyCacheConfig.setExpirationLifespan(-1); // No maximum lifespan
+ topologyCacheConfig.setExpirationMaxIdle(-1); // No maximum idle time
cacheManager.defineConfiguration(TopologyCacheName, topologyCacheConfig)
}
More information about the infinispan-commits
mailing list