Uploaded image for project: 'Jenkins'
  1. Jenkins
  2. JENKINS-25047

Draft Published and ChangeMerged events not handled correctly when using replication to slaves

    XMLWordPrintable

    Details

    • Similar Issues:

      Description

      The Draft Published event is marked with the RepositoryModifiedEvent interface therefore Gerrit Trigger will attempt to wait for a replication event from Gerrit.

      It will never come so the job will eventually timeout.

      The Change Merged event is NOT marked with the RepositoryModifiedEvent interface therefore Gerrit Trigger will not attempt to wait for a replication event from Gerrit while it should.

        Attachments

          Activity

          Hide
          scm_issue_link SCM/JIRA link daemon added a comment -

          Code changed in jenkins
          User: escoheb
          Path:
          pom.xml
          src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/replication/ReplicationQueueTaskDispatcher.java
          src/test/java/com/sonyericsson/hudson/plugins/gerrit/trigger/gerritnotifier/ParameterExpanderTest.java
          src/test/java/com/sonyericsson/hudson/plugins/gerrit/trigger/mock/Setup.java
          src/test/java/com/sonyericsson/hudson/plugins/gerrit/trigger/replication/ReplicationQueueTaskDispatcherTest.java
          http://jenkins-ci.org/commit/gerrit-trigger-plugin/8c7d0e84d5dc4bf6433cff85b9c61f4373e56366
          Log:
          Fix DraftPublished and ChangeMerged -> Replication

          The Draft Published event is now handled correctly by ensuring that
          Gerrit Trigger does not wait for a replicaton event from the slave.

          The Change Merged event is now handled correctly by ensuring that we
          wait for the replication event for the included patchset on the slave.

          These use cases were covered:

          • The user merges his/her change to master and there is no change in SHA1
            • The replication has already occurred.
          • The user merges his/her change to master and there is a change in SHA1
            since there already other changes merged after the patchset was created.
            • a new replication takes place and must be waited for.

          [FIXED JENKINS-25047]

          Show
          scm_issue_link SCM/JIRA link daemon added a comment - Code changed in jenkins User: escoheb Path: pom.xml src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/replication/ReplicationQueueTaskDispatcher.java src/test/java/com/sonyericsson/hudson/plugins/gerrit/trigger/gerritnotifier/ParameterExpanderTest.java src/test/java/com/sonyericsson/hudson/plugins/gerrit/trigger/mock/Setup.java src/test/java/com/sonyericsson/hudson/plugins/gerrit/trigger/replication/ReplicationQueueTaskDispatcherTest.java http://jenkins-ci.org/commit/gerrit-trigger-plugin/8c7d0e84d5dc4bf6433cff85b9c61f4373e56366 Log: Fix DraftPublished and ChangeMerged -> Replication The Draft Published event is now handled correctly by ensuring that Gerrit Trigger does not wait for a replicaton event from the slave. The Change Merged event is now handled correctly by ensuring that we wait for the replication event for the included patchset on the slave. These use cases were covered: The user merges his/her change to master and there is no change in SHA1 The replication has already occurred. The user merges his/her change to master and there is a change in SHA1 since there already other changes merged after the patchset was created. a new replication takes place and must be waited for. [FIXED JENKINS-25047]

            People

            • Assignee:
              scoheb Scott Hebert
              Reporter:
              scoheb Scott Hebert
            • Votes:
              1 Vote for this issue
              Watchers:
              3 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: