Skip to content

[ZSTAC-86489] Backport ZSTAC-85197 to 5.4.10 #4381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ZStack-Robot wants to merge 1 commit into
base: 5.4.10
Choose a base branch
from
Open

[ZSTAC-86489] Backport ZSTAC-85197 to 5.4.10 #4381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions conf/globalConfig/virutalRouter.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,20 @@
<category>virtualRouter</category>
<type>java.lang.Integer</type>
</config>
<config>
<name>dnsmasq.dnsForwardMax</name>
<description>The maximum number of concurrent DNS queries forwarded by dnsmasq on a virtual router.</description>
<defaultValue>1000</defaultValue>
<category>virtualRouter</category>
<type>java.lang.Integer</type>
</config>
<config>
<name>dnsmasq.cacheSize</name>
<description>The DNS cache size used by dnsmasq on a virtual router.</description>
<defaultValue>10000</defaultValue>
<category>virtualRouter</category>
<type>java.lang.Integer</type>
</config>
<config>
<name>ping.interval</name>
<description>The interval management nodes ping the virtual router agents running virtual router VMs, in seconds</description>
Expand Down
6 changes: 6 additions & 0 deletions ...der/src/main/java/org/zstack/network/service/virtualrouter/VirtualRouterGlobalConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ public class VirtualRouterGlobalConfig {
public static GlobalConfig COMMANDS_PARALELLISM_DEGREE = new GlobalConfig(CATEGORY, "command.parallelismDegree");
@GlobalConfigValidation
public static GlobalConfig RESTART_DNSMASQ_COUNT = new GlobalConfig(CATEGORY, "dnsmasq.restartAfterNumberOfSIGUSER1");
@GlobalConfigValidation(numberGreaterThan = 0)
@BindResourceConfig({VmInstanceVO.class})
public static GlobalConfig DNSMASQ_DNS_FORWARD_MAX = new GlobalConfig(CATEGORY, "dnsmasq.dnsForwardMax");
@GlobalConfigValidation(numberGreaterThan = 0)
@BindResourceConfig({VmInstanceVO.class})
public static GlobalConfig DNSMASQ_CACHE_SIZE = new GlobalConfig(CATEGORY, "dnsmasq.cacheSize");
@GlobalConfigValidation(numberGreaterThan = 1)
public static GlobalConfig PING_INTERVAL = new GlobalConfig(CATEGORY, "ping.interval");
@GlobalConfigValidation
Expand Down