Merge pull request #1505 from CortexFoundation/dev

pebble engine default

cmd/utils/flags.go

@@ -139,8 +139,8 @@ var (
  }
  DBEngineFlag = &cli.StringFlag{
  Name: "db.engine",
- Usage: "Backing database implementation to use ('leveldb' or 'pebble')",
- Value: "leveldb",
+ Usage: "Backing database implementation to use ('pebble' or 'leveldb')",
+ Value: node.DefaultConfig.DBEngine,
  }
  AncientFlag = DirectoryFlag{
  Name: "datadir.ancient",

core/rawdb/database.go

@@ -344,6 +344,12 @@ type OpenOptions struct {
 // db is non-existent | leveldb default | specified type
 // db is existent | from db | specified type (if compatible)
 func openKeyValueDatabase(o OpenOptions) (ctxcdb.Database, error) {
+ // Reject any unsupported database type
+ if len(o.Type) != 0 && o.Type != dbLeveldb && o.Type != dbPebble {
+ return nil, fmt.Errorf("unknown db.engine %v", o.Type)
+ }
+ // Retrieve any pre-existing database's type and use that or the requested one
+ // as long as there's no conflict between the two types
  existingDb := hasPreexistingDb(o.Directory)
  if len(existingDb) != 0 && len(o.Type) != 0 && o.Type != existingDb {
  return nil, fmt.Errorf("db.engine choice was %v but found pre-existing %v database in specified data directory", o.Type, existingDb)
@@ -356,12 +362,19 @@ func openKeyValueDatabase(o OpenOptions) (ctxcdb.Database, error) {
  return nil, errors.New("db.engine 'pebble' not supported on this platform")
  }
  }
- if len(o.Type) != 0 && o.Type != dbLeveldb {
- return nil, fmt.Errorf("unknown db.engine %v", o.Type)
+ if o.Type == dbLeveldb || existingDb == dbLeveldb {
+ log.Info("Using leveldb as the backing database")
+ return NewLevelDBDatabase(o.Directory, o.Cache, o.Handles, o.Namespace, o.ReadOnly)
+ }
+ // No pre-existing database, no user-requested one either. Default to Pebble
+ // on supported platforms and LevelDB on anything else.
+ if PebbleEnabled {
+ log.Info("Defaulting to pebble as the backing database")
+ return NewPebbleDBDatabase(o.Directory, o.Cache, o.Handles, o.Namespace, o.ReadOnly)
+ } else {
+ log.Info("Defaulting to leveldb as the backing database")
+ return NewLevelDBDatabase(o.Directory, o.Cache, o.Handles, o.Namespace, o.ReadOnly)
  }
- log.Info("Using leveldb as the backing database")
- // Use leveldb, either as default (no explicit choice), or pre-existing, or chosen explicitly
- return NewLevelDBDatabase(o.Directory, o.Cache, o.Handles, o.Namespace, o.ReadOnly)
 }
 
 // Open opens both a disk-based key-value database such as leveldb or pebble, but also

ctxcdb/pebble/pebble.go

@@ -222,14 +222,17 @@ func (d *Database) Close() error {
  d.quitLock.Lock()
  defer d.quitLock.Unlock()
 
- if d.quitChan != nil {
- errc := make(chan error)
- d.quitChan <- errc
- if err := <-errc; err != nil {
- d.log.Error("Metrics collection failed", "err", err)
- }
- d.quitChan = nil
+ // Allow double closing, simplifies things
+ if d.quitChan == nil {
+ return nil
+ }
+ errc := make(chan error)
+ d.quitChan <- errc
+ if err := <-errc; err != nil {
+ d.log.Error("Metrics collection failed", "err", err)
  }
+ d.quitChan = nil
+
  return d.db.Close()
 }