diff --git a/yugabyte/run-jepsen.py b/yugabyte/run-jepsen.py index 09740b9d5..168c5d3c4 100755 --- 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 index 5ff84a28d..34dc3c72e 100644 --- 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 index 8120f9c97..7e0559d94 100644 --- 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")