Separate Cassandra deps (#151)

yito88 · web-flow · commit efc0002c1043 · 2025-07-07T09:28:34.000+09:00
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -46,7 +46,7 @@ jobs:
     - name: Run test for ScalarDB
       run: |
         cd scalardb
-        lein cloverage
+        lein with-profile dev,cassandra cloverage
 
     - name: Run test for ScalarDL
       run: |
diff --git a/.github/workflows/cluster-test.yml b/.github/workflows/cluster-test.yml
@@ -139,11 +139,6 @@ jobs:
           namespace: metallb-system
         EOF
 
-    - name: Install dependencies
-      run: |
-        cd cassandra
-        lein install
-
     - name: ScalarDB Cluster test
       run: |
         cd scalardb
diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml
@@ -135,11 +135,6 @@ jobs:
           namespace: metallb-system
         EOF
 
-    - name: Install dependencies
-      run: |
-        cd cassandra
-        lein install
-
     - name: ${{ matrix.tests.name }}
       run: |
         cd scalardb
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -35,7 +35,7 @@ jobs:
     - name: ScalarDB test
       run: |
         docker exec jepsen-control bash -c "cd /scalar-jepsen/cassandra && lein install"
-        docker exec jepsen-control bash -c "cd /scalar-jepsen/scalardb && lein run test --workload transfer --nodes n1,n2,n3 --ssh-private-key ~/.ssh/id_rsa"
+        docker exec jepsen-control bash -c "cd /scalar-jepsen/scalardb && lein with-profile cassandra run test --workload transfer --nodes n1,n2,n3 --ssh-private-key ~/.ssh/id_rsa"
 
   cluster:
     runs-on: ubuntu-latest
@@ -118,11 +118,6 @@ jobs:
           namespace: metallb-system
         EOF
 
-    - name: Install dependencies
-      run: |
-        cd cassandra
-        lein install
-
     - name: ScalarDB Cluster test
       run: |
         cd scalardb
diff --git a/scalardb/project.clj b/scalardb/project.clj
@@ -7,7 +7,6 @@
                  [net.java.dev.jna/jna "5.11.0"]
                  [net.java.dev.jna/jna-platform "5.11.0"]
                  [org.slf4j/slf4j-jdk14 "2.0.6"]
-                 [cassandra "0.1.0-SNAPSHOT" :exclusions [org.apache.commons/commons-lang3]]
                  [cheshire "5.12.0"]
                  [clj-commons/clj-yaml "1.0.29"]
                  [com.scalar-labs/scalardb-schema-loader "4.0.0-SNAPSHOT"]
@@ -22,19 +21,22 @@
                                                          com.azure/azure-cosmos
                                                          io.grpc/grpc-core
                                                          com.scalar-labs/scalardb-rpc]]]}
+             :cassandra {:dependencies [[cassandra "0.1.0-SNAPSHOT"
+                                         :exclusions [org.apache.commons/commons-lang3]]]
+                         :env {:cassandra? "true"}}
              :cluster {:dependencies [[com.scalar-labs/scalardb-cluster-java-client-sdk "4.0.0-SNAPSHOT"
                                        ;; avoid the netty dependency issue
                                        :exclusions [software.amazon.awssdk/*
                                                     com.oracle.database.jdbc/ojdbc8-production
                                                     com.azure/azure-cosmos
                                                     com.scalar-labs/scalardb-rpc]]]
                        :env {:scalardb-cluster-version "4.0.0-SNAPSHOT"
-                             :helm-chart-version "1.7.2"}
-                       :plugins [[lein-environ "1.2.0"]]}
+                             :helm-chart-version "1.7.2"}}
              :use-jars {:dependencies [[com.google.guava/guava "31.1-jre"]
                                        [org.apache.commons/commons-text "1.13.0"]]
                         :resource-paths ["resources/scalardb.jar"]}
              :default [:base :system :user :provided :dev :use-released]}
+  :plugins [[lein-environ "1.2.0"]]
   :jvm-opts ["-Djava.awt.headless=true" "-Xmx4g"]
   :main scalardb.runner
   :aot [scalardb.runner])
diff --git a/scalardb/src/scalardb/db/cassandra.clj b/scalardb/src/scalardb/db/cassandra.clj
@@ -0,0 +1,58 @@
+(ns scalardb.db.cassandra
+  (:require [cassandra.core :as cassandra]
+            [cassandra.nemesis :as cn]
+            [cassandra.runner :as cr]
+            [clojure.string :as string]
+            [scalardb.db-extend :as ext])
+  (:import (com.scalar.db.storage.cassandra CassandraAdmin
+                                            CassandraAdmin$ReplicationStrategy
+                                            CassandraAdmin$CompactionStrategy)
+           (java.util Properties)))
+
+(defrecord ExtCassandra []
+  ext/DbExtension
+  (get-db-type [_] :cassandra)
+  (live-nodes [_ test] (cassandra/live-nodes test))
+  (wait-for-recovery [_ test] (cassandra/wait-rf-nodes test))
+  (create-table-opts
+    [_ test]
+    {(keyword CassandraAdmin/REPLICATION_STRATEGY)
+     (str CassandraAdmin$ReplicationStrategy/SIMPLE_STRATEGY)
+     (keyword CassandraAdmin/COMPACTION_STRATEGY)
+     (str CassandraAdmin$CompactionStrategy/LCS)
+     (keyword CassandraAdmin/REPLICATION_FACTOR) (:rf test)})
+  (create-properties
+    [_ test]
+    (or (ext/load-config test)
+        (let [nodes (:nodes test)]
+          (when (nil? nodes)
+            (throw (ex-info "No living node" {:test test})))
+          (->> (doto (Properties.)
+                 (.setProperty "scalar.db.storage" "cassandra")
+                 (.setProperty "scalar.db.contact_points"
+                               (string/join "," nodes))
+                 (.setProperty "scalar.db.username" "cassandra")
+                 (.setProperty "scalar.db.password" "cassandra"))
+               (ext/set-common-properties test)))))
+  (create-storage-properties [this test] (ext/create-properties this test)))
+
+(defn gen-db
+  [faults admin]
+  (let [db (ext/extend-db (cassandra/db) (->ExtCassandra))
+        ;; replace :kill nemesis with :crash for Cassandra
+        faults (mapv #(if (= % :kill) :crash %) faults)]
+    (when-not (every? #(some? (get cr/nemeses (name %))) faults)
+      (throw
+       (ex-info
+        (str "Invalid nemesis for Cassandra: " faults) {})))
+    [db
+     (cn/nemesis-package
+      {:db db
+       :faults faults
+       :admin admin
+       :partition {:targets [:one
+                             :primaries
+                             :majority
+                             :majorities-ring
+                             :minority-third]}})
+     Integer/MAX_VALUE]))
diff --git a/scalardb/src/scalardb/db/cluster.clj b/scalardb/src/scalardb/db/cluster.clj
@@ -6,8 +6,10 @@
             [jepsen
              [control :as c]
              [db :as db]]
+            [scalardb.db-extend :as ext]
             [scalardb.nemesis.cluster :as n])
-  (:import (java.io File)))
+  (:import (java.io File)
+           (java.util Properties)))
 
 (def ^:private ^:const CLUSTER_VALUES_YAML "scalardb-cluster-custom-values.yaml")
 (def ^:private ^:const DEFAULT_SCALARDB_CLUSTER_VERSION "4.0.0-SNAPSHOT")
@@ -171,7 +173,7 @@
        (map #(nth (str/split % #"\s+") 3))
        first))
 
-(defn running-pods?
+(defn- running-pods?
   "Check a live node."
   [test]
   (-> test
@@ -197,7 +199,7 @@
            (warn (.getMessage e))
            false))))
 
-(defn wait-for-recovery
+(defn- wait-for-recovery
   "Wait for the node bootstrapping."
   ([test]
    (wait-for-recovery TIMEOUT_SEC INTERVAL_SEC test))
@@ -246,3 +248,38 @@
     db/LogFiles
     (log-files [_ test _]
       (get-logs test))))
+
+(defrecord ExtCluster []
+  ext/DbExtension
+  (get-db-type [_] :cluster)
+  (live-nodes [_ test] (running-pods? test))
+  (wait-for-recovery [_ test] (wait-for-recovery test))
+  (create-table-opts [_ _] {})
+  (create-properties
+    [_ test]
+    (or (ext/load-config test)
+        (let [node (-> test :nodes first)
+              ip (c/on node (get-load-balancer-ip))]
+          (->> (doto (Properties.)
+                 (.setProperty "scalar.db.transaction_manager" "cluster")
+                 (.setProperty "scalar.db.contact_points"
+                               (str "indirect:" ip))
+                 (.setProperty "scalar.db.sql.connection_mode" "cluster")
+                 (.setProperty "scalar.db.sql.cluster_mode.contact_points"
+                               (str "indirect:" ip)))
+               (ext/set-common-properties test)))))
+  (create-storage-properties [_ _]
+    (let [node (-> test :nodes first)
+          ip (c/on node (get-postgres-ip))]
+      (doto (Properties.)
+        (.setProperty "scalar.db.storage" "jdbc")
+        (.setProperty "scalar.db.contact_points"
+                      (str "jdbc:postgresql://" ip ":5432/postgres"))
+        (.setProperty "scalar.db.username" "postgres")
+        (.setProperty "scalar.db.password" "postgres")))))
+
+(defn gen-db
+  [faults admin]
+  (when (seq admin)
+    (warn "The admin operations are ignored:" admin))
+  [(ext/extend-db (db) (->ExtCluster)) (n/nemesis-package db 60 faults) 1])
diff --git a/scalardb/src/scalardb/db/postgres.clj b/scalardb/src/scalardb/db/postgres.clj
@@ -1,11 +1,14 @@
 (ns scalardb.db.postgres
-  (:require [clojure.tools.logging :refer [info]]
+  (:require [clojure.tools.logging :refer [info warn]]
             [jepsen
              [control :as c]
              [db :as db]
              [util :refer [meh]]]
             [jepsen.control.util :as cu]
-            [jepsen.os.debian :as debian]))
+            [jepsen.os.debian :as debian]
+            [jepsen.nemesis.combined :as jn]
+            [scalardb.db-extend :as ext])
+  (:import (java.util Properties)))
 
 (def ^:private ^:const DEFAULT_VERSION "15")
 (def ^:private ^:const TIMEOUT_SEC 600)
@@ -71,7 +74,7 @@
   (c/su (meh (c/exec :rm :-r (get-main-dir version))))
   (c/su (meh (c/exec :rm (get-log-path version)))))
 
-(defn live-node?
+(defn- live-node?
   [test]
   (let [node (-> test :nodes first)]
     (try
@@ -81,7 +84,7 @@
         (info node "is down")
         false))))
 
-(defn wait-for-recovery
+(defn- wait-for-recovery
   "Wait for the node bootstrapping."
   ([test]
    (wait-for-recovery TIMEOUT_SEC INTERVAL_SEC test))
@@ -134,3 +137,37 @@
 
     db/LogFiles
     (log-files [_ test _] [(get-log-path test)])))
+
+(defrecord ExtPostgres []
+  ext/DbExtension
+  (get-db-type [_] :postgres)
+  (live-nodes [_ test] (live-node? test))
+  (wait-for-recovery [_ test] (wait-for-recovery test))
+  (create-table-opts [_ _] {})
+  (create-properties
+    [_ test]
+    (or (ext/load-config test)
+        (let [node (-> test :nodes first)]
+          ;; We have only one node in this test
+          (->> (doto (Properties.)
+                 (.setProperty "scalar.db.storage" "jdbc")
+                 (.setProperty "scalar.db.contact_points"
+                               (str "jdbc:postgresql://" node ":5432/"))
+                 (.setProperty "scalar.db.username" "postgres")
+                 (.setProperty "scalar.db.password" "postgres"))
+               (ext/set-common-properties test)))))
+  (create-storage-properties [this test] (ext/create-properties this test)))
+
+(defn gen-db
+  [faults admin]
+  (when (seq admin)
+    (warn "The admin operations are ignored:" admin))
+  [(ext/extend-db (db) (->ExtPostgres))
+   (jn/nemesis-package
+    {:db db
+     :interval 60
+     :faults faults
+     :partition {:targets [:one]}
+     :kill {:targets [:one]}
+     :pause {:targets [:one]}})
+   1])
diff --git a/scalardb/src/scalardb/db_extend.clj b/scalardb/src/scalardb/db_extend.clj
diff --git a/scalardb/src/scalardb/runner.clj b/scalardb/src/scalardb/runner.clj
diff --git a/scalardb/test/scalardb/db_extend_test.clj b/scalardb/test/scalardb/db_extend_test.clj
