Skip to content
This repository has been archived by the owner on Sep 2, 2024. It is now read-only.

Conversation

aliok
Copy link
Member

@aliok aliok commented Oct 8, 2021

Fixes #

Proposed Changes

Release Note


Docs

@google-cla google-cla bot added the cla: yes Indicates the PR's author has signed the CLA. label Oct 8, 2021
@knative-prow-robot knative-prow-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Oct 8, 2021
@codecov
Copy link

codecov bot commented Oct 8, 2021

Codecov Report

❗ No coverage uploaded for pull request base (release-0.25@813d807). Click here to learn what that means.
The diff coverage is n/a.

Impacted file tree graph

@@               Coverage Diff               @@
##             release-0.25     #929   +/-   ##
===============================================
  Coverage                ?   74.07%           
===============================================
  Files                   ?      139           
  Lines                   ?     6215           
  Branches                ?        0           
===============================================
  Hits                    ?     4604           
  Misses                  ?     1381           
  Partials                ?      230           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 813d807...2272e11. Read the comment docs.

@knative-metrics-robot
Copy link

The following is the coverage report on the affected files.
Say /test pull-knative-sandbox-eventing-kafka-go-coverage to re-run this coverage report

File Old Coverage New Coverage Delta
pkg/channel/consolidated/dispatcher/dispatcher.go 64.5% 66.1% 1.6
pkg/channel/distributed/dispatcher/controller/kafkachannel.go 87.5% 87.6% 0.1
pkg/common/consumer/consumer_factory.go 87.2% 81.2% -5.9
pkg/common/consumer/consumer_manager.go 96.9% 96.9% 0.0
pkg/common/consumer/consumergroup_offsets_checker.go Do not exist 4.3%
pkg/source/adapter/adapter.go 52.1% 55.4% 3.3

@knative-prow-robot
Copy link
Contributor

@aliok: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-knative-sandbox-eventing-kafka-go-coverage 2272e11 link false /test pull-knative-sandbox-eventing-kafka-go-coverage

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@pierDipi
Copy link
Member

pierDipi commented Oct 8, 2021

All green
/test pull-knative-sandbox-eventing-kafka-upgrade-tests

Copy link
Member

@pierDipi pierDipi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/hold

@knative-prow-robot knative-prow-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 8, 2021
@knative-prow-robot knative-prow-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 8, 2021
@knative-prow-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aliok, pierDipi

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@pierDipi
Copy link
Member

pierDipi commented Oct 8, 2021

All green
/test pull-knative-sandbox-eventing-kafka-upgrade-tests

@aliok
Copy link
Member Author

aliok commented Oct 8, 2021

/test pull-knative-sandbox-eventing-kafka-upgrade-tests
/unhold

All green. Retesting for the last time!

@knative-prow-robot knative-prow-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 8, 2021
@knative-prow-robot knative-prow-robot merged commit 919ec79 into knative-extensions:release-0.25 Oct 8, 2021
@aliok aliok deleted the kafka-ch-event-loss-025-backport-from-026 branch October 8, 2021 21:07
@aliok
Copy link
Member Author

aliok commented Oct 8, 2021

/cherrypick release-0.26

@knative-prow-robot
Copy link
Contributor

@aliok: #929 failed to apply on top of branch "release-0.26":

