[FAB-11955] Enhanced error message for SB validation

This change set logs cc:coll:key and full block height in case of SBEP validation error. Change-Id: Ie7804c49e0ddfbb3dfcbeda86eaddbb6347528df Signed-off-by: Alessandro Sorniotti <[email protected]> Signed-off-by: Matthias Neugschwandtner <[email protected]>
hyperledger · Sep 11, 2018 · bf71b46 · bf71b46
1 parent 9c4939f
commit bf71b46
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/core/common/validation/statebased/vpmanager.go b/core/common/validation/statebased/vpmanager.go
@@ -14,12 +14,15 @@ import (
 // Validation Parameters for a key could not be
 // supplied because they are being updated
 type ValidationParameterUpdatedError struct {
+	CC     string
+	Coll   string
 	Key    string
 	Height uint64
+	Txnum  uint64
 }
 
 func (f *ValidationParameterUpdatedError) Error() string {
-	return fmt.Sprintf("validation parameters for key %s have been changed in a transaction in block %d", f.Key, f.Height)
+	return fmt.Sprintf("validation parameters for key [%s] in namespace [%s:%s] have been changed in transaction %d of block %d", f.Key, f.CC, f.Coll, f.Txnum, f.Height)
 }
 
 // KeyLevelValidationParameterManager is used by validation plugins in order

diff --git a/core/common/validation/statebased/vpmanagerimpl.go b/core/common/validation/statebased/vpmanagerimpl.go
@@ -219,8 +219,11 @@ func (c *validationContext) waitForValidationResults(kid *ledgerKeyID, blockNum
 	for _, dep := range c.dependenciesForTxnum(kid, txnum) {
 		if valErr := dep.waitForAndRetrieveValidationResult(kid.cc); valErr == nil {
 			return &ValidationParameterUpdatedError{
+				CC:     kid.cc,
+				Coll:   kid.coll,
 				Key:    kid.key,
 				Height: blockNum,
+				Txnum:  txnum,
 			}
 		}
 	}