Description
Details
| Status | Subtype | Assigned | Task | ||
|---|---|---|---|---|---|
| Resolved | jbond | T315350 Beta cluster Error: 502, Next Hop Connection Failed | |||
| Resolved | jbond | T315394 Remove two cherry-picked reverts from deployment-puppetmaster04 |
Event Timeline
Change 824146 had a related patch set uploaded (by Jbond; author: jbond):
[operations/puppet@production] P:cache::varnish::frontend::text: make esitest ensurable and absent on cloud
https://gerrit.wikimedia.org/r/c/operations/puppet/+/823638,
What error do you see without this revert? as far as i can tell it should be a noop on cloud as is_ats9 defaults to false
I would have thought that with this revert you would also need to revert https://gerrit.wikimedia.org/r/c/operations/puppet/+/816808/3 or you would get an error about a missing esitest class? either way i think that https://gerrit.wikimedia.org/r/c/operations/puppet/+/824146 should resolve the esitest issues.
Change 824150 had a related patch set uploaded (by Jbond; author: jbond):
[operations/puppet@production] C:trafficserver: Ensure we only instantiate the trafficserver class once
Ok i see the issue now i think https://gerrit.wikimedia.org/r/c/operations/puppet/+/824150 should fix this
Change 824150 merged by Jbond:
[operations/puppet@production] C:trafficserver: Ensure we only instantiate the trafficserver class once
Change 824146 merged by Jbond:
[operations/puppet@production] P:cache::varnish::frontend::text: make esitest ensurable and absent on cloud
https://gerrit.wikimedia.org/r/c/operations/puppet/+/823638
https://gerrit.wikimedia.org/r/c/operations/puppet/+/823639
i have merged the two fixes and removed the above cherry-picks however git-sync-upstream is still failing to sync
$ sudo git-sync-upstream [13:57:52] 2022-08-17T14:00:17Z INFO git.cmd: git diff --abbrev=40 --full-index -M --raw --no-color 2022-08-17T14:00:17Z INFO git.cmd: git fetch -v origin 2022-08-17T14:00:17Z INFO git.cmd: git rev-parse --abbrev-ref HEAD -> 0; stdout: 'production' 2022-08-17T14:00:17Z INFO git.cmd: git rev-parse production -> 0; stdout: 'c21b928256cc6a0232eb0447df230229f55b172b' 2022-08-17T14:00:17Z INFO git.cmd: git merge-base 7013681d02b196cb54fa9266ebe63781a462bc18 HEAD -> 0; stdout: '7013681d02b196cb54fa9266ebe63781a462bc18' 2022-08-17T14:00:17Z INFO sync-upstream: Up-to-date: /var/lib/git/operations/puppet 2022-08-17T14:00:17Z INFO git.cmd: git diff --abbrev=40 --full-index -M --raw --no-color 2022-08-17T14:00:17Z INFO git.cmd: git fetch -v origin 2022-08-17T14:00:17Z INFO git.cmd: git rev-parse --abbrev-ref HEAD -> 0; stdout: 'master' 2022-08-17T14:00:17Z INFO git.cmd: git rev-parse master -> 0; stdout: '16b7ca57daa22970736e16f0364514e9dd44bfbb' 2022-08-17T14:00:17Z INFO git.cmd: git merge-base 261a1333681a3f355991be4f62bad6e0d0542b6b HEAD -> 0; stdout: 'd71a99dcc3b1c08e85951d11532d1a770b21eba7' 2022-08-17T14:00:17Z INFO git.cmd: git init -> 0; stdout: 'Initialized empty Git repository in /tmp/snapshot-202208171400/.git/' 2022-08-17T14:00:18Z INFO git.cmd: git fetch -n /var/lib/git/labs/private master:oot-rebase/master 261a1333681a3f355991be4f62bad6e0d0542b6b:oot-rebase/upstream -> 0; stdout: '<OUTPUT_STREAM>'; stderr: 'From /var/lib/git/labs/private * [new branch] master -> oot-rebase/master * [new ref] 261a1333681a3f355991be4f62bad6e0d0542b6b -> oot-rebase/upstream' 2022-08-17T14:00:18Z INFO git.cmd: git checkout oot-rebase/master -> 0; stdout: '<OUTPUT_STREAM>'; stderr: 'Switched to branch 'oot-rebase/master'' 2022-08-17T14:00:22Z INFO git.cmd: git rebase --preserve-merges --stat --strategy=recursive --strategy-option=patience oot-rebase/upstream -> 1; stdout: ' hieradata/common.yaml | 8 ++++++++ hieradata/common/profile/kubernetes.yaml | 12 ++++++++++++ hieradata/common/striker/uwsgi.yaml | 20 -------------------- hieradata/role/common/alerting_host.yaml | 7 +++++++ .../role/common/deployment_server/kubernetes.yaml | 15 +++++++++++++++ hieradata/role/common/redis/misc/slave.yaml | 1 + hieradata/role/common/wikidough.yaml | 7 ------- modules/passwords/templates/root-authorized-keys.erb | 2 ++ .../analytics-platform-eng.keytab | 0 modules/secret/secrets/keyholder/scap | 10 +++++++--- modules/secret/secrets/keyholder/scap.pub | 2 +- modules/secret/secrets/pki/intermediates/etcd.pem | 1 + modules/secret/secrets/scap/phabricator_token | 0 13 files changed, 54 insertions(+), 31 deletions(-) delete mode 100644 hieradata/common/striker/uwsgi.yaml create mode 100644 hieradata/role/common/redis/misc/slave.yaml create mode 100644 modules/secret/secrets/kerberos/keytabs/an-airflow1004.eqiad.wmnet/analytics-platform-eng/analytics-platform-eng.keytab create mode 100644 modules/secret/secrets/pki/intermediates/etcd.pem create mode 100644 modules/secret/secrets/scap/phabricator_token error: could not apply d375b392... [local] Swift keys Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort".'; stderr: 'Could not pick d375b392d023ddf462ebb789028f465281c6aeeb' 2022-08-17T14:00:22Z ERROR sync-upstream: Rebase failed!
I took a quick look but im not too familure with this script so might be better for someone else to take a look at this bit
Mentioned in SAL (#wikimedia-releng) [2022-08-17T14:18:28Z] <zabe> fix merge conflicts in deployment-prep private repo # T315394