Merging with ticktock

This commit is contained in:
Viktor Klang 2010-09-23 17:11:50 +02:00
commit 919cdf2f68
3 changed files with 10 additions and 5 deletions

View file

@ -1,2 +1,4 @@
node.id=0
enable.rebalancing=false
enable.bdb.engine=false
slop.enable=false

View file

@ -6,7 +6,7 @@
<required-reads>1</required-reads>
<preferred-writes>1</preferred-writes>
<required-writes>1</required-writes>
<persistence>bdb</persistence>
<persistence>memory</persistence>
<routing>client</routing>
<key-serializer>
<type>string</type>
@ -23,7 +23,7 @@
<required-reads>1</required-reads>
<preferred-writes>1</preferred-writes>
<required-writes>1</required-writes>
<persistence>bdb</persistence>
<persistence>memory</persistence>
<routing>client</routing>
<key-serializer>
<type>identity</type>
@ -39,7 +39,7 @@
<required-reads>1</required-reads>
<preferred-writes>1</preferred-writes>
<required-writes>1</required-writes>
<persistence>bdb</persistence>
<persistence>memory</persistence>
<routing>client</routing>
<key-serializer>
<type>string</type>
@ -56,7 +56,7 @@
<required-reads>1</required-reads>
<preferred-writes>1</preferred-writes>
<required-writes>1</required-writes>
<persistence>bdb</persistence>
<persistence>memory</persistence>
<routing>client</routing>
<key-serializer>
<type>identity</type>
@ -72,7 +72,7 @@
<required-reads>1</required-reads>
<preferred-writes>1</preferred-writes>
<required-writes>1</required-writes>
<persistence>bdb</persistence>
<persistence>memory</persistence>
<routing>client</routing>
<key-serializer>
<type>string</type>

View file

@ -8,6 +8,8 @@ import org.scalatest.junit.JUnitRunner
import voldemort.utils.Utils
import java.io.File
import se.scalablesolutions.akka.util.{Logging}
import collection.JavaConversions
import voldemort.store.memory.InMemoryStorageConfiguration
@RunWith(classOf[JUnitRunner])
trait EmbeddedVoldemort extends BeforeAndAfterAll with Logging {
@ -21,6 +23,7 @@ trait EmbeddedVoldemort extends BeforeAndAfterAll with Logging {
val home = new File(dir)
log.info("Creating Voldemort Config")
val config = VoldemortConfig.loadFromVoldemortHome(home.getCanonicalPath)
config.setStorageConfigurations(JavaConversions.asList(List(classOf[InMemoryStorageConfiguration].getName)))
log.info("Starting Voldemort")
server = new VoldemortServer(config)
server.start