Double RocksDB Threads

samply · Apr 24, 2022 · 438505a · 438505a
1 parent 13cde98
commit 438505a
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 7 deletions.
diff --git a/dev/blaze/dev/rocksdb.clj b/dev/blaze/dev/rocksdb.clj
@@ -3,23 +3,39 @@
     [blaze.db.kv.rocksdb :as rocksdb]
     [blaze.db.kv.rocksdb-spec]
     [blaze.dev :refer [system]]
-    [clojure.spec.test.alpha :as st]))
+    [clojure.spec.test.alpha :as st])
+  (:import
+    [org.rocksdb Env ThreadStatus]))
 
 
 ;; Spec Instrumentation
 (st/instrument)
 
 
+(defn index-kv-store []
+  (get system [:blaze.db.kv/rocksdb :blaze.db/index-kv-store]))
+
+
 (comment
   (rocksdb/compact-range!
-    (get system :blaze.db.kv/rocksdb)
+    (index-kv-store)
     :resource-as-of-index
     true
     1)
 
   (rocksdb/compact-range!
-    (get system :blaze.db.kv/rocksdb)
+    (index-kv-store)
     :search-param-value-index
     true
     1)
+
+  (mapv
+    (fn [^ThreadStatus status]
+      {:type (.name (.getThreadType status))
+       :operation-type (.name (.getOperationType status))
+       :operation-stage (.name (.getOperationStage status))
+       :operation-elapsed-time (.getOperationElapsedTime status)
+       :db (.getDbName status)
+       :cf (.getCfName status)})
+    (.getThreadList (Env/getDefault)))
   )
diff --git a/modules/rocksdb/src/blaze/db/kv/rocksdb.clj b/modules/rocksdb/src/blaze/db/kv/rocksdb.clj
@@ -14,10 +14,11 @@
     [org.rocksdb
      RocksDB RocksIterator WriteOptions WriteBatch Options ColumnFamilyHandle
      Statistics LRUCache CompactRangeOptions Snapshot ReadOptions
-     StatsLevel HistogramType]))
+     StatsLevel HistogramType Env Priority]))
 
 
 (set! *warn-on-reflection* true)
+(RocksDB/loadLibrary)
 
 
 (deftype RocksKvIterator [^RocksIterator i]
@@ -177,7 +178,6 @@
 (defmethod ig/init-key ::block-cache
   [_ {:keys [size-in-mb] :or {size-in-mb 128}}]
   (log/info (format "Init RocksDB block cache of %d MB" size-in-mb))
-  (RocksDB/loadLibrary)
   (LRUCache. (bit-shift-left size-in-mb 20)))
 
 
@@ -187,6 +187,14 @@
   (.close ^AutoCloseable cache))
 
 
+(defmethod ig/init-key ::env
+  [_ _]
+  (log/info (format "Init RocksDB environment"))
+  (doto (Env/getDefault)
+    (.setBackgroundThreads 2 Priority/HIGH)
+    (.setBackgroundThreads 6 Priority/LOW)))
+
+
 (defmethod ig/pre-init-spec ::kv/rocksdb [_]
   (s/keys :req-un [::dir ::block-cache ::stats] :opt-un [::opts]))
 

diff --git a/modules/rocksdb/src/blaze/db/kv/rocksdb/spec.clj b/modules/rocksdb/src/blaze/db/kv/rocksdb/spec.clj
@@ -4,7 +4,7 @@
     [blaze.db.kv.rocksdb.write-options :as-alias write-options]
     [clojure.spec.alpha :as s])
   (:import
-    [org.rocksdb Cache Statistics]))
+    [org.rocksdb Cache Env Statistics]))
 
 
 (s/def :blaze.db.kv.rocksdb/dir
@@ -15,6 +15,10 @@
   #(instance? Cache %))
 
 
+(s/def :blaze.db.kv.rocksdb/env
+  #(instance? Env %))
+
+
 (s/def :blaze.db.kv.rocksdb/stats
   #(instance? Statistics %))
 

diff --git a/modules/rocksdb/test/blaze/db/kv/rocksdb_test.clj b/modules/rocksdb/test/blaze/db/kv/rocksdb_test.clj
@@ -93,7 +93,9 @@
     :block-cache (ig/ref ::rocksdb/block-cache)
     :stats (ig/ref ::rocksdb/stats)}
    ::rocksdb/block-cache {}
-   ::rocksdb/stats {}})
+   ::rocksdb/env {}
+   ::rocksdb/stats {}
+   ::rocksdb/stats-collector {}})
 
 
 (deftest valid-test

diff --git a/resources/blaze.edn b/resources/blaze.edn
@@ -514,6 +514,8 @@
    :blaze.db.kv.rocksdb/block-cache
    {:size-in-mb #blaze/cfg ["DB_BLOCK_CACHE_SIZE" int? 128]}
 
+   :blaze.db.kv.rocksdb/env {}
+
    :blaze.db.kv.rocksdb/stats-collector
    {:stats
     [["index" #blaze/ref :blaze.db.index-kv-store/stats]
@@ -626,6 +628,8 @@
    :blaze.db.kv.rocksdb/block-cache
    {:size-in-mb #blaze/cfg ["DB_BLOCK_CACHE_SIZE" int? 128]}
 
+   :blaze.db.kv.rocksdb/env {}
+
    [:blaze.db.kv.rocksdb/stats :blaze.db.index-kv-store/stats] {}
 
    :blaze.db.kv.rocksdb/stats-collector