更新broker时复制脚本

Author: gaoyf

mq-cloud/sql/4.9.3.sql

@@ -26,4 +26,5 @@ alter table `user_producer` add column `http_enabled` int(4) NOT NULL DEFAULT '0
 -- add new broker configuration
 -- ----------------------------
 INSERT INTO `broker_config`(`gid`, `key`, `value`, `desc`, `tip`, `order`, `dynamic_modify`, `option`, `required`) VALUES (1, 'jvmMemory', '8g', 'broker启动内存大小,对应jvm参数中的xmx/xms,单位:g或m', '', 16, 0, NULL, 0);
-INSERT INTO `broker_config`(`gid`, `key`, `value`, `desc`, `tip`, `order`, `dynamic_modify`, `option`, `required`) VALUES (1, 'maxDirectMemorySize', '15g', '堆外内存大小,单位:g', NULL, 17, 0, NULL, 0);
+INSERT INTO `broker_config`(`gid`, `key`, `value`, `desc`, `tip`, `order`, `dynamic_modify`, `option`, `required`) VALUES (1, 'maxDirectMemorySize', '15g', '堆外内存大小,单位:g', NULL, 17, 0, NULL, 0);
+INSERT INTO `broker_config`(`gid`, `key`, `value`, `desc`, `tip`, `order`, `dynamic_modify`, `option`, `required`) VALUES (1, 'physicalMemorySize', '0', '物理内存(单位字节)，0代表使用全部物理内存', '部署到docker或多个broker部署到一台机器时使用', 18, 1, NULL, 0);

mq-cloud/src/main/java/com/sohu/tv/mq/cloud/service/MQDeployer.java

@@ -63,7 +63,7 @@ public class MQDeployer {
     public static final String RUN_FILE = "run.sh";
 
     public static final String CONFIG_FILE = "mq.conf";
-    
+
     public static final String RUN_CONFIG = "echo \"source /etc/profile;nohup sh %s/bin/%s -c %s/" + CONFIG_FILE 
             + " >> %s/logs/startup.log 2>&1 &\" > %s/" + RUN_FILE;
 
@@ -582,14 +582,17 @@ public Result<?> recover(String ip, String backupDir, String destDir) {
         String mvConfig = String.format(mvCommTemplate, backupDir, CONFIG_FILE, destDir);
         // 2. 移动run.sh
         String mvRun = String.format(mvCommTemplate, backupDir, RUN_FILE, destDir);
-        // 3. 移动data目录
+        // 3. 移动broker启动脚本 runbroker.sh
+        String mvBrokerRun = String.format(mvCommTemplate, backupDir, "bin/runbroker.sh", destDir + "/bin");
+        // 4. 移动data目录
         String mvData = String.format(mvCommTemplate, backupDir, "data", destDir);
-        // 4. 创建logs目录
+        // 5. 创建logs目录
         String createLogsDir = String.format("mkdir -p %s/logs", destDir);
         // 顺序执行,各个命令之间没有依赖
         String comm = new StringBuilder()
                 .append(mvConfig).append(" ; ")
                 .append(mvRun).append(" ; ")
+                .append(mvBrokerRun).append(" ; ")
                 .append(mvData).append(" ; ")
                 .append(createLogsDir).toString();
         SSHResult sshResult = null;
@@ -609,7 +612,7 @@ public SSHResult call(SSHSession session) {
         if (mvResult.isNotOK()) {
             return mvResult;
         }
-        // 5. 备份目录重命名
+        // 6. 备份目录重命名
         String renameBackupDirComm = "sudo mv " + backupDir + " " + backupDir + DateUtil.getFormatNow(DateUtil.YMDHMS);
         try {
             sshResult = sshTemplate.execute(ip, new SSHCallback() {