Applying: Fix Kafka channel event loss during subscription becoming ready
Using index info to reconstruct a base tree...
M	cmd/channel/distributed/dispatcher/main.go
M	pkg/channel/consolidated/dispatcher/dispatcher.go
M	pkg/channel/consolidated/dispatcher/dispatcher_it_test.go
M	pkg/channel/consolidated/dispatcher/dispatcher_test.go
M	pkg/channel/consolidated/reconciler/dispatcher/kafkachannel.go
M	pkg/channel/distributed/dispatcher/controller/kafkachannel.go
M	pkg/channel/distributed/dispatcher/controller/kafkachannel_test.go
M	pkg/channel/distributed/dispatcher/dispatcher/dispatcher.go
M	pkg/channel/distributed/dispatcher/dispatcher/dispatcher_test.go
M	pkg/common/consumer/consumer_factory.go
M	pkg/common/consumer/consumer_factory_test.go
M	pkg/common/consumer/consumer_manager.go
M	pkg/common/consumer/consumer_manager_test.go
A	pkg/common/consumer/consumergroup_offsets_checker.go
M	pkg/common/consumer/testing/mocks.go
M	pkg/source/adapter/adapter.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/source/adapter/adapter.go
CONFLICT (content): Merge conflict in pkg/source/adapter/adapter.go
Auto-merging pkg/common/consumer/testing/mocks.go
CONFLICT (content): Merge conflict in pkg/common/consumer/testing/mocks.go
CONFLICT (modify/delete): pkg/common/consumer/consumergroup_offsets_checker.go deleted in HEAD and modified in Fix Kafka channel event loss during subscription becoming ready. Version Fix Kafka channel event loss during subscription becoming ready of pkg/common/consumer/consumergroup_offsets_checker.go left in tree.
Auto-merging pkg/common/consumer/consumer_manager_test.go
CONFLICT (content): Merge conflict in pkg/common/consumer/consumer_manager_test.go
Auto-merging pkg/common/consumer/consumer_manager.go
CONFLICT (content): Merge conflict in pkg/common/consumer/consumer_manager.go
Auto-merging pkg/common/consumer/consumer_factory_test.go
CONFLICT (content): Merge conflict in pkg/common/consumer/consumer_factory_test.go
Auto-merging pkg/common/consumer/consumer_factory.go
CONFLICT (content): Merge conflict in pkg/common/consumer/consumer_factory.go
Auto-merging pkg/channel/distributed/dispatcher/dispatcher/dispatcher_test.go
CONFLICT (content): Merge conflict in pkg/channel/distributed/dispatcher/dispatcher/dispatcher_test.go
Auto-merging pkg/channel/distributed/dispatcher/dispatcher/dispatcher.go
CONFLICT (content): Merge conflict in pkg/channel/distributed/dispatcher/dispatcher/dispatcher.go
Auto-merging pkg/channel/distributed/dispatcher/controller/kafkachannel_test.go
CONFLICT (content): Merge conflict in pkg/channel/distributed/dispatcher/controller/kafkachannel_test.go
Auto-merging pkg/channel/distributed/dispatcher/controller/kafkachannel.go
CONFLICT (content): Merge conflict in pkg/channel/distributed/dispatcher/controller/kafkachannel.go
Auto-merging pkg/channel/consolidated/reconciler/dispatcher/kafkachannel.go
Auto-merging pkg/channel/consolidated/dispatcher/dispatcher_test.go
CONFLICT (content): Merge conflict in pkg/channel/consolidated/dispatcher/dispatcher_test.go
Auto-merging pkg/channel/consolidated/dispatcher/dispatcher_it_test.go
Auto-merging pkg/channel/consolidated/dispatcher/dispatcher.go
CONFLICT (content): Merge conflict in pkg/channel/consolidated/dispatcher/dispatcher.go
Auto-merging cmd/channel/distributed/dispatcher/main.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix Kafka channel event loss during subscription becoming ready
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-0.26

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

aliok added a commit to aliok/eventing-kafka that referenced this pull request Oct 8, 2021
…extensions#929)

* Fix Kafka channel event loss during subscription becoming ready

* Make it look like knative-extensions#926
aliok added a commit to aliok/eventing-kafka that referenced this pull request Oct 8, 2021
…extensions#929)

* Fix Kafka channel event loss during subscription becoming ready

* Make it look like knative-extensions#926
openshift-merge-robot pushed a commit to openshift-knative/eventing-kafka that referenced this pull request Oct 11, 2021
* [0.25] KafkaChannel to init offsets before dispatcher  (knative-extensions#913)

* Cherry pick 3f2a9d7

[0.24] KafkaChannel to init offsets before dispatcher (knative-extensions#886)

* ./hack/update-codegen.sh

* [0.25] KafkaChannel dispatcher offset checking improvements (knative-extensions#929)

* Fix Kafka channel event loss during subscription becoming ready

* Make it look like knative-extensions#926
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cla: yes Indicates the PR's author has signed the CLA. lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants