diff --git a/accumulo/src/main/java/com/yahoo/ycsb/db/accumulo/AccumuloClient.java b/accumulo/src/main/java/com/yahoo/ycsb/db/accumulo/AccumuloClient.java index 96b869e2b73b8cf9fcbcc5e9c2e3bd21154a73a8..25c754998b19705a4f0dec1c6d77daf80a1166e7 100644 --- a/accumulo/src/main/java/com/yahoo/ycsb/db/accumulo/AccumuloClient.java +++ b/accumulo/src/main/java/com/yahoo/ycsb/db/accumulo/AccumuloClient.java @@ -28,6 +28,7 @@ import org.apache.accumulo.core.client.AccumuloException; import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.accumulo.core.client.BatchWriter; import org.apache.accumulo.core.client.BatchWriterConfig; +import org.apache.accumulo.core.client.ClientConfiguration; import org.apache.accumulo.core.client.Connector; import org.apache.accumulo.core.client.MutationsRejectedException; import org.apache.accumulo.core.client.Scanner; @@ -77,9 +78,9 @@ public class AccumuloClient extends DB { public void init() throws DBException { colFam = new Text(getProperties().getProperty("accumulo.columnFamily")); - inst = new ZooKeeperInstance( - getProperties().getProperty("accumulo.instanceName"), - getProperties().getProperty("accumulo.zooKeepers")); + inst = new ZooKeeperInstance(new ClientConfiguration() + .withInstance(getProperties().getProperty("accumulo.instanceName")) + .withZkHosts(getProperties().getProperty("accumulo.zooKeepers"))); try { String principal = getProperties().getProperty("accumulo.username"); AuthenticationToken token = diff --git a/accumulo/src/test/resources/log4j.properties b/accumulo/src/test/resources/log4j.properties index e03d54a31a8e20a926c453d6057a41d128ed1f44..2d48dce5a34914b9470a4948e4955b342bc03cbc 100644 --- a/accumulo/src/test/resources/log4j.properties +++ b/accumulo/src/test/resources/log4j.properties @@ -24,6 +24,6 @@ log4j.appender.stderr.layout=org.apache.log4j.PatternLayout log4j.appender.stderr.layout.conversionPattern=%d{yyyy/MM/dd HH:mm:ss} %-5p %c %x - %m%n # Suppress messages from ZooKeeper -log4j.logger.com.yahoo.ycsb.db.accumulo=INFO +log4j.logger.com.yahoo.ycsb.db.accumulo=DEBUG log4j.logger.org.apache.zookeeper=ERROR log4j.logger.org.apache.accumulo=WARN diff --git a/pom.xml b/pom.xml index 2966efdcce401ae043f12018ec98844ded084d14..b94e0c180912819cb08967dc3e22f9b7f6f7baf9 100644 --- a/pom.xml +++ b/pom.xml @@ -72,7 +72,7 @@ LICENSE file. <hbase094.version>0.94.27</hbase094.version> <hbase098.version>0.98.14-hadoop2</hbase098.version> <hbase10.version>1.0.2</hbase10.version> - <accumulo.version>1.6.0</accumulo.version> + <accumulo.version>1.7.2</accumulo.version> <cassandra.version>1.2.9</cassandra.version> <cassandra.cql.version>1.0.3</cassandra.cql.version> <cassandra2.cql.version>3.0.0</cassandra2.cql.version>