apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-10096 Can't reset integration.api.port and usage.sanity.check.interval (#2274)

Browse Source 
Fix for CLOUDSTACK-7931 enforces a valid integer value to be configured for integration.api.port and usage.sanity.check.interval. These global configs can't be reset back to null(default).
This commit is contained in:
SudharmaJain 2018-01-05 21:52:59 +05:30 committed by Rohit Yadav
parent 5fad84174a
commit b16dcb7174
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/src/com/cloud/api/ApiServer.java
View File

@ -338,6 +338,7 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer
final ConfigurationVO apiPortConfig = values.get(0); final ConfigurationVO apiPortConfig = values.get(0);
if (apiPortConfig.getValue() != null) { if (apiPortConfig.getValue() != null) {
apiPort = Integer.parseInt(apiPortConfig.getValue()); apiPort = Integer.parseInt(apiPortConfig.getValue());
apiPort = (apiPort <= 0) ? null : apiPort;
} }
} }

4
server/src/com/cloud/configuration/Config.java
View File

@ -562,7 +562,7 @@ public enum Config {
"The interval (in milliseconds) when host stats are retrieved from agents.", "The interval (in milliseconds) when host stats are retrieved from agents.",
null), null),
HostRetry("Advanced", AgentManager.class, Integer.class, "host.retry", "2", "Number of times to retry hosts for creating a volume", null), HostRetry("Advanced", AgentManager.class, Integer.class, "host.retry", "2", "Number of times to retry hosts for creating a volume", null),
IntegrationAPIPort("Advanced", ManagementServer.class, Integer.class, "integration.api.port", null, "Default API port", null), IntegrationAPIPort("Advanced", ManagementServer.class, Integer.class, "integration.api.port", null, "Default API port. To disable set it to 0 or negative.", null),
InvestigateRetryInterval( InvestigateRetryInterval(
"Advanced", "Advanced",
HighAvailabilityManager.class, HighAvailabilityManager.class,
@ -1276,7 +1276,7 @@ public enum Config {
Integer.class, Integer.class,
"usage.sanity.check.interval", "usage.sanity.check.interval",
null, null,
"Interval (in days) to check sanity of usage data", "Interval (in days) to check sanity of usage data. To disable set it to 0 or negative.",
null), null),
UsageAggregationTimezone("Usage", ManagementServer.class, String.class, "usage.aggregation.timezone", "GMT", "The timezone to use for usage stats aggregation", null), UsageAggregationTimezone("Usage", ManagementServer.class, String.class, "usage.aggregation.timezone", "GMT", "The timezone to use for usage stats aggregation", null),
TrafficSentinelIncludeZones( TrafficSentinelIncludeZones(