Open Stack

Hi Sam,
We had similar issue with merge conflict and this was the way( workaround) to solve it.

During debug I saw that 'git pull' from that /var/lib/zuul/git/...  fails with merge conflict.
And deleting the folder of the project 'fixed' the issue.

There was also some email once with tool to 'clean' git orphans in this cache
Explaining that over the time it slows zuul. Maybe infra team can provide more info/tips.

 L.

-----Original Message-----
From: Wan, Sam [mailto:Sam.Wan at emc.com] 
Sent: Wednesday, February 10, 2016 9:42 AM
To: Lenny Verkhovsky <lennyb at mellanox.com>
Cc: OpenStack Infra <openstack-infra at lists.openstack.org>
Subject: RE: [OpenStack-Infra] weird 'Merge Failed.' message commented by zuul

Hi Lenny,
 
 No. 
 I never delete zuul git cache manually.
 Do I need to do that? If yes, when should I do?
 Since the CI master was setup, most actions I did on the master are: restart zuul service, check logs.

 thanks and regards

Sam
________________________________________
From: Lenny Verkhovsky [lennyb at mellanox.com]
Sent: Wednesday, February 10, 2016 2:33 AM
To: Wan, Sam
Cc: OpenStack Infra
Subject: RE: [OpenStack-Infra] weird 'Merge Failed.' message commented by zuul

Did you try to delete zuul git cache /var/lib/zuul/git/  ?

From: Wan, Sam [mailto:Sam.Wan at emc.com]
Sent: Wednesday, February 10, 2016 9:27 AM
To: OpenStack Infra <openstack-infra at lists.openstack.org>
Subject: [OpenStack-Infra] weird 'Merge Failed.' message commented by zuul

Dear all,

   One of our CI ran into a weird issue.
   Yesterday, this CI commented 'Merge Failed.' message about every 20 mins automatically on patches despite there's no merge conflict in code.
   eg: https://review.openstack.org/#/c/272760/
   ---
EMC XIO CI
Patch Set 4: Merge Failed. This change was unable to be automatically merged with the current state of the repository. Please rebase your change and upload a new patchset.
Feb 9 5:27 AM
↩

Patch Set 4:

Merge Failed.

This change was unable to be automatically merged with the current state of the repository. Please rebase your change and upload a new patchset.
EMC XIO CI
Patch Set 4: Merge Failed. This change was unable to be automatically merged with the current state of the repository. Please rebase your change and upload a new patchset.
Feb 9 5:44 AM
↩

Patch Set 4:

Merge Failed.

This change was unable to be automatically merged with the current state of the repository. Please rebase your change and upload a new patchset.
EMC XIO CI
Patch Set 4: Merge Failed. This change was unable to be automatically merged with the current state of the repository. Please rebase your change and upload a new patchset.
Feb 9 6:02 AM
↩

Patch Set 4:

Merge Failed.

This change was unable to be automatically merged with the current state of the repository. Please rebase your change and upload a new patchset.
EMC XIO CI
Patch Set 4: Merge Failed. This change was unable to be automatically merged with the current state of the repository. Please rebase your change and upload a new patchset.
Feb 9 6:21 AM
↩

Patch Set 4:

Merge Failed.

This change was unable to be automatically merged with the current state of the repository. Please rebase your change and upload a new patchset.
EMC XIO CI
Patch Set 4: Merge Failed. This change was unable to be automatically merged with the current state of the repository. Please rebase your change and upload a new patchset.
Feb 9 6:40 AM
-----

 I've checked zuul debug.log and merger-debug.log but not found much errors related to this.
 The only error message I found is something like
---
ERROR zuul.GerritEventConnector: Received unrecognized event type 'ref-replication-done' from Gerrit.   Can not get account information.
ERROR zuul.GerritEventConnector: Received unrecognized event type 'ref-replicated' from Gerrit.     Can not get account information.
---
 What does above error mean？

 Could someone please shed some light on this issue？

 thanks and regards

Sam