Upgrade rocketmq to 4.3.0 (#96)

[ISSUE#88]Upgrade rocketmq to 4.3.0
openmessaging · Oct 12, 2018 · a2ae504 · a2ae504
1 parent c79c9f7
commit a2ae504
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/driver-rocketmq/deploy/deploy.yaml b/driver-rocketmq/deploy/deploy.yaml
@@ -48,7 +48,7 @@
     - file: path=/opt/rocketmq state=directory
     - set_fact:
         nameServers: "{{ groups['rmq-namesrv']|map('extract', hostvars, ['ansible_default_ipv4', 'address'])|map('regex_replace', '(.*)', '\\1:9876') | join(';') }}"
-        rocketMQVersion: "4.2.0"
+        rocketMQVersion: "4.3.0"
     - name: Download RocketMQ package
       unarchive:
         src: http://mirror.bit.edu.cn/apache/rocketmq/{{ rocketMQVersion }}/rocketmq-all-{{ rocketMQVersion }}-bin-release.zip
@@ -71,7 +71,7 @@
     - name: Set up broker
       template:
         src: "templates/rmq-broker.properties"
-        dest: "/opt/rocketmq/conf/rmq-broker.properties"
+        dest: "/opt/rocketmq/rocketmq-all-4.3.0-bin-release/conf/rmq-broker.properties"
     - template:
         src: "templates/rmq-broker.service"
         dest: "/etc/systemd/system/rmq-broker.service"
@@ -88,7 +88,7 @@
     - name: Set up RocketMQ NameServer
       template:
         src: "templates/rmq-namesrv.properties"
-        dest: "/opt/rocketmq/conf/rmq-namesrv.properties"
+        dest: "/opt/rocketmq/rocketmq-all-4.3.0-bin-release/conf/rmq-namesrv.properties"
     - template:
         src: "templates/rmq-namesrv.service"
         dest: "/etc/systemd/system/rmq-namesrv.service"
@@ -107,6 +107,7 @@
       unarchive:
         src: ../../package/target/openmessaging-benchmark-0.0.1-SNAPSHOT-bin.tar.gz
         dest: /opt
+    - shell: rm -rf /opt/benchmark
     - shell: mv /opt/openmessaging-benchmark-0.0.1-SNAPSHOT /opt/benchmark
     - shell: tuned-adm profile latency-performance
 
@@ -140,4 +141,4 @@
     - systemd:
         state: restarted
         daemon_reload: yes
-        name: "benchmark-worker"
+        name: "benchmark-worker"
diff --git a/driver-rocketmq/deploy/templates/rmq-broker.service b/driver-rocketmq/deploy/templates/rmq-broker.service
@@ -3,8 +3,8 @@ Description=RocketMQ-Broker
 After=network.target
 
 [Service]
-ExecStart=/opt/rocketmq/bin/mqbroker -c conf/rmq-broker.properties
-WorkingDirectory=/opt/rocketmq
+ExecStart=/opt/rocketmq/rocketmq-all-4.3.0-bin-release/bin/mqbroker -c conf/rmq-broker.properties
+WorkingDirectory=/opt/rocketmq/rocketmq-all-4.3.0-bin-release/
 RestartSec=1s
 Restart=on-failure
 Type=simple

diff --git a/driver-rocketmq/deploy/templates/rmq-namesrv.service b/driver-rocketmq/deploy/templates/rmq-namesrv.service
@@ -3,8 +3,8 @@ Description=RocketMQ-NameServer
 After=network.target
 
 [Service]
-ExecStart=/opt/rocketmq/bin/mqnamesrv -c conf/rmq-namesrv.properties
-WorkingDirectory=/opt/rocketmq
+ExecStart=/opt/rocketmq/rocketmq-all-4.3.0-bin-release/bin/mqnamesrv -c conf/rmq-namesrv.properties
+WorkingDirectory=/opt/rocketmq/rocketmq-all-4.3.0-bin-release/
 RestartSec=1s
 Restart=on-failure
 Type=simple

diff --git a/driver-rocketmq/pom.xml b/driver-rocketmq/pom.xml
@@ -40,13 +40,13 @@
         <dependency>
             <groupId>org.apache.rocketmq</groupId>
             <artifactId>rocketmq-client</artifactId>
-            <version>4.2.0</version>
+            <version>4.3.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.rocketmq</groupId>
             <artifactId>rocketmq-tools</artifactId>
-            <version>4.2.0</version>
+            <version>4.3.0</version>
         </dependency>
     </dependencies>
 
-</project>
+</project>