Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Log proposal response differences (backport #3420) #3434

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented May 20, 2022

This is an automatic backport of pull request #3420 done by Mergify.
Cherry-pick of 863cdd7 has failed:

On branch mergify/bp/release-2.4/pr-3420
Your branch is up to date with 'origin/release-2.4'.

You are currently cherry-picking commit 863cdd788.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   internal/pkg/gateway/apiutils.go
	new file:   internal/pkg/gateway/apiutils_test.go
	modified:   internal/pkg/gateway/endorsement.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   internal/pkg/gateway/api_test.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

In the gateway, if proposal responses from different endorsing peers don’t match, then it’s very difficult for the end user to diagnose why.  This commit adds extra logging to help identify the cause of the mismatch.

If the log level is set to ‘debug’ for the ‘gateway’, then the proposal response payloads are unmarshalled and analysed to log specific differences between individual key/values in the read/write sets, SBE policy write differences, event differences and chaincode response differences.  For private collections, only the hashes are logged if they are different.

Signed-off-by: andrew-coleman <[email protected]>
(cherry picked from commit 863cdd7)

# Conflicts:
#	internal/pkg/gateway/api_test.go
@mergify mergify bot requested a review from a team as a code owner May 20, 2022 15:54
@mergify mergify bot added the conflicts label May 20, 2022
@denyeart denyeart closed this May 20, 2022
@mergify mergify bot deleted the mergify/bp/release-2.4/pr-3420 branch May 20, 2022 16:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants