Uploaded image for project: 'Bamboo Data Center'
  1. Bamboo Data Center
  2. BAM-14949

Bug in the SSH proxy prevents git merge

    XMLWordPrintable

Details

    Description

      Recently in Bamboo 5.6, git merges fails on first attempt. It takes a re-run a couple of re-runs to get this working. This happens when using the ssh git server. Bamboo will fail with error messages like:

      2014-08-06 15:43:50,641 WARN [3-DelayedChangeDetectionThread:pool-7-thread-14] [ChainExecutionManagerImpl] Exception during push: com.atlassian.bamboo.plugins.git.GitCommandException: command /usr/bin/git push ssh://b33e6530-0402-4ca1-bb24-cb094eddfdc9@127.0.0.1:54460/test/test.git bugfix/test failed with code 1. Working directory was [/var/atlassian/application-data/bamboo/xml-data/build-dir/serverSide/TESTA-TSTA25-3/mergeWorkspace]., stderr:
      Warning: Permanently added '[127.0.0.1]:54460' (RSA) to the list of known hosts.
      error: unpack failed: eof before pack header was fully read
      fatal: The remote end hung up unexpectedly
      error: error in sideband demultiplexer
      To ssh://b33e6530-0402-4ca1-bb24-cb094eddfdc9@127.0.0.1:54460/kep/kepler.git
       ! [remote rejected] bugfix/test2 -> bugfix/test (unpacker error)
      error: failed to push some refs to 'ssh://b33e6530-0402-4ca1-bb24-cb094eddfdc9@127.0.0.1:54460/test/test.git'
      2014-08-06 15:43:50,642 WARN [3-DelayedChangeDetectionThread:pool-7-thread-14] [ChainExecutionManagerImpl] Unable to push TESTA-TSTA25-3 merge result: MergeResultSummaryImpl{integrationStrategy='BRANCH_UPDATER', mergeState='SUCCESS', pushState='FAILED', failureReason='Exception during push: com.atlassian.bamboo.plugins.git.GitCommandException: command /usr/bin/git push ssh://b33e6530-0402-4ca1-bb24-cb094eddfdc9@127.0.0.1:54460/test/test.git bugfix/test1 failed with code 1. Working directory was [/var/atlassian/application-data/bamboo/xml-data/build-dir/serverSide/TESTA-TSTA25-3/mergeWorkspace]., stderr:
      Warning: Permanently added '[127.0.0.1]:54460' (RSA) to the list of known hosts.
      error: unpack failed: eof before pack header was fully read
      fatal: The remote end hung up unexpectedly
      error: error in sideband demultiplexer
      

      Attachments

        Issue Links

          Activity

            People

              Unassigned Unassigned
              smaiyaki Sultan Maiyaki (Inactive)
              Votes:
              12 Vote for this issue
              Watchers:
              15 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: