Skip to content

GitLab

Commit ab1b9eed authored by wenjian3's avatar wenjian3
Browse files

FAB-5766 Error handling improvement for ledger (part 3) 



Part 3 of ledger servicebility improvement:
Update common/ledger to use error handling framework

Change-Id: I86383b404941c5f922fa2f26ca71af4d91351d4c
Signed-off-by: default avatarWenjian Qiao <wenjianq@gmail.com>
parent 7893ab37
Hide whitespace changes
Inline Side-by-side
common/ledger/blkstorage/blockstorage.go
View file @ ab1b9eed
/*
Copyright IBM Corp. 2016 All Rights Reserved.
Copyright IBM Corp. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
SPDX-License-Identifier: Apache-2.0
*/
package blkstorage
import (
"errors"
"github.com/hyperledger/fabric/common/ledger"
l "github.com/hyperledger/fabric/core/ledger"
"github.com/hyperledger/fabric/protos/common"
"github.com/hyperledger/fabric/protos/peer"
"github.com/pkg/errors"
)
// IndexableAttr represents an indexable attribute
......@@ -48,7 +37,7 @@ var (
ErrNotFoundInIndex = l.NotFoundInIndexErr("")
// ErrAttrNotIndexed is used to indicate that an attribute is not indexed
ErrAttrNotIndexed = errors.New("Attribute not indexed")
ErrAttrNotIndexed = errors.New("attribute not indexed")
)
// BlockStoreProvider provides an handle to a BlockStore
......
common/ledger/blkstorage/fsblkstorage/block_stream.go
View file @ ab1b9eed
/*
Copyright IBM Corp. 2016 All Rights Reserved.
Copyright IBM Corp. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
SPDX-License-Identifier: Apache-2.0
*/
package fsblkstorage
import (
"bufio"
"errors"
"fmt"
"io"
"os"
"github.com/golang/protobuf/proto"
"github.com/pkg/errors"
)
// ErrUnexpectedEndOfBlockfile error used to indicate an unexpected end of a file segment
......@@ -67,14 +57,14 @@ func newBlockfileStream(rootDir string, fileNum int, startOffset int64) (*blockf
var file *os.File
var err error
if file, err = os.OpenFile(filePath, os.O_RDONLY, 0600); err != nil {
return nil, err
return nil, errors.Wrapf(err, "error opening block file %s", filePath)
}
var newPosition int64
if newPosition, err = file.Seek(startOffset, 0); err != nil {
return nil, err
return nil, errors.Wrapf(err, "error seeking block file [%s] to startOffset [%d]", filePath, startOffset)
}
if newPosition != startOffset {
panic(fmt.Sprintf("Could not seek file [%s] to given startOffset [%d]. New position = [%d]",
panic(fmt.Sprintf("Could not seek block file [%s] to startOffset [%d]. New position = [%d]",
filePath, startOffset, newPosition))
}
s := &blockfileStream{fileNum, file, bufio.NewReader(file), startOffset}
......@@ -97,7 +87,7 @@ func (s *blockfileStream) nextBlockBytesAndPlacementInfo() ([]byte, *blockPlacem
moreContentAvailable := true
if fileInfo, err = s.file.Stat(); err != nil {
return nil, nil, err
return nil, nil, errors.Wrapf(err, "error getting block file stat")
}
if s.currentOffset == fileInfo.Size() {
logger.Debugf("Finished reading file number [%d]", s.fileNum)
......@@ -113,7 +103,7 @@ func (s *blockfileStream) nextBlockBytesAndPlacementInfo() ([]byte, *blockPlacem
}
logger.Debugf("Remaining bytes=[%d], Going to peek [%d] bytes", remainingBytes, peekBytes)
if lenBytes, err = s.reader.Peek(peekBytes); err != nil {
return nil, nil, err
return nil, nil, errors.Wrapf(err, "error peeking [%d] bytes from block file", peekBytes)
}
length, n := proto.DecodeVarint(lenBytes)
if n == 0 {
......@@ -122,7 +112,7 @@ func (s *blockfileStream) nextBlockBytesAndPlacementInfo() ([]byte, *blockPlacem
if !moreContentAvailable {
return nil, nil, ErrUnexpectedEndOfBlockfile
}
panic(fmt.Errorf("Error in decoding varint bytes [%#v]", lenBytes))
panic(errors.Errorf("Error in decoding varint bytes [%#v]", lenBytes))
}
bytesExpected := int64(n) + int64(length)
if bytesExpected > remainingBytes {
......@@ -132,12 +122,12 @@ func (s *blockfileStream) nextBlockBytesAndPlacementInfo() ([]byte, *blockPlacem
}
// skip the bytes representing the block size
if _, err = s.reader.Discard(n); err != nil {
return nil, nil, err
return nil, nil, errors.Wrapf(err, "error discarding [%d] bytes", n)
}
blockBytes := make([]byte, length)
if _, err = io.ReadAtLeast(s.reader, blockBytes, int(length)); err != nil {
logger.Debugf("Error while trying to read [%d] bytes from fileNum [%d]: %s", length, s.fileNum, err)
return nil, nil, err
logger.Errorf("Error reading [%d] bytes from file number [%d], error: %s", length, s.fileNum, err)
return nil, nil, errors.Wrapf(err, "error reading [%d] bytes from file number [%d]", length, s.fileNum)
}
blockPlacementInfo := &blockPlacementInfo{
fileNum: s.fileNum,
......@@ -149,7 +139,7 @@ func (s *blockfileStream) nextBlockBytesAndPlacementInfo() ([]byte, *blockPlacem
}
func (s *blockfileStream) close() error {
return s.file.Close()
return errors.WithStack(s.file.Close())
}
///////////////////////////////////
......@@ -185,7 +175,7 @@ func (s *blockStream) nextBlockBytesAndPlacementInfo() ([]byte, *blockPlacementI
var blockPlacementInfo *blockPlacementInfo
var err error
if blockBytes, blockPlacementInfo, err = s.currentFileStream.nextBlockBytesAndPlacementInfo(); err != nil {
logger.Debugf("current file [%d] length of blockbytes [%d]. Err:%s", s.currentFileNum, len(blockBytes), err)
logger.Errorf("Error reading next block bytes from file number [%d]: %s", s.currentFileNum, err)
return nil, nil, err
}
logger.Debugf("blockbytes [%d] read from file [%d]", len(blockBytes), s.currentFileNum)
......
common/ledger/blkstorage/fsblkstorage/blockfile_helper.go
View file @ ab1b9eed
......@@ -7,7 +7,6 @@ SPDX-License-Identifier: Apache-2.0
package fsblkstorage
import (
"fmt"
"io/ioutil"
"os"
"strconv"
......@@ -15,6 +14,7 @@ import (
"github.com/davecgh/go-spew/spew"
"github.com/hyperledger/fabric/protos/common"
"github.com/pkg/errors"
)
// constructCheckpointInfoFromBlockFiles scans the last blockfile (if any) and construct the checkpoint info
......@@ -45,7 +45,7 @@ func constructCheckpointInfoFromBlockFiles(rootDir string) (*checkpointInfo, err
fileInfo := getFileInfoOrPanic(rootDir, lastFileNum)
logger.Debugf("Last Block file info: FileName=[%s], FileSize=[%d]", fileInfo.Name(), fileInfo.Size())
if lastBlockBytes, endOffsetLastBlock, numBlocksInFile, err = scanForLastCompleteBlock(rootDir, lastFileNum, 0); err != nil {
logger.Errorf("Error while scanning last file [file num=%d]: %s", lastFileNum, err)
logger.Errorf("Error scanning last file [num=%d]: %s", lastFileNum, err)
return nil, err
}
......@@ -54,14 +54,14 @@ func constructCheckpointInfoFromBlockFiles(rootDir string) (*checkpointInfo, err
fileInfo := getFileInfoOrPanic(rootDir, secondLastFileNum)
logger.Debugf("Second last Block file info: FileName=[%s], FileSize=[%d]", fileInfo.Name(), fileInfo.Size())
if lastBlockBytes, _, _, err = scanForLastCompleteBlock(rootDir, secondLastFileNum, 0); err != nil {
logger.Errorf("Error while scanning second last file [file num=%d]: %s", secondLastFileNum, err)
logger.Errorf("Error scanning second last file [num=%d]: %s", secondLastFileNum, err)
return nil, err
}
}
if lastBlockBytes != nil {
if lastBlock, err = deserializeBlock(lastBlockBytes); err != nil {
logger.Errorf("Error deserializing last block: %s. Block bytes length = %d", err, len(lastBlockBytes))
logger.Errorf("Error deserializing last block: %s. Block bytes length: %d", err, len(lastBlockBytes))
return nil, err
}
lastBlockNumber = lastBlock.Header.Number
......@@ -82,7 +82,7 @@ func retrieveLastFileSuffix(rootDir string) (int, error) {
biggestFileNum := -1
filesInfo, err := ioutil.ReadDir(rootDir)
if err != nil {
return -1, err
return -1, errors.Wrapf(err, "error reading dir %s", rootDir)
}
for _, fileInfo := range filesInfo {
name := fileInfo.Name()
......@@ -111,7 +111,7 @@ func getFileInfoOrPanic(rootDir string, fileNum int) os.FileInfo {
filePath := deriveBlockfilePath(rootDir, fileNum)
fileInfo, err := os.Lstat(filePath)
if err != nil {
panic(fmt.Errorf("Error in retrieving file info for file num = %d", fileNum))
panic(errors.Wrapf(err, "error retrieving file info for file number %d", fileNum))
}
return fileInfo
}
common/ledger/blkstorage/fsblkstorage/blockfile_mgr.go
View file @ ab1b9eed
/*
Copyright IBM Corp. 2016 All Rights Reserved.
Copyright IBM Corp. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
SPDX-License-Identifier: Apache-2.0
*/
package fsblkstorage
......@@ -32,6 +22,7 @@ import (
"github.com/hyperledger/fabric/protos/common"
"github.com/hyperledger/fabric/protos/peer"
putil "github.com/hyperledger/fabric/protos/utils"
"github.com/pkg/errors"
)
var logger = flogging.MustGetLogger("fsblkstorage")
......@@ -102,7 +93,7 @@ func newBlockfileMgr(id string, conf *Conf, indexConfig *blkstorage.IndexConfig,
rootDir := conf.getLedgerBlockDir(id)
_, err := util.CreateDirIfMissing(rootDir)
if err != nil {
panic(fmt.Sprintf("Error: %s", err))
panic(fmt.Sprintf("Error creating block storage root dir [%s]: %s", rootDir, err))
}
// Instantiate the manager, i.e. blockFileMgr structure
mgr := &blockfileMgr{rootDir: rootDir, conf: conf, db: indexStore}
......@@ -248,19 +239,17 @@ func (mgr *blockfileMgr) moveToNextFile() {
func (mgr *blockfileMgr) addBlock(block *common.Block) error {
if block.Header.Number != mgr.getBlockchainInfo().Height {
return fmt.Errorf("Block number should have been %d but was %d", mgr.getBlockchainInfo().Height, block.Header.Number)
return errors.Errorf("block number should have been %d but was %d", mgr.getBlockchainInfo().Height, block.Header.Number)
}
blockBytes, info, err := serializeBlock(block)
if err != nil {
return fmt.Errorf("Error while serializing block: %s", err)
return errors.WithMessage(err, "error serializing block")
}
blockHash := block.Header.Hash()
//Get the location / offset where each transaction starts in the block and where the block ends
txOffsets := info.txOffsets
currentOffset := mgr.cpInfo.latestFileChunksize
if err != nil {
return fmt.Errorf("Error while serializing block: %s", err)
}
blockBytesLen := len(blockBytes)
blockBytesEncodedLen := proto.EncodeVarint(uint64(blockBytesLen))
totalBytesToAppend := blockBytesLen + len(blockBytesEncodedLen)
......@@ -282,7 +271,7 @@ func (mgr *blockfileMgr) addBlock(block *common.Block) error {
if truncateErr != nil {
panic(fmt.Sprintf("Could not truncate current file to known size after an error during block append: %s", err))
}
return fmt.Errorf("Error while appending block to file: %s", err)
return errors.WithMessage(err, "error appending block to file")
}
//Update the checkpoint info with the results of adding the new block
......@@ -298,7 +287,7 @@ func (mgr *blockfileMgr) addBlock(block *common.Block) error {
if truncateErr != nil {
panic(fmt.Sprintf("Error in truncating current file to known size after an error in saving checkpoint info: %s", err))
}
return fmt.Errorf("Error while saving current file info to db: %s", err)
return errors.WithMessage(err, "error saving current file info to db")
}
//Index block file location pointer updated with file suffex and offset for the new block
......@@ -375,7 +364,7 @@ func (mgr *blockfileMgr) syncIndex() error {
return err
}
if blockBytes == nil {
return fmt.Errorf("block bytes for block num = [%d] should not be nil here. The indexes for the block are already present",
return errors.Errorf("block bytes for block num = [%d] should not be nil here. The indexes for the block are already present",
lastBlockIndexed)
}
}
......
common/ledger/blkstorage/fsblkstorage/blockfile_rw.go
View file @ ab1b9eed
/*
Copyright IBM Corp. 2016 All Rights Reserved.
Copyright IBM Corp. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
SPDX-License-Identifier: Apache-2.0
*/
package fsblkstorage
import (
"os"
"github.com/pkg/errors"
)
//// WRITER ////
......@@ -56,14 +48,14 @@ func (w *blockfileWriter) append(b []byte, sync bool) error {
func (w *blockfileWriter) open() error {
file, err := os.OpenFile(w.filePath, os.O_RDWR|os.O_APPEND|os.O_CREATE, 0660)
if err != nil {
return err
return errors.Wrapf(err, "error opening block file writer for file %s", w.filePath)
}
w.file = file
return nil
}
func (w *blockfileWriter) close() error {
return w.file.Close()
return errors.WithStack(w.file.Close())
}
//// READER ////
......@@ -74,7 +66,7 @@ type blockfileReader struct {
func newBlockfileReader(filePath string) (*blockfileReader, error) {
file, err := os.OpenFile(filePath, os.O_RDONLY, 0600)
if err != nil {
return nil, err
return nil, errors.Wrapf(err, "error opening block file reader for file %s", filePath)
}
reader := &blockfileReader{file}
return reader, nil
......@@ -84,11 +76,11 @@ func (r *blockfileReader) read(offset int, length int) ([]byte, error) {
b := make([]byte, length)
_, err := r.file.ReadAt(b, int64(offset))
if err != nil {
return nil, err
return nil, errors.Wrapf(err, "error reading block file for offset %d and length %d", offset, length)
}
return b, nil
}
func (r *blockfileReader) close() error {
return r.file.Close()
return errors.WithStack(r.file.Close())
}
common/ledger/blkstorage/fsblkstorage/blockindex.go
View file @ ab1b9eed
/*
Copyright IBM Corp. 2016 All Rights Reserved.
Copyright IBM Corp. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
SPDX-License-Identifier: Apache-2.0
*/
package fsblkstorage
import (
"bytes"
"errors"
"fmt"
"github.com/golang/protobuf/proto"
......@@ -28,6 +17,7 @@ import (
ledgerUtil "github.com/hyperledger/fabric/core/ledger/util"
"github.com/hyperledger/fabric/protos/common"
"github.com/hyperledger/fabric/protos/peer"
"github.com/pkg/errors"
)
const (
......@@ -79,7 +69,7 @@ func newBlockIndex(indexConfig *blkstorage.IndexConfig, db *leveldbhelper.DBHand
// for efficiency purpose - [FAB-10587]
if (indexItemsMap[blkstorage.IndexableAttrTxValidationCode] || indexItemsMap[blkstorage.IndexableAttrBlockTxID]) &&
!indexItemsMap[blkstorage.IndexableAttrTxID] {
return nil, fmt.Errorf("dependent index [%s] is not enabled for [%s] or [%s]",
return nil, errors.Errorf("dependent index [%s] is not enabled for [%s] or [%s]",
blkstorage.IndexableAttrTxID, blkstorage.IndexableAttrTxValidationCode, blkstorage.IndexableAttrBlockTxID)
}
return &blockIndex{indexItemsMap, db}, nil
......@@ -126,8 +116,8 @@ func (index *blockIndex) indexBlock(blockIdxInfo *blockIdxInfo) error {
//Index3 Used to find a transaction by it's transaction id
if _, ok := index.indexItemsMap[blkstorage.IndexableAttrTxID]; ok {
if err = index.markDuplicateTxids(blockIdxInfo); err != nil {
logger.Errorf("error while detecting duplicate txids:%s", err)
return err
logger.Errorf("error detecting duplicate txids: %s", err)
return errors.WithMessage(err, "error detecting duplicate txids")
}
for _, txoffset := range txOffsets {
if txoffset.isDuplicate { // do not overwrite txid entry in the index - FAB-8557
......@@ -299,7 +289,7 @@ func (index *blockIndex) getTxValidationCodeByTxID(txID string) (peer.TxValidati
} else if raw == nil {
return peer.TxValidationCode(-1), blkstorage.ErrNotFoundInIndex
} else if len(raw) != 1 {
return peer.TxValidationCode(-1), errors.New("Invalid value in indexItems")
return peer.TxValidationCode(-1), errors.New("invalid value in indexItems")
}
result := peer.TxValidationCode(int32(raw[0]))
......
common/ledger/blockledger/json/factory.go
View file @ ab1b9eed
/*
Copyright IBM Corp. 2017 All Rights Reserved.
Copyright IBM Corp. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
SPDX-License-Identifier: Apache-2.0
*/
package jsonledger
......@@ -25,6 +15,7 @@ import (
"github.com/golang/protobuf/jsonpb"
"github.com/hyperledger/fabric/common/ledger/blockledger"
"github.com/pkg/errors"
)
type jsonLedgerFactory struct {
......@@ -50,8 +41,8 @@ func (jlf *jsonLedgerFactory) GetOrCreate(chainID string) (blockledger.ReadWrite
logger.Debugf("Initializing chain %s at: %s", chainID, directory)
if err := os.MkdirAll(directory, 0700); err != nil {
logger.Warningf("Failed initializing chain %s: %s", chainID, err)
return nil, err
logger.Errorf("Error initializing channel %s: %s", chainID, err)
return nil, errors.Wrapf(err, "error initializing channel %s", chainID)
}
ch := newChain(directory)
......
common/ledger/blockledger/json/impl.go
View file @ ab1b9eed
/*
Copyright IBM Corp. 2016 All Rights Reserved.
Copyright IBM Corp. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
SPDX-License-Identifier: Apache-2.0
*/
package jsonledger
......@@ -23,13 +13,13 @@ import (
"path/filepath"
"sync"
"github.com/golang/protobuf/jsonpb"
"github.com/hyperledger/fabric/common/flogging"
"github.com/hyperledger/fabric/common/ledger/blockledger"
cb "github.com/hyperledger/fabric/protos/common"
ab "github.com/hyperledger/fabric/protos/orderer"
"github.com/op/go-logging"
"github.com/golang/protobuf/jsonpb"
"github.com/pkg/errors"
)
const pkgLogID = "orderer/ledger/jsonledger"
......@@ -151,11 +141,11 @@ func (jl *jsonLedger) Height() uint64 {
// Append appends a new block to the ledger
func (jl *jsonLedger) Append(block *cb.Block) error {
if block.Header.Number != jl.height {
return fmt.Errorf("Block number should have been %d but was %d", jl.height, block.Header.Number)
return errors.Errorf("block number should have been %d but was %d", jl.height, block.Header.Number)
}
if !bytes.Equal(block.Header.PreviousHash, jl.lastHash) {
return fmt.Errorf("Block should have had previous hash of %x but was %x", jl.lastHash, block.Header.PreviousHash)
return errors.Errorf("block should have had previous hash of %x but was %x", jl.lastHash, block.Header.PreviousHash)
}
jl.writeBlock(block)
......@@ -186,7 +176,7 @@ func (jl *jsonLedger) writeBlock(block *cb.Block) {
err = jl.marshaler.Marshal(file, block)
logger.Debugf("Wrote block %d", block.Header.Number)
if err != nil {
logger.Panic(err)
logger.Panicf("Error marshalling with block number [%d]: %s", block.Header.Number, err)
}
}
......
common/ledger/blockledger/ram/impl.go
View file @ ab1b9eed
/*
Copyright IBM Corp. 2016 All Rights Reserved.
Copyright IBM Corp. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
SPDX-License-Identifier: Apache-2.0
*/
package ramledger
import (
"bytes"
"fmt"
"sync"
"github.com/hyperledger/fabric/common/flogging"
......@@ -26,6 +15,7 @@ import (
cb "github.com/hyperledger/fabric/protos/common"
ab "github.com/hyperledger/fabric/protos/orderer"
"github.com/op/go-logging"
"github.com/pkg/errors"
)
const pkgLogID = "orderer/ledger/ramledger"
......@@ -154,13 +144,13 @@ func (rl *ramLedger) Append(block *cb.Block) error {
defer rl.lock.Unlock()
if block.Header.Number != rl.newest.block.Header.Number+1 {
return fmt.Errorf("Block number should have been %d but was %d",
return errors.Errorf("block number should have been %d but was %d",
rl.newest.block.Header.Number+1, block.Header.Number)
}
if rl.newest.block.Header.Number+1 != 0 { // Skip this check for genesis block insertion
if !bytes.Equal(block.Header.PreviousHash, rl.newest.block.Header.Hash()) {
return fmt.Errorf("Block should have had previous hash of %x but was %x",
return errors.Errorf("block should have had previous hash of %x but was %x",
rl.newest.block.Header.Hash(), block.Header.PreviousHash)
}
}
......
common/ledger/util/ioutil.go
View file @ ab1b9eed
/*
Copyright IBM Corp. 2016 All Rights Reserved.
Copyright IBM Corp. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
SPDX-License-Identifier: Apache-2.0
*/
package util
......@@ -24,6 +14,7 @@ import (
"strings"
"github.com/hyperledger/fabric/common/flogging"
"github.com/pkg/errors"
)
var logger = flogging.MustGetLogger("kvledger.util")
......@@ -38,8 +29,8 @@ func CreateDirIfMissing(dirPath string) (bool, error) {
logDirStatus("Before creating dir", dirPath)
err := os.MkdirAll(path.Dir(dirPath), 0755)
if err != nil {
logger.Debugf("Error while creating dir [%s]", dirPath)
return false, err
logger.Debugf("Error creating dir [%s]", dirPath)
return false,