FAB-15086 Use config for history db path

Remove ledgerconfig.GetHistoryLevelDBPath
and pass path via config.

Change-Id: Ia7b89ebbeb3ae8a760e9a9cf832be31a34553d8b
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>

Author: mastersingh24

core/ledger/kvledger/history/historydb/historyleveldb/historyleveldb.go

@@ -31,8 +31,7 @@ type HistoryDBProvider struct {
 }
 
 // NewHistoryDBProvider instantiates HistoryDBProvider
-func NewHistoryDBProvider() *HistoryDBProvider {
-	dbPath := ledgerconfig.GetHistoryLevelDBPath()
+func NewHistoryDBProvider(dbPath string) *HistoryDBProvider {
 	logger.Debugf("constructing HistoryDBProvider dbPath=%s", dbPath)
 	dbProvider := leveldbhelper.NewProvider(&leveldbhelper.Conf{DBPath: dbPath})
 	return &HistoryDBProvider{dbProvider}

core/ledger/kvledger/history/historydb/historyleveldb/pkg_test.go

@@ -28,7 +28,6 @@ import (
 	"github.com/hyperledger/fabric/core/ledger/kvledger/txmgmt/privacyenabledstate"
 	"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"
 	"github.com/hyperledger/fabric/core/ledger/mock"
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/assert"
@@ -37,16 +36,14 @@ import (
 /////// levelDBLockBasedHistoryEnv //////
 
 type levelDBLockBasedHistoryEnv struct {
-	t                   testing.TB
-	testBlockStorageEnv *testBlockStoreEnv
-
-	testDBEnv          privacyenabledstate.TestEnv
-	testBookkeepingEnv *bookkeeping.TestEnv
-
-	txmgr txmgr.TxMgr
-
+	t                     testing.TB
+	testBlockStorageEnv   *testBlockStoreEnv
+	testDBEnv             privacyenabledstate.TestEnv
+	testBookkeepingEnv    *bookkeeping.TestEnv
+	txmgr                 txmgr.TxMgr
 	testHistoryDBProvider historydb.HistoryDBProvider
 	testHistoryDB         historydb.HistoryDB
+	testHistoryDBPath     string
 }
 
 func newTestHistoryEnv(t *testing.T) *levelDBLockBasedHistoryEnv {
@@ -60,15 +57,27 @@ func newTestHistoryEnv(t *testing.T) *levelDBLockBasedHistoryEnv {
 	testDB := testDBEnv.GetDBHandle(testLedgerID)
 	testBookkeepingEnv := bookkeeping.NewTestEnv(t)
 
+	testHistoryDBPath, err := ioutil.TempDir("", "historyldb")
+	if err != nil {
+		t.Fatalf("Failed to create history database directory: %s", err)
+	}
+
 	txMgr, err := lockbasedtxmgr.NewLockBasedTxMgr(testLedgerID, testDB, nil, nil, testBookkeepingEnv.TestProvider, &mock.DeployedChaincodeInfoProvider{})
 	assert.NoError(t, err)
-	testHistoryDBProvider := NewHistoryDBProvider()
+	testHistoryDBProvider := NewHistoryDBProvider(testHistoryDBPath)
 	testHistoryDB, err := testHistoryDBProvider.GetDBHandle("TestHistoryDB")
 	assert.NoError(t, err)
 
-	return &levelDBLockBasedHistoryEnv{t,
-		blockStorageTestEnv, testDBEnv, testBookkeepingEnv,
-		txMgr, testHistoryDBProvider, testHistoryDB}
+	return &levelDBLockBasedHistoryEnv{
+		t,
+		blockStorageTestEnv,
+		testDBEnv,
+		testBookkeepingEnv,
+		txMgr,
+		testHistoryDBProvider,
+		testHistoryDB,
+		testHistoryDBPath,
+	}
 }
 
 func (env *levelDBLockBasedHistoryEnv) cleanup() {
@@ -78,18 +87,7 @@ func (env *levelDBLockBasedHistoryEnv) cleanup() {
 	env.testBookkeepingEnv.Cleanup()
 	// clean up history
 	env.testHistoryDBProvider.Close()
-	removeDBPath(env.t)
-}
-
-func removeDBPath(t testing.TB) {
-	removePath(t, ledgerconfig.GetHistoryLevelDBPath())
-}
-
-func removePath(t testing.TB, path string) {
-	if err := os.RemoveAll(path); err != nil {
-		t.Fatalf("Err: %s", err)
-		t.FailNow()
-	}
+	os.RemoveAll(env.testHistoryDBPath)
 }
 
 /////// testBlockStoreEnv//////

core/ledger/kvledger/kv_ledger_provider.go

@@ -56,11 +56,9 @@ type Provider struct {
 // This is not thread-safe and assumed to be synchronized be the caller
 func NewProvider() (ledger.PeerLedgerProvider, error) {
 	logger.Info("Initializing ledger provider")
-	// Initialize the history database (index for history of values by key)
-	historydbProvider := historyleveldb.NewHistoryDBProvider()
+
 	logger.Info("ledger provider Initialized")
-	p := &Provider{nil, nil,
-		nil, historydbProvider, nil, nil, nil, nil, nil, nil}
+	p := &Provider{}
 	return p, nil
 }
 
@@ -73,6 +71,10 @@ func (p *Provider) Initialize(initializer *ledger.Initializer) error {
 	idStore := openIDStore(filepath.Join(p.initializer.Config.RootFSPath, "ledgerProvider"))
 	// initialize ledger storage
 	ledgerStoreProvider := ledgerstorage.NewProvider(p.initializer.Config.RootFSPath)
+	// Initialize the history database (index for history of values by key)
+	historydbProvider := historyleveldb.NewHistoryDBProvider(
+		filepath.Join(p.initializer.Config.RootFSPath, "historyLeveldb"),
+	)
 	// initialize config history for chaincode
 	configHistoryMgr := confighistory.NewMgr(initializer.DeployedChaincodeInfoProvider)
 	// initialize the collection eligibility notifier
@@ -88,6 +90,7 @@ func (p *Provider) Initialize(initializer *ledger.Initializer) error {
 
 	p.idStore = idStore
 	p.ledgerStoreProvider = ledgerStoreProvider
+	p.historydbProvider = historydbProvider
 	p.configHistoryMgr = configHistoryMgr
 	p.stateListeners = stateListeners
 	p.collElgNotifier = collElgNotifier

core/ledger/kvledger/kv_ledger_provider_test.go

@@ -227,8 +227,8 @@ func TestLedgerBackup(t *testing.T) {
 	// remove the statedb, historydb, and block indexes (they are supposed to be auto created during opening of an existing ledger)
 	// and rename the originalPath to restorePath
 	assert.NoError(t, os.RemoveAll(ledgerconfig.GetStateLevelDBPath()))
-	assert.NoError(t, os.RemoveAll(ledgerconfig.GetHistoryLevelDBPath()))
 	//TODO: revisit once all paths are derived from Config
+	assert.NoError(t, os.RemoveAll(filepath.Join(originalPath, "historyLeveldb")))
 	assert.NoError(t, os.RemoveAll(filepath.Join(originalPath, "chains", fsblkstorage.IndexDir)))
 	assert.NoError(t, os.Rename(originalPath, restorePath))
 	defer env.cleanup()

core/ledger/ledgerconfig/ledger_config.go

@@ -53,11 +53,6 @@ func GetStateLevelDBPath() string {
 	return filepath.Join(GetRootPath(), confStateleveldb)
 }
 
-// GetHistoryLevelDBPath returns the filesystem path that is used to maintain the history level db
-func GetHistoryLevelDBPath() string {
-	return filepath.Join(GetRootPath(), confHistoryLeveldb)
-}
-
 // GetInternalBookkeeperPath returns the filesystem path that is used for bookkeeping the internal stuff by by KVledger (such as expiration time for pvt)
 func GetInternalBookkeeperPath() string {
 	return filepath.Join(GetRootPath(), confBookkeeper)

core/ledger/ledgerconfig/ledger_config_test.go

@@ -51,7 +51,6 @@ func TestLedgerConfigPathDefault(t *testing.T) {
 	assert.Equal(t, "/var/hyperledger/production/ledgersData", GetRootPath())
 	assert.Equal(t, "/var/hyperledger/production/ledgersData/ledgerProvider", GetLedgerProviderPath())
 	assert.Equal(t, "/var/hyperledger/production/ledgersData/stateLeveldb", GetStateLevelDBPath())
-	assert.Equal(t, "/var/hyperledger/production/ledgersData/historyLeveldb", GetHistoryLevelDBPath())
 	assert.Equal(t, "/var/hyperledger/production/ledgersData/bookkeeper", GetInternalBookkeeperPath())
 }
 
@@ -62,7 +61,6 @@ func TestLedgerConfigPath(t *testing.T) {
 	assert.Equal(t, "/tmp/hyperledger/production/ledgersData", GetRootPath())
 	assert.Equal(t, "/tmp/hyperledger/production/ledgersData/ledgerProvider", GetLedgerProviderPath())
 	assert.Equal(t, "/tmp/hyperledger/production/ledgersData/stateLeveldb", GetStateLevelDBPath())
-	assert.Equal(t, "/tmp/hyperledger/production/ledgersData/historyLeveldb", GetHistoryLevelDBPath())
 	assert.Equal(t, "/tmp/hyperledger/production/ledgersData/bookkeeper", GetInternalBookkeeperPath())
 }