Use a single leveldb for state maintainance

https://jira.hyperledger.org/browse/FAB-1543 Change-Id: Ib11d1a2fc14cf81dd5380eadf93e73e1c56113e3 Signed-off-by: manish <[email protected]>
hyperledger · Jan 8, 2017 · f0c43f7 · f0c43f7
1 parent 3e534de
commit f0c43f7
Show file tree

Hide file tree

Showing 29 changed files with 885 additions and 197 deletions.
diff --git a/core/chaincode/configer_test.go b/core/chaincode/configer_test.go
@@ -28,6 +28,7 @@ import (
 
 	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric/core/chaincode/shim"
+	"github.com/hyperledger/fabric/core/ledger/ledgermgmt"
 	"github.com/hyperledger/fabric/core/peer"
 	"github.com/hyperledger/fabric/gossip/service"
 	"github.com/hyperledger/fabric/protos/common"
@@ -98,6 +99,8 @@ func TestConfigerInvokeJoinChainWrongParams(t *testing.T) {
 func TestConfigerInvokeJoinChainCorrectParams(t *testing.T) {
 	//t.Skip("Test CI build")
 	viper.Set("peer.fileSystemPath", "/var/hyperledger/test/")
+	ledgermgmt.InitializeTestEnv()
+	defer ledgermgmt.CleanupTestEnv()
 	defer os.RemoveAll("/var/hyperledger/test/")
 
 	e := new(PeerConfiger)

diff --git a/core/chaincode/exectransaction_test.go b/core/chaincode/exectransaction_test.go
@@ -38,6 +38,7 @@ import (
 
 	"github.com/golang/protobuf/proto"
 	"github.com/hyperledger/fabric/core/crypto/primitives"
+	"github.com/hyperledger/fabric/core/ledger/ledgermgmt"
 	"github.com/hyperledger/fabric/core/peer/msp"
 	"github.com/hyperledger/fabric/msp"
 	"github.com/hyperledger/fabric/protos/common"
@@ -114,7 +115,7 @@ func finitPeer(lis net.Listener, chainIDs ...string) {
 		}
 		closeListenerAndSleep(lis)
 	}
-
+	ledgermgmt.CleanupTestEnv()
 	ledgerPath := viper.GetString("peer.fileSystemPath")
 	os.RemoveAll(ledgerPath)
 	os.RemoveAll(filepath.Join(os.TempDir(), "hyperledger"))

diff --git a/core/committer/committer_test.go b/core/committer/committer_test.go
@@ -17,25 +17,25 @@ limitations under the License.
 package committer
 
 import (
-	"os"
 	"testing"
 
-	"github.com/hyperledger/fabric/core/ledger/kvledger"
 	"github.com/hyperledger/fabric/core/ledger/testutil"
+	"github.com/spf13/viper"
 	"github.com/stretchr/testify/assert"
 
+	"github.com/hyperledger/fabric/core/ledger/ledgermgmt"
 	pb "github.com/hyperledger/fabric/protos/peer"
 )
 
 func TestKVLedgerBlockStorage(t *testing.T) {
-	conf := kvledger.NewConf("/tmp/tests/ledger/", 0)
-	defer os.RemoveAll("/tmp/tests/ledger/")
-
-	ledger, _ := kvledger.NewKVLedger(conf)
+	viper.Set("peer.fileSystemPath", "/tmp/fabric/committertest")
+	ledgermgmt.InitializeTestEnv()
+	defer ledgermgmt.CleanupTestEnv()
+	ledger, err := ledgermgmt.CreateLedger("TestLedger")
+	assert.NoError(t, err, "Error while creating ledger: %s", err)
 	defer ledger.Close()
 
 	committer := NewLedgerCommitter(ledger)
-
 	height, err := committer.LedgerHeight()
 	assert.Equal(t, uint64(0), height)
 	assert.NoError(t, err)

diff --git a/core/committer/txvalidator/txvalidator_test.go b/core/committer/txvalidator/txvalidator_test.go
@@ -17,14 +17,14 @@ limitations under the License.
 package txvalidator
 
 import (
-	"os"
 	"testing"
 
-	"github.com/hyperledger/fabric/core/ledger/kvledger"
+	"github.com/hyperledger/fabric/core/ledger/ledgermgmt"
 	"github.com/hyperledger/fabric/core/ledger/testutil"
 	"github.com/hyperledger/fabric/core/ledger/util"
 	"github.com/hyperledger/fabric/protos/common"
 	pb "github.com/hyperledger/fabric/protos/peer"
+	"github.com/spf13/viper"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -36,10 +36,10 @@ func (v *mockVsccValidator) VSCCValidateTx(payload *common.Payload, envBytes []b
 }
 
 func TestKVLedgerBlockStorage(t *testing.T) {
-	conf := kvledger.NewConf("/tmp/tests/ledger/", 0)
-	defer os.RemoveAll("/tmp/tests/ledger/")
-
-	ledger, _ := kvledger.NewKVLedger(conf)
+	viper.Set("peer.fileSystemPath", "/tmp/fabric/txvalidatortest")
+	ledgermgmt.InitializeTestEnv()
+	defer ledgermgmt.CleanupTestEnv()
+	ledger, _ := ledgermgmt.CreateLedger("TestLedger")
 	defer ledger.Close()
 
 	validator := &txValidator{ledger, &mockVsccValidator{}}

diff --git a/core/ledger/kvledger/example/main/example.go b/core/ledger/kvledger/example/main/example.go
@@ -21,15 +21,16 @@ import (
 	"os"
 
 	"github.com/hyperledger/fabric/core/ledger"
-	"github.com/hyperledger/fabric/core/ledger/kvledger"
 	"github.com/hyperledger/fabric/core/ledger/kvledger/example"
+	"github.com/hyperledger/fabric/core/ledger/ledgerconfig"
+	"github.com/hyperledger/fabric/core/ledger/ledgermgmt"
 	"github.com/hyperledger/fabric/core/ledger/testutil"
 	"github.com/hyperledger/fabric/core/ledger/util"
 	"github.com/hyperledger/fabric/protos/common"
 )
 
 const (
-	ledgerPath = "/tmp/test/ledger/kvledger/example"
+	ledgerID = "Default"
 )
 
 var finalLedger ledger.ValidatedLedger
@@ -47,10 +48,10 @@ func init() {
 	// Initialization will get a handle to the ledger at the specified path
 	// Note, if subledgers are supported in the future,
 	// the various ledgers could be created/managed at this level
-	os.RemoveAll(ledgerPath)
-	ledgerConf := kvledger.NewConf(ledgerPath, 0)
+	cleanup()
+	ledgermgmt.Initialize()
 	var err error
-	finalLedger, err = kvledger.NewKVLedger(ledgerConf)
+	finalLedger, err = ledgermgmt.CreateLedger(ledgerID)
 	if err != nil {
 		panic(fmt.Errorf("Error in NewKVLedger(): %s", err))
 	}
@@ -60,7 +61,7 @@ func init() {
 }
 
 func main() {
-	defer finalLedger.Close()
+	defer ledgermgmt.Close()
 
 	// Each of the functions here will emulate endorser, orderer,
 	// and committer by calling ledger APIs to similate the proposal,
@@ -164,3 +165,8 @@ func handleError(err error, quit bool) {
 		}
 	}
 }
+
+func cleanup() {
+	ledgerRootPath := ledgerconfig.GetRootPath()
+	os.RemoveAll(ledgerRootPath)
+}
diff --git a/core/ledger/kvledger/kv_ledger.go b/core/ledger/kvledger/kv_ledger.go
@@ -19,14 +19,13 @@ package kvledger
 import (
 	"errors"
 	"fmt"
-	"strings"
 
 	"github.com/hyperledger/fabric/core/ledger"
 	"github.com/hyperledger/fabric/core/ledger/blkstorage"
 	"github.com/hyperledger/fabric/core/ledger/blkstorage/fsblkstorage"
 	"github.com/hyperledger/fabric/core/ledger/history"
 	"github.com/hyperledger/fabric/core/ledger/kvledger/txmgmt/couchdbtxmgmt"
-	"github.com/hyperledger/fabric/core/ledger/kvledger/txmgmt/statedb/stateleveldb"
+	"github.com/hyperledger/fabric/core/ledger/kvledger/txmgmt/statedb"
 	"github.com/hyperledger/fabric/core/ledger/kvledger/txmgmt/txmgr"
 	"github.com/hyperledger/fabric/core/ledger/kvledger/txmgmt/txmgr/lockbasedtxmgr"
 	"github.com/hyperledger/fabric/core/ledger/ledgerconfig"
@@ -39,45 +38,28 @@ import (
 
 var logger = logging.MustGetLogger("kvledger")
 
-// Conf captures `KVLedger` configurations
-type Conf struct {
-	blockStorageDir  string
-	maxBlockfileSize int
-	txMgrDBPath      string
-}
-
-// NewConf constructs new `Conf`.
-// filesystemPath is the top level directory under which `KVLedger` manages its data
-func NewConf(filesystemPath string, maxBlockfileSize int) *Conf {
-	if !strings.HasSuffix(filesystemPath, "/") {
-		filesystemPath = filesystemPath + "/"
-	}
-	blocksStorageDir := filesystemPath + "blocks"
-	txMgrDBPath := filesystemPath + "txMgmgt/db"
-	return &Conf{blocksStorageDir, maxBlockfileSize, txMgrDBPath}
-}
-
 // KVLedger provides an implementation of `ledger.ValidatedLedger`.
 // This implementation provides a key-value based data model
 type KVLedger struct {
+	ledgerID    string
 	blockStore  blkstorage.BlockStore
 	txtmgmt     txmgr.TxMgr
 	historymgmt history.HistMgr
 }
 
 // NewKVLedger constructs new `KVLedger`
-func NewKVLedger(conf *Conf) (*KVLedger, error) {
-
-	logger.Debugf("Creating KVLedger using config: ", conf)
-
+func NewKVLedger(versionedDBProvider statedb.VersionedDBProvider, ledgerID string) (*KVLedger, error) {
+	logger.Debugf("Creating KVLedger ledgerID=%s: ", ledgerID)
 	attrsToIndex := []blkstorage.IndexableAttr{
 		blkstorage.IndexableAttrBlockHash,
 		blkstorage.IndexableAttrBlockNum,
 		blkstorage.IndexableAttrTxID,
 		blkstorage.IndexableAttrBlockNumTranNum,
 	}
 	indexConfig := &blkstorage.IndexConfig{AttrsToIndex: attrsToIndex}
-	blockStorageConf := fsblkstorage.NewConf(conf.blockStorageDir, conf.maxBlockfileSize)
+
+	blockStorageDir := ledgerconfig.GetBlockStoragePath(ledgerID)
+	blockStorageConf := fsblkstorage.NewConf(blockStorageDir, ledgerconfig.GetMaxBlockfileSize())
 	blockStore := fsblkstorage.NewFsBlockStore(blockStorageConf, indexConfig)
 
 	//State and History database managers
@@ -91,14 +73,14 @@ func NewKVLedger(conf *Conf) (*KVLedger, error) {
 		couchDBDef := ledgerconfig.GetCouchDBDefinition()
 
 		//create new transaction manager based on couchDB
-		txmgmt = couchdbtxmgmt.NewCouchDBTxMgr(&couchdbtxmgmt.Conf{DBPath: conf.txMgrDBPath},
+		txmgmt = couchdbtxmgmt.NewCouchDBTxMgr(&couchdbtxmgmt.Conf{DBPath: ""},
 			couchDBDef.URL,      //couchDB connection URL
 			"system",            //couchDB db name matches ledger name, TODO for now use system ledger, eventually allow passing in subledger name
 			couchDBDef.Username, //enter couchDB id here
 			couchDBDef.Password) //enter couchDB pw here
 	} else {
 		// Fall back to using goleveldb lockbased transaction manager
-		db := stateleveldb.NewVersionedDBProvider(&stateleveldb.Conf{DBPath: conf.txMgrDBPath}).GetDBHandle("Default")
+		db := versionedDBProvider.GetDBHandle(ledgerID)
 		txmgmt = lockbasedtxmgr.NewLockBasedTxMgr(db)
 	}
 
@@ -114,7 +96,7 @@ func NewKVLedger(conf *Conf) (*KVLedger, error) {
 			couchDBDef.Password) //enter couchDB pw here
 	}
 
-	l := &KVLedger{blockStore, txmgmt, historymgmt}
+	l := &KVLedger{ledgerID, blockStore, txmgmt, historymgmt}
 
 	if err := recoverStateDB(l); err != nil {
 		panic(fmt.Errorf(`Error during state DB recovery:%s`, err))