Nuria has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/333905 )
Change subject: Update AQS scap configuration
......................................................................
Update AQS scap configuration
- Added the new aqs100[789] hosts
- Removed the old ones (aqs100[123])
- Added explicit de-pooling/pooling during deployments
to avoid user impact.
- Serialized deployment to one host at the time (group_size).
- Added aqs1004 as production canary.
Bug: T156049
Change-Id: I6ae9e1d1f998886d86b806ca41c852ea95ed94e2
---
M scap/aqs-prod
A scap/aqs-prod-canary
M scap/checks.yaml
M scap/scap.cfg
4 files changed, 18 insertions(+), 4 deletions(-)
Approvals:
Mobrovac: Looks good to me, but someone else must approve
Nuria: Verified; Looks good to me, approved
diff --git a/scap/aqs-prod b/scap/aqs-prod
index 4ae1754..cca75b5 100644
--- a/scap/aqs-prod
+++ b/scap/aqs-prod
@@ -1,6 +1,6 @@
-aqs1001.eqiad.wmnet
-aqs1002.eqiad.wmnet
-aqs1003.eqiad.wmnet
-aqs1004.eqiad.wmnet
+# aqs1004.eqiad.wmnet is a canary
aqs1005.eqiad.wmnet
aqs1006.eqiad.wmnet
+aqs1007.eqiad.wmnet
+aqs1008.eqiad.wmnet
+aqs1009.eqiad.wmnet
diff --git a/scap/aqs-prod-canary b/scap/aqs-prod-canary
new file mode 100644
index 0000000..402154a
--- /dev/null
+++ b/scap/aqs-prod-canary
@@ -0,0 +1 @@
+aqs1004.eqiad.wmnet
diff --git a/scap/checks.yaml b/scap/checks.yaml
index 1dc3a41..10d9d14 100644
--- a/scap/checks.yaml
+++ b/scap/checks.yaml
@@ -3,3 +3,11 @@
type: nrpe
stage: restart_service
command: check_endpoints_aqs
+ depool:
+ type: command
+ stage: promote
+ command: depool-aqs
+ repool:
+ type: command
+ stage: restart_service
+ command: pool-aqs
diff --git a/scap/scap.cfg b/scap/scap.cfg
index 650947b..9941f76 100644
--- a/scap/scap.cfg
+++ b/scap/scap.cfg
@@ -19,6 +19,9 @@
service_name: aqs
service_port: 7232
+# Serialize deployments to one host at the time
+group_size: 1
+
# Lock file to prevent multiple concurrent deploys
lock_file: /tmp/scap.aqs.lock
@@ -28,4 +31,6 @@
[wmnet]
git_server: tin.eqiad.wmnet
+server_groups: canary, default
+canary_dsh_targets: aqs-prod-canary
dsh_targets: aqs-prod
--
To view, visit https://gerrit.wikimedia.org/r/333905
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6ae9e1d1f998886d86b806ca41c852ea95ed94e2
Gerrit-PatchSet: 5
Gerrit-Project: analytics/aqs/deploy
Gerrit-Branch: master
Gerrit-Owner: Elukey <ltosc...@wikimedia.org>
Gerrit-Reviewer: Joal <j...@wikimedia.org>
Gerrit-Reviewer: Mobrovac <mobro...@wikimedia.org>
Gerrit-Reviewer: Nuria <nu...@wikimedia.org>
Gerrit-Reviewer: Ottomata <ao...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
