Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

optionally read rocksdb configfile #20

Merged
merged 4 commits into from Jul 9, 2018
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.sbt
Expand Up @@ -25,7 +25,7 @@ libraryDependencies ++= Seq(
"org.scalatest" % "scalatest_2.12" % "3.0.4" % "test",
"io.grpc" % "grpc-netty" % com.trueaccord.scalapb.compiler.Version.grpcJavaVersion,
"com.trueaccord.scalapb" %% "scalapb-runtime-grpc" % com.trueaccord.scalapb.compiler.Version.scalapbVersion,
"org.rocksdb" % "rocksdbjni" % "5.1.2",
"org.rocksdb" % "rocksdbjni" % "5.11.3",
"com.github.scopt" %% "scopt" % "3.7.0"
)

Expand Down
10 changes: 7 additions & 3 deletions src/main/scala/com/scalableminds/fossildb/FossilDB.scala
Expand Up @@ -8,9 +8,10 @@ import fossildb.BuildInfo

import scala.concurrent.ExecutionContext

object ConfigDefaults {val port = 7155; val dataDir = "data"; val backupDir = "backup"; val columnFamilies = List()}
object ConfigDefaults {val port = 7155; val dataDir = "data"; val backupDir = "backup"; val columnFamilies = List(); val rocksOptionsFile = None}
case class Config(port: Int = ConfigDefaults.port, dataDir: String = ConfigDefaults.dataDir,
backupDir: String = ConfigDefaults.backupDir, columnFamilies: List[String] = ConfigDefaults.columnFamilies)
backupDir: String = ConfigDefaults.backupDir, columnFamilies: List[String] = ConfigDefaults.columnFamilies,
rocksOptionsFile: Option[String] = ConfigDefaults.rocksOptionsFile)

object FossilDB extends LazyLogging {
def main(args: Array[String]) = {
Expand All @@ -24,7 +25,7 @@ object FossilDB extends LazyLogging {
logger.info("BuildInfo: (" + BuildInfo + ")")
logger.info("Config: " + config)

val storeManager = new StoreManager(Paths.get(config.dataDir), Paths.get(config.backupDir), config.columnFamilies)
val storeManager = new StoreManager(Paths.get(config.dataDir), Paths.get(config.backupDir), config.columnFamilies, config.rocksOptionsFile)

val server = new FossilDBServer(storeManager, config.port, ExecutionContext.global)

Expand All @@ -51,6 +52,9 @@ object FossilDB extends LazyLogging {

opt[Seq[String]]('c', "columnFamilies").required.valueName("<cf1>,<cf2>...").action( (x, c) =>
c.copy(columnFamilies = x.toList) ).text("column families of the database (created if there is no db yet)")

opt[String]('r', "rocksOptionsFile").valueName("<filepath>").action( (x, c) =>
c.copy(rocksOptionsFile = Some(x)) ).text("rocksdb options file. Default: " + ConfigDefaults.rocksOptionsFile)
}

parser.parse(args, Config())
Expand Down
17 changes: 15 additions & 2 deletions src/main/scala/com/scalableminds/fossildb/db/RocksDBStore.scala
Expand Up @@ -10,13 +10,14 @@ import com.typesafe.scalalogging.LazyLogging
import org.rocksdb._

import scala.collection.JavaConverters._
import scala.collection.mutable
import scala.concurrent.Future

case class BackupInfo(id: Int, timestamp: Long, size: Long)

case class KeyValuePair[T](key: String, value: T)

class RocksDBManager(dataDir: Path, columnFamilies: List[String]) extends LazyLogging {
class RocksDBManager(dataDir: Path, columnFamilies: List[String], optionsFilePathOpt: Option[String]) extends LazyLogging {

val (db: RocksDB, columnFamilyHandles) = {
RocksDB.loadLibrary()
Expand All @@ -28,9 +29,21 @@ class RocksDBManager(dataDir: Path, columnFamilies: List[String]) extends LazyLo
new ColumnFamilyDescriptor(columnFamily, columnOptions)
}
val columnFamilyHandles = new util.ArrayList[ColumnFamilyHandle]
val options = new DBOptions()
var options = new DBOptions()
.setCreateIfMissing(true)
.setCreateMissingColumnFamilies(true)
var cfListRef: mutable.Buffer[ColumnFamilyDescriptor] = mutable.Buffer()
optionsFilePathOpt.map { optionsFilePath =>
try {
org.rocksdb.OptionsUtil.loadOptionsFromFile(optionsFilePath, Env.getDefault, options, cfListRef.asJava)
logger.info("successfully loaded rocksdb options from " + optionsFilePath)
} catch {
case e: Exception => {
logger.error("Failed to load rocksdb options from file " + optionsFilePath + ": " + e.getMessage)
System.exit(1)
}
}
}
logger.info("Opening RocksDB at " + dataDir.toAbsolutePath)
val db = RocksDB.open(
options,
Expand Down
Expand Up @@ -6,7 +6,7 @@ package com.scalableminds.fossildb.db
import java.nio.file.Path
import java.util.concurrent.atomic.AtomicBoolean

class StoreManager(dataDir: Path, backupDir: Path, columnFamilies: List[String]) {
class StoreManager(dataDir: Path, backupDir: Path, columnFamilies: List[String], rocksdbOptions: Option[String]) {

var rocksDBManager: Option[RocksDBManager] = None
var stores: Option[Map[String, VersionedKeyValueStore]] = None
Expand All @@ -15,7 +15,7 @@ class StoreManager(dataDir: Path, backupDir: Path, columnFamilies: List[String])

def reInitialize = {
rocksDBManager.map(_.close)
rocksDBManager = Some(new RocksDBManager(dataDir, columnFamilies))
rocksDBManager = Some(new RocksDBManager(dataDir, columnFamilies, rocksdbOptions))
stores = Some(columnFamilies.map { cf =>
val store: VersionedKeyValueStore = new VersionedKeyValueStore(rocksDBManager.get.getStoreForColumnFamily(cf).get)
(cf -> store)
Expand Down
Expand Up @@ -48,7 +48,7 @@ class FossilDBSuite extends FlatSpec with BeforeAndAfterEach {

val columnFamilies = List(collectionA, collectionB)

val storeManager = new StoreManager(dataDir, backupDir, columnFamilies)
val storeManager = new StoreManager(dataDir, backupDir, columnFamilies, None)

serverOpt.map(_.stop())
serverOpt = Some(new FossilDBServer(storeManager, port, ExecutionContext.global))
Expand Down