diff --git a/README.md b/README.md index a863a825..f9c8c2bc 100644 --- a/README.md +++ b/README.md @@ -66,9 +66,9 @@ ---------- ## 目前运维的规模 -1. 服务器:20台+ -2. 集群:4个+ -3. topic:250个+ +1. 服务器:40台+ +2. 集群:5个+ +3. topic:370个+ 4. 生产消费消息量/日:10亿条+ 5. 生产消费消息大小/日:1T+ ---------- diff --git a/mq-cloud/src/main/java/com/sohu/tv/mq/cloud/service/MQDeployer.java b/mq-cloud/src/main/java/com/sohu/tv/mq/cloud/service/MQDeployer.java index 7bc3c3aa..7d8fc5b5 100644 --- a/mq-cloud/src/main/java/com/sohu/tv/mq/cloud/service/MQDeployer.java +++ b/mq-cloud/src/main/java/com/sohu/tv/mq/cloud/service/MQDeployer.java @@ -284,11 +284,11 @@ public SSHResult call(SSHSession session) { return Result.getOKResult(); } // 获取master地址 - Result masterAddressResult = fetchMasterAddress(cluster); + Result masterAddressResult = fetchMasterAddress(cluster); // 集群中无节点时,不进行后续配置 if(Status.NO_RESULT.getKey() == masterAddressResult.getStatus()) { return Result.getOKResult(); - } + } if(!masterAddressResult.isOK()) { return masterAddressResult; } diff --git a/mq-cloud/src/main/java/com/sohu/tv/mq/cloud/web/controller/param/BrokerParam.java b/mq-cloud/src/main/java/com/sohu/tv/mq/cloud/web/controller/param/BrokerParam.java index 220a4444..71910a7b 100644 --- a/mq-cloud/src/main/java/com/sohu/tv/mq/cloud/web/controller/param/BrokerParam.java +++ b/mq-cloud/src/main/java/com/sohu/tv/mq/cloud/web/controller/param/BrokerParam.java @@ -101,9 +101,9 @@ public String toConfig(String nameServerDomain, Cluster cluster) { + "\nrmqAddressServerDomain=" + nameServerDomain + "\nrmqAddressServerSubGroup=" + String.format(MQDeployer.NS_SUB_GROUP, cluster.getId()) + "\nfetchNamesrvAddrByAddressServer=true" - + "\nautoCreateTopicEnable=true" + + "\nautoCreateTopicEnable=false" + "\nclusterTopicEnable=false" - + "\nautoCreateSubscriptionGroup=false" + + "\nautoCreateSubscriptionGroup=true" + "\nstorePathRootDir=" + MQDeployer.MQ_CLOUD_DIR + getDir() + "/data" + "\nstorePathCommitLog=" + MQDeployer.MQ_CLOUD_DIR + getDir() + "/data/commitlog" + "\nstorePathIndex=" + MQDeployer.MQ_CLOUD_DIR + getDir() + "/data/index" diff --git a/mq-cloud/src/main/java/com/sohu/tv/mq/cloud/web/vo/ConsumerProgressVO.java b/mq-cloud/src/main/java/com/sohu/tv/mq/cloud/web/vo/ConsumerProgressVO.java index 01d546fa..58082d8b 100644 --- a/mq-cloud/src/main/java/com/sohu/tv/mq/cloud/web/vo/ConsumerProgressVO.java +++ b/mq-cloud/src/main/java/com/sohu/tv/mq/cloud/web/vo/ConsumerProgressVO.java @@ -115,8 +115,8 @@ public void setTopic(String topic) { public long getDiff() { return diffTotal; - } - + } + public long computeTotalDiff() { diffTotal = computeTotalDiff(offsetMap, false); diffTotal += computeTotalDiff(retryOffsetMap, true); diff --git a/mq-cloud/src/main/resources/static/img/intro/msgSearch.png b/mq-cloud/src/main/resources/static/img/intro/msgSearch.png index 6334c7ec..353a1438 100644 Binary files a/mq-cloud/src/main/resources/static/img/intro/msgSearch.png and b/mq-cloud/src/main/resources/static/img/intro/msgSearch.png differ diff --git a/mq-cloud/src/main/resources/templates/msg/index.html b/mq-cloud/src/main/resources/templates/msg/index.html index 86557309..28177880 100644 --- a/mq-cloud/src/main/resources/templates/msg/index.html +++ b/mq-cloud/src/main/resources/templates/msg/index.html @@ -36,7 +36,7 @@ -