Repository: incubator-rocketmq Updated Branches: refs/heads/master bfc19a167 -> dbdb07209
[ROCKETMQ-47] Avoid broker updates of NameServer address list on startup twice, closes apache/incubator-rocketmq#42 Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/commit/dbdb0720 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/dbdb0720 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/dbdb0720 Branch: refs/heads/master Commit: dbdb07209f5b61c85bbf0615bc89eaa3f0b2d68c Parents: bfc19a1 Author: shroman <[email protected]> Authored: Mon Jan 16 16:38:14 2017 +0800 Committer: yukon <[email protected]> Committed: Mon Jan 16 16:38:14 2017 +0800 ---------------------------------------------------------------------- .../main/java/org/apache/rocketmq/broker/BrokerController.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/dbdb0720/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java ---------------------------------------------------------------------- diff --git a/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java b/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java index af69001..b656870 100644 --- a/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java +++ b/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java @@ -156,11 +156,6 @@ public class BrokerController { this.brokerOuterAPI = new BrokerOuterAPI(nettyClientConfig); this.filterServerManager = new FilterServerManager(this); - if (this.brokerConfig.getNamesrvAddr() != null) { - this.brokerOuterAPI.updateNameServerAddressList(this.brokerConfig.getNamesrvAddr()); - log.info("user specfied name server address: {}", this.brokerConfig.getNamesrvAddr()); - } - this.slaveSynchronize = new SlaveSynchronize(this); this.sendThreadPoolQueue = new LinkedBlockingQueue<Runnable>(this.brokerConfig.getSendThreadPoolQueueCapacity()); @@ -317,6 +312,7 @@ public class BrokerController { if (this.brokerConfig.getNamesrvAddr() != null) { this.brokerOuterAPI.updateNameServerAddressList(this.brokerConfig.getNamesrvAddr()); + log.info("Set user specified name server address: {}", this.brokerConfig.getNamesrvAddr()); } else if (this.brokerConfig.isFetchNamesrvAddrByAddressServer()) { this.scheduledExecutorService.scheduleAtFixedRate(new Runnable() {
