Merge pull request #1287 from nats-io/fix_leadership_acquired

[FIXED] Clustering: leadership acquired actions could get stuck
nats-io · Apr 3, 2023 · 4cfa4f1 · 4cfa4f1
2 parents 2af2beb + ee84146
commit 4cfa4f1
Show file tree

Hide file tree

Showing 7 changed files with 232 additions and 73 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,8 +16,10 @@ env:
 go_import_path: github.com/nats-io/nats-streaming-server
 install:
 - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-    go install honnef.co/go/tools/cmd/staticcheck@latest;
-    go install github.com/client9/misspell/cmd/misspell@latest;
+    if [[ "$TRAVIS_GO_VERSION" =~ 1.19 ]]; then
+      go install honnef.co/go/tools/cmd/staticcheck@latest;
+      go install github.com/client9/misspell/cmd/misspell@latest;
+    fi;
   fi
 services:
 - mysql
@@ -27,8 +29,10 @@ before_script:
     go install;
     $(exit $(go fmt $GO_LIST | wc -l));
     go vet $GO_LIST;
-    find . -type f -name "*.go" | grep -v "/spb/" | xargs misspell -error -locale US;
-    staticcheck $GO_LIST;
+    if [[ "$TRAVIS_GO_VERSION" =~ 1.19 ]]; then
+      find . -type f -name "*.go" | grep -v "/spb/" | xargs misspell -error -locale US;
+      staticcheck $GO_LIST;
+    fi;
   fi
 script:
 - set -e

diff --git a/dependencies.md b/dependencies.md
@@ -6,26 +6,17 @@ This file lists the dependencies used in this repository.
 |-|-|
 | Go | BSD 3-Clause "New" or "Revised" License |
 | github.com/nats-io/nats-streaming-server | Apache License 2.0 |
-| github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878 | MIT |
-| github.com/fatih/color v1.7.0 | MIT |
-| github.com/go-sql-driver/mysql v1.6.0 | Mozilla Public License 2.0 |
+| github.com/go-sql-driver/mysql v1.7.0 | Mozilla Public License 2.0 |
 | github.com/gogo/protobuf v1.3.2 | Go |
-| github.com/golang/protobuf v1.4.2 | BSD 3-Clause "New" or "Revised" License |
-| github.com/hashicorp/go-hclog v0.16.1 | MIT |
-| github.com/hashicorp/go-immutable-radix v1.0.0 | Mozilla Public License 2.0 |
-| github.com/hashicorp/go-msgpack v1.1.5 | BSD 3-Clause "New" or "Revised" License |
-| github.com/hashicorp/golang-lru v0.5.0 | Mozilla Public License 2.0 |
-| github.com/hashicorp/raft v1.3.1 | Mozilla Public License 2.0 |
-| github.com/lib/pq v1.10.2 | [MIT-Like](https://github.com/lib/pq/blob/master/LICENSE.md) |
-| github.com/mattn/go-colorable v0.1.4 | MIT |
-| github.com/mattn/go-isatty v0.0.10 | MIT |
-| github.com/nats-io/jwt/v2 v2.0.2 | Apache License 2.0 |
-| github.com/nats-io/nats-server/v2 v2.2.4 | Apache License 2.0 |
-| github.com/nats-io/nats.go v1.11.0 | Apache License 2.0 |
-| github.com/nats-io/nkeys v0.3.0 | Apache License 2.0 |
+| github.com/hashicorp/go-hclog v1.5.0 | MIT |
+| github.com/hashicorp/go-msgpack/v2 v2.1.0 | MIT |
+| github.com/hashicorp/raft v1.4.0 | Mozilla Public License 2.0 |
+| github.com/lib/pq v1.10.7 | [MIT-Like](https://github.com/lib/pq/blob/master/LICENSE.md) |
+| github.com/nats-io/nats-server/v2 v2.9.15 | Apache License 2.0 |
+| github.com/nats-io/nats.go v1.25.0 | Apache License 2.0 |
 | github.com/nats-io/nuid v1.0.1 | Apache License 2.0 |
-| github.com/nats-io/stan.go v0.8.3 | Apache License 2.0 |
-| github.com/prometheus/procfs v0.6.0 | Apache License 2.0 |
-| go.etcd.io/bbolt v1.3.5 | MIT |
-| golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b | BSD 3-Clause "New" or "Revised" License |
-| golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073 | BSD 3-Clause "New" or "Revised" License |
+| github.com/nats-io/stan.go v0.10.4 | Apache License 2.0 |
+| github.com/prometheus/procfs v0.8.0 | Apache License 2.0 |
+| go.etcd.io/bbolt v1.3.6 | MIT |
+| golang.org/x/crypto v0.6.0 | BSD 3-Clause "New" or "Revised" License |
+| golang.org/x/sys v0.5.0 | BSD 3-Clause "New" or "Revised" License |
diff --git a/go.mod b/go.mod
@@ -5,16 +5,16 @@ go 1.14
 require (
 	github.com/go-sql-driver/mysql v1.7.0
 	github.com/gogo/protobuf v1.3.2
-	github.com/hashicorp/go-hclog v1.1.0
+	github.com/hashicorp/go-hclog v1.5.0
 	github.com/hashicorp/go-msgpack/v2 v2.1.0
-	github.com/hashicorp/raft v1.3.11
-	github.com/lib/pq v1.10.4
-	github.com/nats-io/nats-server/v2 v2.9.11
-	github.com/nats-io/nats.go v1.22.1
+	github.com/hashicorp/raft v1.4.0
+	github.com/lib/pq v1.10.7
+	github.com/nats-io/nats-server/v2 v2.9.15
+	github.com/nats-io/nats.go v1.25.0
 	github.com/nats-io/nuid v1.0.1
 	github.com/nats-io/stan.go v0.10.4
 	github.com/prometheus/procfs v0.8.0
 	go.etcd.io/bbolt v1.3.6
-	golang.org/x/crypto v0.5.0
-	golang.org/x/sys v0.4.1-0.20230105183443-b8be2fde2a9e
+	golang.org/x/crypto v0.6.0
+	golang.org/x/sys v0.5.0
 )