You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2014/12/24 16:25:13 UTC
activemq git commit: replicated leveldb test improvements
Repository: activemq
Updated Branches:
refs/heads/trunk c266b1069 -> 531538908
replicated leveldb test improvements
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/53153890
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/53153890
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/53153890
Branch: refs/heads/trunk
Commit: 531538908095332f702bfeddfbf0731d7c01f604
Parents: c266b10
Author: Dejan Bosanac <de...@nighttale.net>
Authored: Wed Dec 24 16:25:04 2014 +0100
Committer: Dejan Bosanac <de...@nighttale.net>
Committed: Wed Dec 24 16:25:04 2014 +0100
----------------------------------------------------------------------
.../leveldb/replicated/ElectingLevelDBStore.scala | 11 ++++++++---
.../leveldb/test/ReplicatedLevelDBBrokerTest.java | 9 ++-------
.../activemq/leveldb/test/ZooKeeperTestSupport.java | 12 ++++++++++--
3 files changed, 20 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/53153890/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ElectingLevelDBStore.scala
----------------------------------------------------------------------
diff --git a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ElectingLevelDBStore.scala b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ElectingLevelDBStore.scala
index fe20530..c64c9af 100644
--- a/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ElectingLevelDBStore.scala
+++ b/activemq-leveldb-store/src/main/scala/org/apache/activemq/leveldb/replicated/ElectingLevelDBStore.scala
@@ -277,9 +277,14 @@ class ElectingLevelDBStore extends ProxyLevelDBStore {
if(brokerService!=null && brokerService.isUseJmx){
brokerService.getManagementContext().unregisterMBean(objectName);
}
- zk_group.close
- zk_client.close()
- zk_client = null
+ if (zk_group != null) {
+ zk_group.close
+ zk_group = null
+ }
+ if (zk_client != null) {
+ zk_client.close()
+ zk_client = null
+ }
if( master!=null ) {
val latch = new CountDownLatch(1)
http://git-wip-us.apache.org/repos/asf/activemq/blob/53153890/activemq-leveldb-store/src/test/java/org/apache/activemq/leveldb/test/ReplicatedLevelDBBrokerTest.java
----------------------------------------------------------------------
diff --git a/activemq-leveldb-store/src/test/java/org/apache/activemq/leveldb/test/ReplicatedLevelDBBrokerTest.java b/activemq-leveldb-store/src/test/java/org/apache/activemq/leveldb/test/ReplicatedLevelDBBrokerTest.java
index 8910981..7a38315 100644
--- a/activemq-leveldb-store/src/test/java/org/apache/activemq/leveldb/test/ReplicatedLevelDBBrokerTest.java
+++ b/activemq-leveldb-store/src/test/java/org/apache/activemq/leveldb/test/ReplicatedLevelDBBrokerTest.java
@@ -83,13 +83,6 @@ public class ReplicatedLevelDBBrokerTest extends ZooKeeperTestSupport {
deleteDirectory("node-3");
}
- protected void deleteDirectory(String s) throws IOException {
- try {
- FileUtils.deleteDirectory(new File(data_dir(), s));
- } catch (IOException e) {
- }
- }
-
public interface Client{
public void execute(Connection connection) throws Exception;
}
@@ -284,6 +277,7 @@ public class ReplicatedLevelDBBrokerTest extends ZooKeeperTestSupport {
System.out.println("======================================");
System.out.println("5. Restart the stopped node & 6. stop current master");
System.out.println("======================================");
+ brokers.remove(prevMaster);
prevMaster = createBrokerNode(prevMaster.getBrokerName());
startBrokerAsync(prevMaster);
stop(master);
@@ -411,6 +405,7 @@ public class ReplicatedLevelDBBrokerTest extends ZooKeeperTestSupport {
}
}
brokers.clear();
+ resetDataDirs();
}
private BrokerService createBrokerNode(String id) throws Exception {
http://git-wip-us.apache.org/repos/asf/activemq/blob/53153890/activemq-leveldb-store/src/test/java/org/apache/activemq/leveldb/test/ZooKeeperTestSupport.java
----------------------------------------------------------------------
diff --git a/activemq-leveldb-store/src/test/java/org/apache/activemq/leveldb/test/ZooKeeperTestSupport.java b/activemq-leveldb-store/src/test/java/org/apache/activemq/leveldb/test/ZooKeeperTestSupport.java
index db65b43..7498d98 100644
--- a/activemq-leveldb-store/src/test/java/org/apache/activemq/leveldb/test/ZooKeeperTestSupport.java
+++ b/activemq-leveldb-store/src/test/java/org/apache/activemq/leveldb/test/ZooKeeperTestSupport.java
@@ -18,13 +18,12 @@ package org.apache.activemq.leveldb.test;
import org.apache.activemq.leveldb.CountDownFuture;
import org.apache.activemq.leveldb.util.FileSupport;
+import org.apache.commons.io.FileUtils;
import org.apache.zookeeper.server.NIOServerCnxnFactory;
import org.apache.zookeeper.server.ZooKeeperServer;
import org.apache.zookeeper.server.persistence.FileTxnSnapLog;
import org.junit.After;
import org.junit.Before;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.File;
import java.net.InetSocketAddress;
@@ -62,6 +61,8 @@ public class ZooKeeperTestSupport {
connector.shutdown();
connector = null;
}
+ deleteDirectory("zk-log");
+ deleteDirectory("zk-data");
}
@@ -108,4 +109,11 @@ public class ZooKeeperTestSupport {
}
}
}
+
+ protected void deleteDirectory(String s) throws java.io.IOException {
+ try {
+ FileUtils.deleteDirectory(new File(data_dir(), s));
+ } catch (java.io.IOException e) {
+ }
+ }
}