This repository has been archived by the owner on Apr 5, 2023. It is now read-only.
chore: Move latest HL Fabric code to Fabric-mod #70
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Remove peer configuration cache code (cache configuration being replaced with coreConfig struct). Add error handling for GlobalConfig() loading function. Modified unit tests. Change-Id: Ib80735109b4892a41b319973f0aa65e40677cd5b Signed-off-by: Chongxin Luo <Chongxin.Luo@ibm.com>
Change-Id: I1362e6f65ffbadef05ecbab5bb16f0ecdbb17983 Signed-off-by: Artem Barger <bartem@il.ibm.com>
Change-Id: Ifa700137a2c253f05efd522f86b9eccc1254fb1b Signed-off-by: Artem Barger <bartem@il.ibm.com>
* changes: [FAB-15078] Remove viper from registerDiscoveryService [FAB-15078] Remove viper from node func serve [FAB-15078] Remove viper in peer deliverevents.go
In proactive campaign, picked node starts campaign every TickInterval
till leader is present (either this node successfully claims leadership
or another node was already leader). This is excessive if network
latency is significant, and the term would keep advancing in extreme cases.
The interval of campaign should be increased to
TickInterval * HeartbeatTimeout * 2
Change-Id: I6de195f28b0c259a626628ac3f8ae6a4a7c4571f
Signed-off-by: Jay Guo <guojiannan1101@gmail.com>
* changes: [FAB-15078] Remove old configuration cache code [FAB-15078] Remove viper from start.go subfunctions
The test ensures that a certain amount of sends were invoked on the fake gRPC stream, but it atomically increments it after writing to a channel instead of first atomically incrementing and then writing to the channel (which signals the test goroutine to asserting). Change-Id: I1023685bfc3cf7cf33d7a18136578b3fb075fa30 Signed-off-by: yacovm <yacovm@il.ibm.com>
This CR adds a V2_0 channel capability to support modifying the channel config processing for the impending movement of the orderer endpoints. Change-Id: Id646e3fc048c01f3828620145811fe98ea665b0b Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
This CR adds the ability to specify the orderer endpoints in the channel config at the orderer org level. This leverages the new V2_0 capability, and also relaxes validation of the old orderer address location (which previously did not allow the set of orderer addresses to be empty). Change-Id: Ib717d12ec99e0a9adb45cc8d8214644b408516b2 Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
Change-Id: Ie46bcf148103f29a12a58f5f1f1fae561bb71d55 Signed-off-by: Artem Barger <bartem@il.ibm.com>
* changes: FAB-14158 Add OSN endpoints to orderer org config FAB-14158 Add V2_0 Channel capability
FAB-13680 #done Change-Id: I8249a3b8a61a472d345d8d7fb03b458558d41de5 Signed-off-by: Will Lahti <wtlahti@us.ibm.com>
- Start passing the root file system path used by providers for the various ledger files. - wired through to the ledger provider store - many TODOs left Change-Id: I31e381398e89ff257603afc222a741eee809da28 Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
ledgerconfig.GetMaxBlockFileSize returns a fixed value. Simply replace with a constant at place of use in ledgerstorage. Change-Id: Ib61336d0aaced42d98f8e189725ed007d05cb39f Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
This change set adds an implementation of endpoint criteria, which is going to be used in the peer<-->orderer communication code. It declares an orderer endpoint, and a list of organizations who's root CAs should be loaded in order to establish the TLS root CA cert pool. Change-Id: I409ac8a0316bfd9d888097afdeb0cdf3efbe93b8 Signed-off-by: yacovm <yacovm@il.ibm.com>
This change set adds an implementation of a struct called ConnectionCriteria which defines how we connect to several ordering service endpoints (i.e, globally or per org, which endpoints, etc.). This struct can be converted to EndpointCriteria which is the definition of a single ordering service endpoint. Change-Id: Icc0ae8c6c7364993dbe4fe8862a646ca398ea777 Signed-off-by: yacovm <yacovm@il.ibm.com>
This change set addresses CR comments from FAB-15224, namely makes the string slice equality check more idimatic by defining a type. Change-Id: Ibbbdc543d8ce473865313ffc49d2a6c0e796943e Signed-off-by: yacovm <yacovm@il.ibm.com>
Change-Id: Ib6e61251b0d8628741d2d5ad91223cc23cdbe37b Signed-off-by: Jay Guo <guojiannan1101@gmail.com>
* changes: FAB-15086 Replace GetMaxBlockFileSize w/ constant FAB-15086 Pass file system path via config
Wire block storage directories via config rather than using ledgerconfig. Change-Id: I163592df6bacebf1f882a28ade24d36ad15e41c1 Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
Remove ledgerconfig.GetHistoryLevelDBPath and pass path via config. Change-Id: Ia7b89ebbeb3ae8a760e9a9cf832be31a34553d8b Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
Derive the confighistory db path from Config rather than using ledgerconfig. Change-Id: I3c74915a85eb993d0703ec732304805aaf37ddf1 Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
Wire the storage path for leveldb via config rather than using ledgerconfig. Change-Id: Iaceef32f954c57f38e1148870ef6c2704103e08a Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
Wire config through to bookkeeping db rather than using ledgerconfig Change-Id: I5d3a0b12958e153ebaab0ddfee71cf0b5d405d14 Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
Removed two function which simply return constant values and are not driven via config. Replaced with constants at point of use. Change-Id: I0f3bd4bfbca533a9ac207e2859930d9c9da27318 Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
Change-Id: I203f2d7894b5557475e13b089acc656aa870d1d1 Signed-off-by: Brett Logan <Brett.T.Logan@ibm.com>
Change-Id: I0e260d4278572791b6383c6b3a61db8e25f70f6d Signed-off-by: Brett Logan <Brett.T.Logan@ibm.com>
Change-Id: Ib1b2b92736a32c10e922ad393825589565ed031c Signed-off-by: Brett Logan <Brett.T.Logan@ibm.com>
Maintenance mode is when ConsensusType.State != Normal. When maintenance mode is set, block following broadcast requests: - block new channel creation - block all regular messages - block config updates that are not signed by oderer org admin On maintainenece mode, block deliver requests unless they are coming from an orderer admin client, i.e. block requests from peers. This is done by: - Changing the sigfilter such that in maintenance mode it requires a signature that satisfies a different policy. - In broadcast: /Channel/Orderer/Writers, - In Deliver: /Channel/Orderer/Readers, This will block Broadcast requests with config updates not related to the orderer, and block Deliver requests by peers, which are normally /Channel/Readers. - The msgprocessor ProcessNormalMsg(...) will reject all messages in maintenance mode. - The systemchannel filter will reject new channel creation in maintenance mode. Change-Id: I738eb2cd754d92e2fc906edfa2a5af29a010986e Signed-off-by: Yoav Tock <tock@il.ibm.com>
1. Make the adapter between the gossip layer to the leader election layer return peers that have channel membership instead of basic membership 2. Export IsInMyOrg() in gossipServiceImpl so it could be used in the election adapter 3. Update Gossip counterfeiter mocks in discovery/support/mocks 4. Release RLock in peerMockGossip when g.cluster is nil Change-Id: Ic3dc422e527a0778844851414387e480d23aee65 Signed-off-by: ronenschafferibm <ronen.schaffer@ibm.com>
Change-Id: I860a43bfc26fc9ddfd6ee68c8f97771d7342d01a Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
Change-Id: I1aef842b2bebbcd367b8eabcab62bbb5b09f5e75 Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
Change-Id: Iff99dcd69ca2db59561288fc93d07d3f145d5b7d Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
Logging configuration is no longer done through viper. Change-Id: Ib9895b64ec6ff89b1997a991dbc56dee05f543d4 Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
Move latest HL Fabric code to Fabric-mod Closes 69 Signed-off-by: Rolson Quadras <rolson.quadras@securekey.com>
rolsonquadras
force-pushed
the
fabric-master-merge
branch
from
61c63fc
to
9eb1bd8
Compare
rolsonquadras
changed the title
|
verify-integration |
|
verify-unitest |
fqutishat
approved these changes
May 24, 2019
troyronda
approved these changes
May 24, 2019
rolsonquadras
added a commit
to rolsonquadras/fabric-mod
that referenced
this pull request
May 29, 2019
Add fabric-peer-ext CouchDB hooks which were purged during trustbloc#70 (files were deleted in fabric which had the hooks). Closes trustbloc#74 Signed-off-by: Rolson Quadras <rolson.quadras@securekey.com>
rolsonquadras
added a commit
to rolsonquadras/fabric-mod
that referenced
this pull request
May 29, 2019
Add fabric-peer-ext CouchDB hooks which were purged during trustbloc#70 (files were deleted in fabric which had the hooks). Closes trustbloc#74 Signed-off-by: Rolson Quadras <rolson.quadras@securekey.com>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #69