summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeyton Puckett <peyton.puckett@att.com>2019-10-03 10:47:09 -0500
committerPeyton Puckett <peyton.puckett@att.com>2019-10-07 10:46:44 -0500
commit464b0e5f62167900d6cf60f058628dc273cedbf0 (patch)
tree64dbdeadd92fba905451f213803ee47ae2a51df6
parentdbdfc63ab00ffb6885005f52e506f1b21422ab2b (diff)
Modify property files in active-standby-management
Remove ${env:} and update property syntax Add new property failure.threshold Add new property interval_sec Update: change property syntax back to using ${env:} Update: add 2019 to copyright information Issue-ID: POLICY-2031 Change-Id: I6db10700189197a1306c3b8fa23dff26518be0f3 Signed-off-by: Peyton Puckett <peyton.puckett@att.com>
-rw-r--r--feature-active-standby-management/src/main/feature/config/feature-active-standby-management.properties76
-rw-r--r--feature-active-standby-management/src/test/resources/feature-state-management.properties26
2 files changed, 52 insertions, 50 deletions
diff --git a/feature-active-standby-management/src/main/feature/config/feature-active-standby-management.properties b/feature-active-standby-management/src/main/feature/config/feature-active-standby-management.properties
index 03a5d71a..abd76fc0 100644
--- a/feature-active-standby-management/src/main/feature/config/feature-active-standby-management.properties
+++ b/feature-active-standby-management/src/main/feature/config/feature-active-standby-management.properties
@@ -1,39 +1,39 @@
-###
-# ============LICENSE_START=======================================================
-# feature-active-standby-management
-# ================================================================================
-# Copyright (C) 2017, 2019 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END=========================================================
-###
-
-# DB properties
-javax.persistence.jdbc.driver=org.mariadb.jdbc.Driver
-javax.persistence.jdbc.url=jdbc:mariadb://${env:SQL_HOST}:3306/activestandbymanagement
-javax.persistence.jdbc.user=${env:SQL_USER}
-javax.persistence.jdbc.password=${env:SQL_PASSWORD}
-
-# Must be unique across the system
-resource.name=pdp1
-# Name of the site in which this node is hosted
-site_name=site1
-
-# Needed by DroolsPdpsElectionHandler
-pdp.checkInterval=2500
-pdp.updateInterval=2500
-#pdp.timeout=3000
-# Need long timeout, because testTransaction is only run every 10 seconds.
-pdp.timeout=15000
-#how long do we wait for the pdp table to populate on initial startup
+###
+# ============LICENSE_START=======================================================
+# feature-active-standby-management
+# ================================================================================
+# Copyright (C) 2017, 2019 AT&T Intellectual Property. All rights reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=========================================================
+###
+
+# DB properties
+javax.persistence.jdbc.driver=org.mariadb.jdbc.Driver
+javax.persistence.jdbc.url=jdbc:mariadb://${env:SQL_HOST}:3306/activestandbymanagement
+javax.persistence.jdbc.user=${env:SQL_USER}
+javax.persistence.jdbc.password=${env:SQL_PASSWORD}
+
+# Must be unique across the system
+resource.name=pdp1
+# Name of the site in which this node is hosted
+site_name=site1
+
+# Needed by DroolsPdpsElectionHandler
+pdp.checkInterval=2500
+pdp.updateInterval=2500
+#pdp.timeout=3000
+# Need long timeout, because testTransaction is only run every 10 seconds.
+pdp.timeout=15000
+#how long do we wait for the pdp table to populate on initial startup
pdp.initialWait=20000 \ No newline at end of file
diff --git a/feature-active-standby-management/src/test/resources/feature-state-management.properties b/feature-active-standby-management/src/test/resources/feature-state-management.properties
index ec840901..d6843919 100644
--- a/feature-active-standby-management/src/test/resources/feature-state-management.properties
+++ b/feature-active-standby-management/src/test/resources/feature-state-management.properties
@@ -2,14 +2,14 @@
# ============LICENSE_START=======================================================
# feature-active-standby-management
# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2017, 2019 AT&T Intellectual Property. All rights reserved.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -37,19 +37,19 @@ http.server.services.TEST.port=9981
# Must be unique across the system
resource.name=pdp1
-# Name of the site in which this node is hosted
+# Name of the site in which this node is hosted
site_name = pdp_1
# Forward Progress Monitor update interval seconds
fp_monitor_interval = 2
-# Failed counter threshold before failover
+# Failed counter threshold before failover
failed_counter_threshold = 1
# Interval between test transactions when no traffic seconds
test_trans_interval = 1
-# Interval between writes of the FPC to the DB seconds
+# Interval between writes of the FPC to the DB seconds
write_fpc_interval = 1
-# Node type Note: Make sure you don't leave any trailing spaces, or you'll get an 'invalid node type' error!
+# Node type Note: Make sure you don't leave any trailing spaces, or you'll get an 'invalid node type' error!
node_type = pdp_drools
-# Dependency groups are groups of resources upon which a node operational state is dependent upon.
+# Dependency groups are groups of resources upon which a node operational state is dependent upon.
# Each group is a comma-separated list of resource names and groups are separated by a semicolon. For example:
# dependency_groups=site_1.astra_1,site_1.astra_2;site_1.brms_1,site_1.brms_2;site_1.logparser_1;site_1.pypdp_1
dependency_groups=
@@ -58,14 +58,14 @@ dependency_groups=
test_via_jmx=true
# This is the max number of seconds beyond which a non incrementing FPC is considered a failure
max_fpc_update_interval=5
-# Run the state audit every 60 seconds (60000 ms). The state audit finds stale DB entries in the
-# forwardprogressentity table and marks the node as disabled/failed in the statemanagemententity
+# Run the state audit every 60 seconds (60000 ms). The state audit finds stale DB entries in the
+# forwardprogressentity table and marks the node as disabled/failed in the statemanagemententity
# table. NOTE! It will only run on nodes that have a standbystatus = providingservice.
# A value of <= 0 will turn off the state audit.
state_audit_interval_ms=-1
-# The refresh state audit is run every (default) 10 minutes (600000 ms) to clean up any state corruption in the
+# The refresh state audit is run every (default) 10 minutes (600000 ms) to clean up any state corruption in the
# DB statemanagemententity table. It only refreshes the DB state entry for the local node. That is, it does not
-# refresh the state of any other nodes. A value <= 0 will turn the audit off. Any other value will override
+# refresh the state of any other nodes. A value <= 0 will turn the audit off. Any other value will override
# the default of 600000 ms.
refresh_state_audit_interval_ms=-1
@@ -74,6 +74,8 @@ refresh_state_audit_interval_ms=-1
# Flag to control the execution of the subsystemTest for the Nexus Maven repository
repository.audit.is.active=false
repository.audit.ignore.errors=true
+repository.audit.interval_sec=86400
+repository.audit.failure.threshold=3
# DB Audit Properties
# Flag to control the execution of the subsystemTest for the Database