Uploaded image for project: 'Bitbucket Data Center'
  1. Bitbucket Data Center
  2. BSERV-10068

Auto Fork Sync sending qualified path refs/heads/<branch> to RemoteEvents

    • Icon: Bug Bug
    • Resolution: Fixed
    • Icon: Low Low
    • 5.4.0, 5.0.8, 5.1.6, 5.2.4, 5.3.2
    • 5.0.0, 5.1.0, 5.2.0, 5.3.0
    • None
    • None

      Summary

      Automatic Fork Sync results in a qualified branch name (refs/heads/<branch>) instead of a short name in Remote Events

      Steps to Reproduce

      1. Enable DEBUG logging on Bitbucket Server
      2. Set up a "SOURCE" repository in Bitbucket Server
      3. Fork the repository to a "TARGET" repository, ensuring Fork Sync is enabled
      4. Merge to the "SOURCE" repository
      5. Wait for Auto Fork Sync to trigger
      6. Check RemoteEvents logs

      Expected Results

      master sent to Remote Events as below:

      2017-08-18 19:17:28,340 DEBUG [events.remote.ratelimit.threads:thread-3]  c.a.e.r.impl.RemoteEventDispatcher Successfully dispatched events Set(com.atlassian.stash.plugin.remote.event.StashBranchChangedRemoteEvent@5d9d7fdc[branchName=master,repositoryProject=TESTING,repositorySlug=source,committer=testuser,sourceId=<null>,sourceUrl=<null>], ...)

      Actual Results

      We see that refs/heads/master is sent to Remote Events in the atlassian-bitbucket.log file:

      2017-08-18 19:17:45,570 DEBUG [events.remote.ratelimit.threads:thread-2]  c.a.e.r.impl.RemoteEventDispatcher Successfully dispatched events Set(com.atlassian.stash.plugin.remote.event.StashBranchChangedRemoteEvent@1bc9c280[branchName=refs/heads/master,repositoryProject=TESTING2,repositorySlug=target,committer=testuser,sourceId=<null>,sourceUrl=<null>], ...)

      Workaround

      You may be able to work around this by manually merging instead of using the auto-sync functionality.

            [BSERV-10068] Auto Fork Sync sending qualified path refs/heads/<branch> to RemoteEvents

            Hello Bryan,

            Thanks for the update.  I can see it now on https://bitbucket.org/product/download-archives

            Mike

            Business Olver added a comment - Hello Bryan, Thanks for the update.  I can see it now on https://bitbucket.org/product/download-archives Mike

            All relevant point releases should now be available.

            Best regards,
            Bryan Turner
            Atlassian Bitbucket

            Bryan Turner (Inactive) added a comment - All relevant point releases should now be available. Best regards, Bryan Turner Atlassian Bitbucket

            Hello Bryan,  

            Thanks for the detailed update.  Please keep me updated when the fix for this issue is available for download.

            Mike

            Business Olver added a comment - Hello Bryan,   Thanks for the detailed update.  Please keep me updated when the fix for this issue is available for download. Mike

            Mike,

            My apologies for the delay on 5.1.6. Shortly after this issue was found and fixed, we received a series of support cases related to SSH hosting using an unacceptable amount of memory. That was eventually traced back to a combination of a change in the version of Plink used by TortoiseGit and a naive behavior in the Apache SSHD library we use. It means one or two slow Windows clients cloning from a repository can cause the server to run out of memory. (The issue is tracked as BSERV-10100, if you're curious.) We've been delaying our next set of point releases to pick up a fix for that and, because it's in such a critical part of the code, we wanted to soak it a little on our internal instances first (which turned out to be a good thing, because we ended up finding a regression caused by our initial fix, which has since been corrected).

            At the moment there's only a single remaining change, and we may delay it out of 5.1.6 entirely rather than hold up the release further. With it currently being the weekend in Sydney nothing further will happen until next week, but I'd expect a series of point releases next week, once Sydney is back online.

            Again, my apologies for the delay.

            Best regards,
            Bryan Turner
            Atlassian Bitbucket

            Bryan Turner (Inactive) added a comment - Mike, My apologies for the delay on 5.1.6. Shortly after this issue was found and fixed, we received a series of support cases related to SSH hosting using an unacceptable amount of memory. That was eventually traced back to a combination of a change in the version of Plink used by TortoiseGit and a naive behavior in the Apache SSHD library we use. It means one or two slow Windows clients cloning from a repository can cause the server to run out of memory. (The issue is tracked as BSERV-10100 , if you're curious.) We've been delaying our next set of point releases to pick up a fix for that and, because it's in such a critical part of the code, we wanted to soak it a little on our internal instances first (which turned out to be a good thing, because we ended up finding a regression caused by our initial fix, which has since been corrected). At the moment there's only a single remaining change, and we may delay it out of 5.1.6 entirely rather than hold up the release further. With it currently being the weekend in Sydney nothing further will happen until next week, but I'd expect a series of point releases next week, once Sydney is back online. Again, my apologies for the delay. Best regards, Bryan Turner Atlassian Bitbucket

            Bryan,  Any update on the availability of this fix in version 5.1.6?

             

            Mike

            Business Olver added a comment - Bryan,  Any update on the availability of this fix in version 5.1.6?   Mike

            lvinnyl added a comment -

            Excellent news, Bryan. Thank you.

            lvinnyl added a comment - Excellent news, Bryan. Thank you.

            A fix for this has been merged. Point releases including the fix will be cut over the next week or two. (There are other bugfixes in flight for the various 5.x releases, and performing a new release may be delayed in order to include other fixes that are near completion.)

            Best regards,
            Bryan Turner
            Atlassian Bitbucket

            Bryan Turner (Inactive) added a comment - A fix for this has been merged. Point releases including the fix will be cut over the next week or two. (There are other bugfixes in flight for the various 5.x releases, and performing a new release may be delayed in order to include other fixes that are near completion.) Best regards, Bryan Turner Atlassian Bitbucket

            I've identified the regression which triggered this behavior change. It's an unintended interaction between changes (some quite old) in different parts of the system, and affects all existing 5.x releases.

            Fix incoming...

            Best regards,
            Bryan Turner
            Atlassian Bitbucket

            Bryan Turner (Inactive) added a comment - I've identified the regression which triggered this behavior change. It's an unintended interaction between changes (some quite old) in different parts of the system, and affects all existing 5.x releases. Fix incoming... Best regards, Bryan Turner Atlassian Bitbucket

            Hello Elias.

            Sorry.  I gave you the Bamboo version.  We went from Bitbucket version 4.7.1 to 5.1.4.

            Mike

            Business Olver added a comment - Hello Elias. Sorry.  I gave you the Bamboo version.  We went from Bitbucket version 4.7.1 to 5.1.4. Mike

            Hi Mike,

            Thanks for your reply. To help our developers get the full picture, I'm interested in the Bitbucket Server versions as well. Could you please clarify if Bitbucket Server was upgraded recently?

            Thanks in advance!

            Elias

            Ellie Z (they/them) added a comment - Hi Mike, Thanks for your reply. To help our developers get the full picture, I'm interested in the Bitbucket Server versions as well. Could you please clarify if Bitbucket Server was upgraded recently? Thanks in advance! Elias

              bturner Bryan Turner (Inactive)
              ezeidan Ellie Z (they/them)
              Affected customers:
              4 This affects my team
              Watchers:
              7 Start watching this issue

                Created:
                Updated:
                Resolved: