From 3828b8ce87dd622f7a853d756a2b0fc0ac2caabc Mon Sep 17 00:00:00 2001 From: chrislu Date: Wed, 27 Jul 2022 12:12:40 -0700 Subject: [PATCH] "github.com/chrislusf/raft" => "github.com/seaweedfs/raft" --- go.mod | 4 ++-- go.sum | 4 ++-- weed/command/master.go | 2 +- weed/server/master_grpc_server.go | 2 +- weed/server/master_grpc_server_collection.go | 2 +- weed/server/master_grpc_server_volume.go | 2 +- weed/server/master_server.go | 2 +- weed/server/master_server_handlers_ui.go | 2 +- weed/server/raft_server.go | 2 +- weed/topology/cluster_commands.go | 2 +- weed/topology/topology.go | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/go.mod b/go.mod index 6c96743cd..e06f92012 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/bwmarrin/snowflake v0.3.0 github.com/cespare/xxhash v1.1.0 github.com/cespare/xxhash/v2 v2.1.2 // indirect - github.com/chrislusf/raft v1.0.9 + github.com/seaweedfs/raft v1.1.0 github.com/coreos/go-semver v0.3.0 // indirect github.com/coreos/go-systemd/v22 v22.3.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -234,4 +234,4 @@ require ( lukechampine.com/uint128 v1.1.1 // indirect ) -// replace github.com/chrislusf/raft => /Users/chrislu/go/src/github.com/chrislusf/raft +// replace github.com/seaweedfs/raft => /Users/chrislu/go/src/github.com/seaweedfs/raft diff --git a/go.sum b/go.sum index 930e5ba49..9a98eccd4 100644 --- a/go.sum +++ b/go.sum @@ -217,8 +217,6 @@ github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghf github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/chrislusf/raft v1.0.9 h1:EGUpBUzQSzu7WG/jF16IeoySSuxyyK3lfoltcUckC3I= -github.com/chrislusf/raft v1.0.9/go.mod h1:Ep5DP+mJSosjfKiix1uU7Lc2Df/SX4oGJEpZlXH5l68= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= @@ -826,6 +824,8 @@ github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod h1:hPqNNc0 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/seaweedfs/goexif v2.0.0+incompatible h1:x8pckiT12QQhifwhDQpeISgDfsqmQ6VR4LFPQ64JRps= github.com/seaweedfs/goexif v2.0.0+incompatible/go.mod h1:Oni780Z236sXpIQzk1XoJlTwqrJ02smEin9zQeff7Fk= +github.com/seaweedfs/raft v1.1.0 h1:Oy1mf3MzktDzNyXamD5lAZirLjEqPS7FzZoxLY0i8SU= +github.com/seaweedfs/raft v1.1.0/go.mod h1:9cYlEBA+djJbnf/5tWsCybtbL7ICYpi+Uxcg3MxjuNs= github.com/secsy/goftp v0.0.0-20200609142545-aa2de14babf4 h1:PT+ElG/UUFMfqy5HrxJxNzj3QBOf7dZwupeVC+mG1Lo= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= diff --git a/weed/command/master.go b/weed/command/master.go index ab8466d47..448c3491f 100644 --- a/weed/command/master.go +++ b/weed/command/master.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "github.com/chrislusf/raft/protobuf" stats_collect "github.com/chrislusf/seaweedfs/weed/stats" "github.com/gorilla/mux" + "github.com/seaweedfs/raft/protobuf" "github.com/spf13/viper" "google.golang.org/grpc/reflection" diff --git a/weed/server/master_grpc_server.go b/weed/server/master_grpc_server.go index 4f5455cb1..78871f31c 100644 --- a/weed/server/master_grpc_server.go +++ b/weed/server/master_grpc_server.go @@ -13,7 +13,7 @@ import ( "github.com/chrislusf/seaweedfs/weed/storage/backend" "github.com/chrislusf/seaweedfs/weed/util" - "github.com/chrislusf/raft" + "github.com/seaweedfs/raft" "google.golang.org/grpc/peer" "github.com/chrislusf/seaweedfs/weed/glog" diff --git a/weed/server/master_grpc_server_collection.go b/weed/server/master_grpc_server_collection.go index 654da6b3c..51d1fc580 100644 --- a/weed/server/master_grpc_server_collection.go +++ b/weed/server/master_grpc_server_collection.go @@ -3,7 +3,7 @@ package weed_server import ( "context" - "github.com/chrislusf/raft" + "github.com/seaweedfs/raft" "github.com/chrislusf/seaweedfs/weed/operation" "github.com/chrislusf/seaweedfs/weed/pb/master_pb" diff --git a/weed/server/master_grpc_server_volume.go b/weed/server/master_grpc_server_volume.go index 9da947869..df7524eb0 100644 --- a/weed/server/master_grpc_server_volume.go +++ b/weed/server/master_grpc_server_volume.go @@ -3,7 +3,7 @@ package weed_server import ( "context" "fmt" - "github.com/chrislusf/raft" + "github.com/seaweedfs/raft" "reflect" "strings" "sync" diff --git a/weed/server/master_server.go b/weed/server/master_server.go index 0fdc3944f..675be9836 100644 --- a/weed/server/master_server.go +++ b/weed/server/master_server.go @@ -16,9 +16,9 @@ import ( "github.com/chrislusf/seaweedfs/weed/cluster" "github.com/chrislusf/seaweedfs/weed/pb" - "github.com/chrislusf/raft" "github.com/gorilla/mux" hashicorpRaft "github.com/hashicorp/raft" + "github.com/seaweedfs/raft" "google.golang.org/grpc" "github.com/chrislusf/seaweedfs/weed/glog" diff --git a/weed/server/master_server_handlers_ui.go b/weed/server/master_server_handlers_ui.go index f09022399..b481b9854 100644 --- a/weed/server/master_server_handlers_ui.go +++ b/weed/server/master_server_handlers_ui.go @@ -4,8 +4,8 @@ import ( "net/http" "time" - "github.com/chrislusf/raft" hashicorpRaft "github.com/hashicorp/raft" + "github.com/seaweedfs/raft" ui "github.com/chrislusf/seaweedfs/weed/server/master_ui" "github.com/chrislusf/seaweedfs/weed/stats" diff --git a/weed/server/raft_server.go b/weed/server/raft_server.go index ad0a1c8ce..b1c6624d5 100644 --- a/weed/server/raft_server.go +++ b/weed/server/raft_server.go @@ -14,8 +14,8 @@ import ( "github.com/chrislusf/seaweedfs/weed/pb" - "github.com/chrislusf/raft" hashicorpRaft "github.com/hashicorp/raft" + "github.com/seaweedfs/raft" "github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/topology" diff --git a/weed/topology/cluster_commands.go b/weed/topology/cluster_commands.go index 1bcc6b449..3e777f6fe 100644 --- a/weed/topology/cluster_commands.go +++ b/weed/topology/cluster_commands.go @@ -3,10 +3,10 @@ package topology import ( "encoding/json" "fmt" - "github.com/chrislusf/raft" "github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/storage/needle" hashicorpRaft "github.com/hashicorp/raft" + "github.com/seaweedfs/raft" ) type MaxVolumeIdCommand struct { diff --git a/weed/topology/topology.go b/weed/topology/topology.go index 631c1fa29..b3fab68f7 100644 --- a/weed/topology/topology.go +++ b/weed/topology/topology.go @@ -11,8 +11,8 @@ import ( "github.com/chrislusf/seaweedfs/weed/pb" "github.com/chrislusf/seaweedfs/weed/storage/types" - "github.com/chrislusf/raft" hashicorpRaft "github.com/hashicorp/raft" + "github.com/seaweedfs/raft" "github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/pb/master_pb"