remove parameter hipe-compile

QingCloudAppcenter · Sep 15, 2021 · 23c35ea · 23c35ea
1 parent 220e08c
commit 23c35ea
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 16 deletions.
diff --git a/...le/roles/node-rabbitmq/files/etc/confd/templates/rabbitmq-server.sh/02.rabbitmq.conf.tmpl b/...le/roles/node-rabbitmq/files/etc/confd/templates/rabbitmq-server.sh/02.rabbitmq.conf.tmpl
@@ -35,7 +35,6 @@ disk_free_limit.absolute = {{ getv "/env/disk_free_limit" "50MB" }}
 frame_max = {{ getv "/env/frame_max" "131072"}}
 handshake_timeout = {{ getv "/env/handshake_timeout" "10000" }}
 heartbeat = {{ getv "/env/heartbeat" "60" }}
-hipe_compile = {{ getv "/env/hipe_compile" "false" }}
 loopback_users.guest = false
 num_acceptors.tcp = {{ getv "/env/num_tcp_acceptors" "10" }}
 proxy_protocol = {{ getv "/env/proxy_protocol" "false" }}

diff --git a/app/cluster.json.mustache b/app/cluster.json.mustache
@@ -10,10 +10,11 @@
     "nodes": [{
         "role": "disc",
         "container": {
-            "type": "kvm",
+            "type": "lxc",
+            "prefer_type": "lxc",
             "sriov_nic": true,
             "zone": "pek3a",
-            "image": "img-1tzn2tbb"
+            "image": "img-i8b23ttz"
         },
         "instance_class": {{cluster.disc.instance_class}},
         "count": {{cluster.disc.count}},
@@ -96,7 +97,7 @@
         "container": {
             "type": "kvm",
             "zone": "pek3a",
-            "image": "img-1tzn2tbb"
+            "image": "img-i8b23ttz"
         },
         "instance_class": {{cluster.client.instance_class}},
         "count": {{cluster.client.count}},
@@ -116,10 +117,11 @@
     }, {
         "role": "haproxy",
         "container": {
-            "type": "kvm",
+            "type": "lxc",
+            "prefer_type": "lxc",
             "sriov_nic": true,
             "zone": "pek3a",
-            "image": "img-1tzn2tbb"
+            "image": "img-i8b23ttz"
         },
         "instance_class": {{cluster.haproxy.instance_class}},
         "count": {{cluster.haproxy.count}},
@@ -178,7 +180,6 @@
         "collect_statistics": {{env.collect_statistics}},
         "collect_statistics_interval": {{env.collect_statistics_interval}},
         "cluster_partition_handling": {{env.cluster_partition_handling}},
-        "hipe_compile": {{env.hipe_compile}},
         "cluster_keepalive_interval": {{env.cluster_keepalive_interval}},
         "background_gc_enabled": {{env.background_gc_enabled}},
         "background_gc_target_interval": {{env.background_gc_target_interval}},

diff --git a/app/config.json b/app/config.json
@@ -320,14 +320,6 @@
             "range": ["ignore","pause_minority","autoheal"],
             "default": "pause_minority",
             "required": "no"
-        }, {
-            "key": "hipe_compile",
-            "label": "hipe_compile",
-            "description": "Set to true to precompile parts of RabbitMQ with HiPE, a just-in-time compiler for Erlang. This will increase server throughput at the cost of increased startup time",
-            "type": "boolean",
-            "default": false,
-            "range": [true, false],
-            "required": "no"
         }, {
             "key": "cluster_keepalive_interval",
             "label": "cluster_keepalive_interval",

diff --git a/app/locale/zh-cn.json b/app/locale/zh-cn.json
@@ -59,7 +59,6 @@
     "Statistics collection mode. Primarily relevant for the management plugin": "统计收集模式。主要与管理插件相关",
     "Statistics collection interval in milliseconds. Primarily relevant for the management plugin": "统计收集时间间隔(毫秒为单位)． 主要针对于 management plugin",
     "How to handle network partitions": "如何处理网络分区",
-    "Set to true to precompile parts of RabbitMQ with HiPE, a just-in-time compiler for Erlang. This will increase server throughput at the cost of increased startup time": "将此选项设置为true,将会使用HiPE预编译部分RabbitMQ,Erlang的即时编译器.你可以看到花费几分钟延迟启动的成本，就可以带来20-50% 更好性能",
     "How frequently nodes should send keepalive messages to other nodes (in milliseconds)": "节点向其它节点发送存活消息和频率(毫秒). 注意，这与 net_ticktime是不同的; 丢失存活消息不会引起节点掉线",
     "The actual interval will vary depending on how long it takes to execute the operation": "GC 实际间隔将根据执行操作所需的时间而有所不同",
     "The name of a user as which to create the tracing queues and bindings": "用于创建追踪队列的用户",