pass unreconciled missing data info to ledger from reconciler (#1797)

Signed-off-by: senthil <cendhu@gmail.com>
hyperledger · Sep 16, 2020 · ee2bc1b · ee2bc1b
1 parent bc00758
commit ee2bc1b
Show file tree

Hide file tree

Showing 17 changed files with 122 additions and 116 deletions.
diff --git a/core/chaincode/mock/peer_ledger.go b/core/chaincode/mock/peer_ledger.go
diff --git a/core/committer/committer.go b/core/committer/committer.go
@@ -59,7 +59,7 @@ type Committer interface {
 	// If hashes for some of the private data supplied in this function does not match
 	// the corresponding hash present in the block, the unmatched private data is not
 	// committed and instead the mismatch inforation is returned back
-	CommitPvtDataOfOldBlocks(reconciledPvtdata []*ledger.ReconciledPvtdata) ([]*ledger.PvtdataHashMismatch, error)
+	CommitPvtDataOfOldBlocks(reconciledPvtdata []*ledger.ReconciledPvtdata, unreconciled ledger.MissingPvtDataInfo) ([]*ledger.PvtdataHashMismatch, error)
 
 	// GetMissingPvtDataTracker return the MissingPvtDataTracker
 	GetMissingPvtDataTracker() (ledger.MissingPvtDataTracker, error)

diff --git a/core/committer/committer_impl.go b/core/committer/committer_impl.go
@@ -28,7 +28,7 @@ type PeerLedgerSupport interface {
 
 	CommitLegacy(blockAndPvtdata *ledger.BlockAndPvtData, commitOpts *ledger.CommitOptions) error
 
-	CommitPvtDataOfOldBlocks(reconciledPvtdata []*ledger.ReconciledPvtdata) ([]*ledger.PvtdataHashMismatch, error)
+	CommitPvtDataOfOldBlocks(reconciledPvtdata []*ledger.ReconciledPvtdata, unreconciled ledger.MissingPvtDataInfo) ([]*ledger.PvtdataHashMismatch, error)
 
 	GetBlockchainInfo() (*common.BlockchainInfo, error)
 

diff --git a/core/committer/committer_test.go b/core/committer/committer_test.go
@@ -112,7 +112,7 @@ func (m *mockLedger) CommitLegacy(blockAndPvtdata *ledger2.BlockAndPvtData, comm
 	return args.Error(0)
 }
 
-func (m *mockLedger) CommitPvtDataOfOldBlocks(reconciledPvtdata []*ledger2.ReconciledPvtdata) ([]*ledger2.PvtdataHashMismatch, error) {
+func (m *mockLedger) CommitPvtDataOfOldBlocks(reconciledPvtdata []*ledger2.ReconciledPvtdata, unreconciled ledger2.MissingPvtDataInfo) ([]*ledger2.PvtdataHashMismatch, error) {
 	panic("implement me")
 }
 

diff --git a/core/committer/txvalidator/v14/validator_test.go b/core/committer/txvalidator/v14/validator_test.go
@@ -1519,7 +1519,7 @@ func (m *mockLedger) GetConfigHistoryRetriever() (ledger.ConfigHistoryRetriever,
 	return args.Get(0).(ledger.ConfigHistoryRetriever), nil
 }
 
-func (m *mockLedger) CommitPvtDataOfOldBlocks(reconciledPvtdata []*ledger.ReconciledPvtdata) ([]*ledger.PvtdataHashMismatch, error) {
+func (m *mockLedger) CommitPvtDataOfOldBlocks(reconciledPvtdata []*ledger.ReconciledPvtdata, unreconciled ledger.MissingPvtDataInfo) ([]*ledger.PvtdataHashMismatch, error) {
 	return nil, nil
 }
 

diff --git a/core/ledger/kvledger/kv_ledger.go b/core/ledger/kvledger/kv_ledger.go
@@ -669,7 +669,7 @@ func (l *kvLedger) GetConfigHistoryRetriever() (ledger.ConfigHistoryRetriever, e
 	return l.configHistoryRetriever, nil
 }
 
-func (l *kvLedger) CommitPvtDataOfOldBlocks(reconciledPvtdata []*ledger.ReconciledPvtdata) ([]*ledger.PvtdataHashMismatch, error) {
+func (l *kvLedger) CommitPvtDataOfOldBlocks(reconciledPvtdata []*ledger.ReconciledPvtdata, unreconciled ledger.MissingPvtDataInfo) ([]*ledger.PvtdataHashMismatch, error) {
 	logger.Debugf("[%s:] Comparing pvtData of [%d] old blocks against the hashes in transaction's rwset to find valid and invalid data",
 		l.ledgerID, len(reconciledPvtdata))
 

diff --git a/core/ledger/ledger_interface.go b/core/ledger/ledger_interface.go
@@ -178,7 +178,7 @@ type PeerLedger interface {
 	// If hashes for some of the private data supplied in this function does not match
 	// the corresponding hash present in the block, the unmatched private data is not
 	// committed and instead the mismatch inforation is returned back
-	CommitPvtDataOfOldBlocks(reconciledPvtdata []*ReconciledPvtdata) ([]*PvtdataHashMismatch, error)
+	CommitPvtDataOfOldBlocks(reconciledPvtdata []*ReconciledPvtdata, unreconciled MissingPvtDataInfo) ([]*PvtdataHashMismatch, error)
 	// GetMissingPvtDataTracker return the MissingPvtDataTracker
 	GetMissingPvtDataTracker() (MissingPvtDataTracker, error)
 	// DoesPvtDataInfoExist returns true when
@@ -499,7 +499,6 @@ type KVStateUpdates struct {
 
 // ConfigHistoryRetriever allow retrieving history of collection configs
 type ConfigHistoryRetriever interface {
-	CollectionConfigAt(blockNum uint64, chaincodeName string) (*CollectionConfigInfo, error)
 	MostRecentCollectionConfigBelow(blockNum uint64, chaincodeName string) (*CollectionConfigInfo, error)
 }
 

diff --git a/core/ledger/pvtdatastorage/reconcile_missing_pvtdata.go b/core/ledger/pvtdatastorage/reconcile_missing_pvtdata.go
@@ -14,13 +14,6 @@ import (
 	"github.com/willf/bitset"
 )
 
-type elgMissingDataGroup int
-
-const (
-	prioritized elgMissingDataGroup = iota
-	deprioritized
-)
-
 // CommitPvtDataOfOldBlocks commits the pvtData (i.e., previously missing data) of old blockp.
 // The parameter `blocksPvtData` refers a list of old block's pvtdata which are missing in the pvtstore.
 // Given a list of old block's pvtData, `CommitPvtDataOfOldBlocks` performs the following three

diff --git a/core/ledger/pvtdatastorage/store.go b/core/ledger/pvtdatastorage/store.go
@@ -31,7 +31,7 @@ var (
 	// from other peers. A chance for eligible deprioritized missing data
 	// would be given after giving deprioritizedMissingDataPeriodicity number
 	// of chances to the eligible prioritized missing data
-	deprioritizedMissingDataPeriodicity = 1000
+	deprioritizedMissingDataPeriodicity = 100
 )
 
 // Provider provides handle to specific 'Store' that in turn manages
@@ -423,10 +423,12 @@ func (s *Store) GetMissingPvtDataInfoForMostRecentBlocks(maxBlock int) (ledger.M
 
 	if s.iterSinceDeprioMissingDataAccess == deprioritizedMissingDataPeriodicity {
 		s.iterSinceDeprioMissingDataAccess = 0
+		logger.Debug("fetching missing pvtdata entries from the deprioritized list")
 		return s.getMissingData(elgDeprioritizedMissingDataGroup, maxBlock)
 	}
 
 	s.iterSinceDeprioMissingDataAccess++
+	logger.Debug("fetching missing pvtdata entries from the prioritized list")
 	return s.getMissingData(elgPrioritizedMissingDataGroup, maxBlock)
 }
 

diff --git a/core/peer/mock/peer_ledger.go b/core/peer/mock/peer_ledger.go
diff --git a/gossip/privdata/mocks/committer.go b/gossip/privdata/mocks/committer.go
diff --git a/gossip/privdata/mocks/config_history_retriever.go b/gossip/privdata/mocks/config_history_retriever.go
diff --git a/gossip/privdata/reconcile.go b/gossip/privdata/reconcile.go
@@ -161,14 +161,10 @@ func (r *Reconciler) reconcile() error {
 			logger.Error("reconciliation error when trying to fetch missing items from different peers:", err)
 			return err
 		}
-		if len(fetchedData.AvailableElements) == 0 {
-			logger.Warning("missing private data is not available on other peers")
-			return nil
-		}
 
 		pvtDataToCommit := r.preparePvtDataToCommit(fetchedData.AvailableElements)
-		// commit missing private data that was reconciled and log mismatched
-		pvtdataHashMismatch, err := r.CommitPvtDataOfOldBlocks(pvtDataToCommit)
+		unreconciled := constructUnreconciledMissingData(dig2collectionCfg, fetchedData.AvailableElements)
+		pvtdataHashMismatch, err := r.CommitPvtDataOfOldBlocks(pvtDataToCommit, unreconciled)
 		if err != nil {
 			return errors.Wrap(err, "failed to commit private data")
 		}