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.

Sign up for GitHub

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

Jump to bottom

Back port 2023 - skip empty ledge and 2635 - RetrieveBlockByNumber #2648

Merged
merged 2 commits into from
Jun 7, 2021
Merged

Back port 2023 - skip empty ledge and 2635 - RetrieveBlockByNumber #2648

merged 2 commits into from
Jun 7, 2021

Conversation

Param-S
Copy link
Contributor

@Param-S Param-S commented Jun 7, 2021

Type of change

  • Bug fix
  • Improvement (improvement to code, performance, etc)

Description

Back porting these 2 fixes:

  1. FAB-18276 Ch.Part.API: extractSystemChannel must skip empty ledger (FAB-18276 Ch.Part.API: extractSystemChannel must skip empty ledger #2023)
  2. Added RetrieveBlockByNumber into blockledger (Added RetrieveBlockByNumber into blockledger #2635)

tock-ibm and others added 2 commits June 7, 2021 08:29
@tock-ibm @Param-S
FAB-18276 Ch.Part.API: extractSystemChannel must skip empty ledger (h…
fd76805 
…yperledger#2023)

- orderer/common/server/main.go extractSystemChannel() panics when
it hits an empty ledger.

- In addition this method is not covered with unit tests at all.

- Remove some dead code.

Signed-off-by: Yoav Tock <tock@il.ibm.com>
Change-Id: Ie13156784d2ec600e3f97d34f20f6836b28f7662
@Param-S
Added RetrieveBlockByNumber into blockledger (hyperledger#2635)
8608fac 
GetBlock is used for retrieving a block in ConfigBlockOrPanic
which has overhead of Iterator. It is now simplified by exposing
a BlockStore function RetrieveBlockByNumber.

Signed-off-by: Parameswaran Selvam <parselva@in.ibm.com>
@Param-S Param-S requested a review from a team as a code owner June 7, 2021 17:20
@Param-S
Copy link
Contributor Author

Param-S commented Jun 7, 2021

@manish-sethi created a different PR to backport

  1. 2023 - skip empty ledgee and
  2. 2635 - RetrieveBlockByNumber

I will close other PR #2594

@manish-sethi manish-sethi merged commit 8851da3 into hyperledger:release-2.2 Jun 7, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@manish-sethi manish-sethi manish-sethi approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Param-S @manish-sethi @tock-ibm