Removed extra geo test from 1.3.1 version (#115)

* Removed extra geo test from 1.3.1 version * Fixed * Fixed auto.clj to enable colocation and packed after 2.16 release * Returned colocated by random * Fixed syntax
yugabyte · Apr 12, 2024 · 2ff240c · 2ff240c
1 parent fe5b1f6
commit 2ff240c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/yugabyte/run-jepsen.py b/yugabyte/run-jepsen.py
@@ -84,7 +84,6 @@
 
             # YSQL snapshot isolation
             "ysql/si.ol.append",
-            "ysql/si.ol.geo.append",
             "ysql/si.bank",
             "ysql/si.bank-contention",
             "ysql/si.bank-multitable",

diff --git a/yugabyte/src/yugabyte/core.clj b/yugabyte/src/yugabyte/core.clj
@@ -20,6 +20,7 @@
             [yugabyte.set :as set]
             [yugabyte.utils :as utils]
             [yugabyte.utils :refer :all]
+            [version-clj.core :as v] 
             [yugabyte.ycql.bank]
             [yugabyte.ycql.bank-improved]
             [yugabyte.ycql.counter]
@@ -40,6 +41,7 @@
   (:import (jepsen.client Client)))
 
 (def version-regex #"(?<=yugabyte\-)(\d+\.\d+(\.\d+){0,2}(-b\d+)?)")
+(def minimal-packed-version "2.16.4.0-b1")
 
 (defn noop-test
   "NOOP test, exists to validate setup/teardown phases"
@@ -313,9 +315,10 @@
 (defn test-3
   "Final phase where we define global cluster configuration parameters"
   [opts]
-  (let [packed-columns-enabled (> (rand) 0.5)
-        colocated (and (not (utils/is-test-geo-partitioned? opts)) (> (rand) 0.5))]
-    (assoc opts :yb-packed-columns-enabled packed-columns-enabled :yb-colocated colocated)))
+  (let [packed-columns-enabled (and (v/newer-or-equal? (:version test) minimal-packed-version) (> (rand) 0.5)) 
+        colocated (and (not (utils/is-test-geo-partitioned? opts)) (> (rand) 0.5))] 
+    (assoc opts :yb-packed-columns-enabled packed-columns-enabled :yb-colocated colocated))
+    ())
 
 (defn yb-test
   "Constructs a yugabyte test from CLI options."

diff --git a/yugabyte/src/yugabyte/ysql/bank_improved.clj b/yugabyte/src/yugabyte/ysql/bank_improved.clj
@@ -2,7 +2,6 @@
   (:require [version-clj.core :as v]
             [clojure.java.jdbc :as j]
             [clojure.tools.logging :refer [info]]
-            [clojure.tools.logging :refer [debug info warn]]
             [yugabyte.ysql.client :as c]))
 
 (def table-name "accounts")