[jira] [Commented] (CLOUDSTACK-10096) Can't reset api.integration.port and usage.sanity.check.interval back to null

[ASF GitHub Bot (JIRA)]

    [ 
https://issues.apache.org/jira/browse/CLOUDSTACK-10096?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16313382#comment-16313382
 ] 

ASF GitHub Bot commented on CLOUDSTACK-10096:
---------------------------------------------

rhtyd closed pull request #2274: CLOUDSTACK-10096 Can't reset 
integration.api.port and usage.sanity.ch…
URL: https://github.com/apache/cloudstack/pull/2274
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/server/src/com/cloud/api/ApiServer.java 
b/server/src/com/cloud/api/ApiServer.java
index 9e237741c96..fdabd8c765d 100644
--- a/server/src/com/cloud/api/ApiServer.java
+++ b/server/src/com/cloud/api/ApiServer.java
@@ -336,6 +336,7 @@ public boolean start() {
             final ConfigurationVO apiPortConfig = values.get(0);
             if (apiPortConfig.getValue() != null) {
                 apiPort = Integer.parseInt(apiPortConfig.getValue());
+                apiPort = (apiPort <= 0) ? null : apiPort;
             }
         }
 
diff --git a/server/src/com/cloud/configuration/Config.java 
b/server/src/com/cloud/configuration/Config.java
index bc8272a1b79..a8e24a47806 100644
--- a/server/src/com/cloud/configuration/Config.java
+++ b/server/src/com/cloud/configuration/Config.java
@@ -562,7 +562,7 @@
             "The interval (in milliseconds) when host stats are retrieved from 
agents.",
             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(
             "Advanced",
             HighAvailabilityManager.class,
@@ -1276,7 +1276,7 @@
             Integer.class,
             "usage.sanity.check.interval",
             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),
     UsageAggregationTimezone("Usage", ManagementServer.class, String.class, 
"usage.aggregation.timezone", "GMT", "The timezone to use for usage stats 
aggregation", null),
     TrafficSentinelIncludeZones(


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


> Can't reset api.integration.port and usage.sanity.check.interval back to null
> -----------------------------------------------------------------------------
>
>                 Key: CLOUDSTACK-10096
>                 URL: https://issues.apache.org/jira/browse/CLOUDSTACK-10096
>             Project: CloudStack
>          Issue Type: Bug
>      Security Level: Public(Anyone can view this level - this is the 
> default.) 
>            Reporter: sudharma jain
>
> Fix for CLOUDSTACK-7931 enforces a value to be configured for 
> api.integration.port and usage.sanity.check.interval. These global configs 
> can't be reset back to null(default). 



--
This message was sent by Atlassian JIRA
(v6.4.14#64029)