You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by ni...@apache.org on 2016/12/25 12:59:55 UTC
incubator-rocketmq git commit: ROCKETMQ-2 Closed the selector.
Repository: incubator-rocketmq
Updated Branches:
refs/heads/master 774101da1 -> b5afe91df
ROCKETMQ-2 Closed the selector.
Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/commit/b5afe91d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/b5afe91d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/b5afe91d
Branch: refs/heads/master
Commit: b5afe91df86c09187771bd89c28b9f51d69ccf01
Parents: 774101d
Author: shroman <rs...@yahoo.com>
Authored: Sun Dec 25 18:38:12 2016 +0900
Committer: Willem Jiang <wi...@gmail.com>
Committed: Sun Dec 25 20:59:19 2016 +0800
----------------------------------------------------------------------
.../com/alibaba/rocketmq/broker/BrokerControllerTest.java | 9 ++++++++-
.../main/java/com/alibaba/rocketmq/store/ha/HAService.java | 5 +++--
2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/b5afe91d/rocketmq-broker/src/test/java/com/alibaba/rocketmq/broker/BrokerControllerTest.java
----------------------------------------------------------------------
diff --git a/rocketmq-broker/src/test/java/com/alibaba/rocketmq/broker/BrokerControllerTest.java b/rocketmq-broker/src/test/java/com/alibaba/rocketmq/broker/BrokerControllerTest.java
index 6b0b62d..9246d6f 100644
--- a/rocketmq-broker/src/test/java/com/alibaba/rocketmq/broker/BrokerControllerTest.java
+++ b/rocketmq-broker/src/test/java/com/alibaba/rocketmq/broker/BrokerControllerTest.java
@@ -22,11 +22,15 @@ import com.alibaba.rocketmq.remoting.netty.NettyClientConfig;
import com.alibaba.rocketmq.remoting.netty.NettyServerConfig;
import com.alibaba.rocketmq.store.config.MessageStoreConfig;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @author shtykh_roman
*/
public class BrokerControllerTest {
+ protected Logger logger = LoggerFactory.getLogger(BrokerControllerTest.class);
+
private static final int RESTART_NUM = 3;
/**
@@ -44,10 +48,13 @@ public class BrokerControllerTest {
new NettyClientConfig(), //
new MessageStoreConfig());
boolean initResult = brokerController.initialize();
- System.out.println("initialize " + initResult);
+ logger.info("Broker is initialized " + initResult);
+
brokerController.start();
+ logger.info("Broker is started");
brokerController.shutdown();
+ logger.info("Broker is stopped");
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/b5afe91d/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/ha/HAService.java
----------------------------------------------------------------------
diff --git a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/ha/HAService.java b/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/ha/HAService.java
index 5f93753..075252c 100644
--- a/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/ha/HAService.java
+++ b/rocketmq-store/src/main/java/com/alibaba/rocketmq/store/ha/HAService.java
@@ -173,7 +173,7 @@ public class HAService {
class AcceptSocketService extends ServiceThread {
private ServerSocketChannel serverSocketChannel;
private Selector selector;
- private SocketAddress socketAddressListen;
+ private final SocketAddress socketAddressListen;
public AcceptSocketService(final int port) {
@@ -194,7 +194,8 @@ public class HAService {
public void shutdown(final boolean interrupt) {
super.shutdown(interrupt);
try {
- serverSocketChannel.close();
+ this.serverSocketChannel.close();
+ this.selector.close();
}
catch (IOException e) {
log.error("AcceptSocketService shutdown exception", e);