diff --git a/integration/ledger/snapshot_test.go b/integration/ledger/snapshot_test.go index e9effa22f18..729448de434 100644 --- a/integration/ledger/snapshot_test.go +++ b/integration/ledger/snapshot_test.go @@ -576,9 +576,12 @@ func initAndStartFourOrgsNetwork() *setup { n.Bootstrap() // set ReconcileSleepInterval to 1 second to reconcile pvtdata faster + // set DeprioritizedDataReconcilerInterval to 2 seconds to resume reconciliation quickly + // to prevent CI flake in case peer connection is temporarily lost. for _, p := range n.Peers { core := n.ReadPeerConfig(p) core.Peer.Gossip.PvtData.ReconcileSleepInterval = 1 * time.Second + core.Ledger.PvtdataStore.DeprioritizedDataReconcilerInterval = 2 * time.Second n.WritePeerConfig(p, core) } diff --git a/integration/nwo/core_template.go b/integration/nwo/core_template.go index 8bd1c8257ac..ca8ca8c1de1 100644 --- a/integration/nwo/core_template.go +++ b/integration/nwo/core_template.go @@ -217,6 +217,8 @@ ledger: warmIndexesAfterNBlocks: 1 history: enableHistoryDatabase: true + pvtdataStore: + deprioritizedDataReconcilerInterval: 60m operations: listenAddress: 127.0.0.1:{{ .PeerPort Peer "Operations" }} diff --git a/integration/nwo/fabricconfig/core.go b/integration/nwo/fabricconfig/core.go index 6ce4252be3e..106083961dc 100644 --- a/integration/nwo/fabricconfig/core.go +++ b/integration/nwo/fabricconfig/core.go @@ -294,8 +294,9 @@ type SystemFlags struct { type Ledger struct { // Blockchain - not sure if it's needed - State *StateConfig `yaml:"state,omitempty"` - History *HistoryConfig `yaml:"history,omitempty"` + State *StateConfig `yaml:"state,omitempty"` + History *HistoryConfig `yaml:"history,omitempty"` + PvtdataStore *PvtdataStore `yaml:"pvtdataStore,omitempty"` } type StateConfig struct { @@ -319,6 +320,10 @@ type HistoryConfig struct { EnableHistoryDatabase bool `yaml:"enableHistoryDatabase"` } +type PvtdataStore struct { + DeprioritizedDataReconcilerInterval time.Duration +} + type Operations struct { ListenAddress string `yaml:"listenAddress,omitempty"` TLS *TLS `yaml:"tls"`