From issues-return-88331-archive-asf-public=cust-asf.ponee.io@cloudstack.apache.org Fri Jan 5 17:24:05 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 52529180647 for ; Fri, 5 Jan 2018 17:24:05 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 428AA160C14; Fri, 5 Jan 2018 16:24:05 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 882EF160C19 for ; Fri, 5 Jan 2018 17:24:04 +0100 (CET) Received: (qmail 32224 invoked by uid 500); 5 Jan 2018 16:24:03 -0000 Mailing-List: contact issues-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list issues@cloudstack.apache.org Received: (qmail 32215 invoked by uid 500); 5 Jan 2018 16:24:03 -0000 Delivered-To: apmail-incubator-cloudstack-issues@incubator.apache.org Received: (qmail 32212 invoked by uid 99); 5 Jan 2018 16:24:03 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Jan 2018 16:24:03 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 240EB1A0117 for ; Fri, 5 Jan 2018 16:24:03 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -99.911 X-Spam-Level: X-Spam-Status: No, score=-99.911 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_LOW=-0.7, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01, USER_IN_WHITELIST=-100] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id zZYMzrFzdg7L for ; Fri, 5 Jan 2018 16:24:02 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTP id 1CC5B5FB16 for ; Fri, 5 Jan 2018 16:24:01 +0000 (UTC) Received: from jira-lw-us.apache.org (unknown [207.244.88.139]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 9C44EE0DE3 for ; Fri, 5 Jan 2018 16:24:00 +0000 (UTC) Received: from jira-lw-us.apache.org (localhost [127.0.0.1]) by jira-lw-us.apache.org (ASF Mail Server at jira-lw-us.apache.org) with ESMTP id 2FD21212F7 for ; Fri, 5 Jan 2018 16:24:00 +0000 (UTC) Date: Fri, 5 Jan 2018 16:24:00 +0000 (UTC) From: "ASF GitHub Bot (JIRA)" To: cloudstack-issues@incubator.apache.org Message-ID: In-Reply-To: References: Subject: [jira] [Commented] (CLOUDSTACK-10096) Can't reset api.integration.port and usage.sanity.check.interval back to null MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-JIRA-FingerPrint: 30527f35849b9dde25b450d4833f0394 [ https://issues.apache.org/jira/browse/CLOUDSTACK-10096?page=3Dcom.atl= assian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId= =3D16313382#comment-16313382 ]=20 ASF GitHub Bot commented on CLOUDSTACK-10096: --------------------------------------------- rhtyd closed pull request #2274: CLOUDSTACK-10096 Can't reset integration.a= pi.port and usage.sanity.ch=E2=80=A6 URL: https://github.com/apache/cloudstack/pull/2274 =20 =20 =20 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 =3D values.get(0); if (apiPortConfig.getValue() !=3D null) { apiPort =3D Integer.parseInt(apiPortConfig.getValue()); + apiPort =3D (apiPort <=3D 0) ? null : apiPort; } } =20 diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/co= m/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( =20 ---------------------------------------------------------------- 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. =20 For queries about this service, please contact Infrastructure at: users@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-100= 96 > Project: CloudStack > Issue Type: Bug > Security Level: Public(Anyone can view this level - this is the defa= ult.)=20 > Reporter: sudharma jain > > Fix for CLOUDSTACK-7931 enforces a value to be configured for api.integra= tion.port and usage.sanity.check.interval. These global configs can't be re= set back to null(default).=20 -- This message was sent by Atlassian JIRA (v6.4.14#64029)