Page MenuHomePhabricator

git-sync on deployment-puppetmaster03 fails to rebase since days ago
Closed, ResolvedPublic

Description

Hi everybody,

git-sync on deployment-puppetmaster03 for puppet fails to rebase since days ago:

[..]
 delete mode 100644 modules/toollabs/manifests/ferm_handlers.pp
 delete mode 100644 modules/toollabs/manifests/proxy.pp
Rebasing (1/18)^MRebasing (2/18)^MRebasing (3/18)^MRebasing (4/18)^MRebasing (5/18)^MRebasing (6/18)^MRebasing (7/18)^Merror: could not apply 4ca798193e... 

[LOCAL HACK] Attempt to secure Puppet DB better

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".'; stderr: 'Could not pick 4ca798193eae42b6dc5ed2079590ff87a5772a00'
2019-10-30T07:30:22Z ERROR    sync-upstream: Rebase failed!

I am not sure how to handle local conflicts in Beta, I pinged @Krenair (that I believe is the one working on the commit causing the conflict) but he may be afk so I am wondering what the procedure should be. Can I temporarily remove the commit to allow git-sync to work? If not, does anybody have context about what it is best to do?

Event Timeline

elukey triaged this task as High priority.Wed, Oct 30, 7:38 AM
elukey created this task.
Restricted Application added a subscriber: Aklapper. · View Herald TranscriptWed, Oct 30, 7:38 AM

You may remove this particular commit.

Generally though, just fix the rebase conflict.

Sure, even if I might not resolve the conflict in the best way and break Beta :)

Also we don't have any alarm about puppet half broken in Beta... Anyway, I fixed manually the rebase as suggested, as FYI I am posting in here the diff:

<<<<<<< HEAD
    nginx::site { 'puppetdb':
=======

    $puppetmasters_hiera = hiera('puppetmaster::servers')
    $puppetmasters = inline_template('<%= @puppetmasters_hiera.values.flatten(1).map { |p| p[\'worker\'] }.sort.join(\' \') %>')

    ::nginx::site { 'puppetdb':
>>>>>>> 4ca798193e... [LOCAL HACK] Attempt to secure Puppet DB better

Mentioned in SAL (#wikimedia-releng) [2019-10-30T09:44:09Z] <elukey> manual rebase fix on deployment-puppetmaster03 to unblock git-sync - T236876

elukey closed this task as Resolved.Wed, Oct 30, 9:46 AM

Sure, even if I might not resolve the conflict in the best way and break Beta :)

As long as you can figure out how to unbreak it I think that's fine. It's only beta.

Also we don't have any alarm about puppet half broken in Beta...

Yeah we really need to sort out monitoring in general across all of labs, but specifically deployment-prep where we have puppetdb etc. I'd like to deploy an icinga instance or something but last I checked prod is using icinga 1.x which is EOL and behind an NDA wall, so...