Merge branch 'master' into feature/lagging_replicas_not_active

yandex · Oct 2, 2024 · ace17a9 · ace17a9
2 parents 7b88df5 + 63cd7e3
commit ace17a9
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/go.mod b/go.mod
@@ -5,8 +5,8 @@ go 1.22
 require (
 	github.com/cenkalti/backoff/v4 v4.3.0
 	github.com/cucumber/godog v0.14.1
-	github.com/docker/docker v27.2.0+incompatible
-	github.com/go-mysql-org/go-mysql v1.9.0
+	github.com/docker/docker v27.3.1+incompatible
+	github.com/go-mysql-org/go-mysql v1.9.1
 	github.com/go-sql-driver/mysql v1.8.1
 	github.com/go-zookeeper/zk v1.0.4
 	github.com/gofrs/flock v0.12.1

diff --git a/go.sum b/go.sum
@@ -48,8 +48,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
 github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
-github.com/docker/docker v27.2.0+incompatible h1:Rk9nIVdfH3+Vz4cyI/uhbINhEZ/oLmc+CBXmH6fbNk4=
-github.com/docker/docker v27.2.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v27.3.1+incompatible h1:KttF0XoteNTicmUtBO0L2tP+J7FGRFTjaEF4k6WdhfI=
+github.com/docker/docker v27.3.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
 github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
 github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
@@ -68,8 +68,8 @@ github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
 github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
-github.com/go-mysql-org/go-mysql v1.9.0 h1:2YniuBkyD+Ll8HWfZcaJ3JtibUohZTjwbb27ZWhYdOA=
-github.com/go-mysql-org/go-mysql v1.9.0/go.mod h1:+SgFgTlqjqOQoMc98n9oyUWEgn2KkOL1VmXDoq2ONOs=
+github.com/go-mysql-org/go-mysql v1.9.1 h1:W2ZKkHkoM4mmkasJCoSYfaE4RQNxXTb6VqiaMpKFrJc=
+github.com/go-mysql-org/go-mysql v1.9.1/go.mod h1:+SgFgTlqjqOQoMc98n9oyUWEgn2KkOL1VmXDoq2ONOs=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
 github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=

diff --git a/tests/images/jepsen_main/jepsen/src/jepsen/mysync.clj b/tests/images/jepsen_main/jepsen/src/jepsen/mysync.clj
@@ -91,21 +91,21 @@
 
     (invoke! [this test op]
       (try
-          (timeout 5000 (assoc op :type :info, :error "timeout")
-            (with-conn [c conn]
-              (case (:f op)
-                :read (cond (= (count (j/query c ["show slave status for channel ''"])) 0)
-                            (assoc op :type :ok,
-                                      :value (->> (j/query c ["select value from test1.test_set"]
-                                                           {:row-fn :value})
-                                                  (vec)
-                                                  (set)))
-                            true
-                            (assoc op :type :info, :error "read-only"))
-                :add (do
-                       (info (str "Adding: " (get op :value) " to " (get c :subname)))
-                       (j/execute! c [(str "insert into test1.test_set values ('" (get op :value) "')")])
-                       (assoc op :type :ok)))))
+          (with-conn [c conn]
+            (case (:f op)
+              :read (cond (= (count (j/query c ["show slave status for channel ''"])) 0)
+                          (assoc op :type :ok,
+                                    :value (->> (j/query c ["select value from test1.test_set"]
+                                                          {:row-fn :value})
+                                                (vec)
+                                                (set)))
+                          true
+                          (assoc op :type :info, :error "read-only"))
+              :add (timeout 5000 (assoc op :type :info, :error "timeout")
+                    (do
+                      (info (str "Adding: " (get op :value) " to " (get c :subname)))
+                      (j/execute! c [(str "insert into test1.test_set values ('" (get op :value) "')")])
+                      (assoc op :type :ok)))))
         (catch Throwable t#
           (let [m# (.getMessage t#)]
             (cond