Skip to content

Commit 3afbd21

Browse files
tbgtbg
committed
storage: update import path for Raft
upstream moved from github.com/etcd to go.etcd.io/etcd. We're going to have to pick up an update soon to fix cockroachdb#28918, so it's easier to switch now. We're not picking up any new commits except for the renames. Release note: None
1 parent 5692414 commit 3afbd21

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+62
-73
lines changed

‎Gopkg.lock

+13-21
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Gopkg.toml

+1-4
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,8 @@ ignored = [
2626
name = "golang.org/x/text"
2727
revision = "470f45bf29f4147d6fbd7dfd0a02a848e49f5bf4"
2828

29-
# https://github.com/coreos/etcd/commit/f03ed33
30-
#
31-
# https://github.com/coreos/etcd/commit/ce0ad377
3229
[[constraint]]
33-
name = "github.com/coreos/etcd"
30+
name = "go.etcd.io/etcd"
3431
branch = "master"
3532

3633
# Used for the API client; we want the latest.

‎Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -989,7 +989,7 @@ PROTOBUF_PATH := $(GOGO_PROTOBUF_PATH)/protobuf
989989

990990
GOGOPROTO_PROTO := $(GOGO_PROTOBUF_PATH)/gogoproto/gogo.proto
991991

992-
COREOS_PATH := ./vendor/github.com/coreos
992+
COREOS_PATH := ./vendor/go.etcd.io
993993

994994
GRPC_GATEWAY_GOOGLEAPIS_PACKAGE := github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis
995995
GRPC_GATEWAY_GOOGLEAPIS_PATH := ./vendor/$(GRPC_GATEWAY_GOOGLEAPIS_PACKAGE)
@@ -1041,7 +1041,7 @@ bin/.go_protobuf_sources: $(PROTOC) $(GO_PROTOS) $(GOGOPROTO_PROTO) bin/.bootstr
10411041
done
10421042
$(SED_INPLACE) '/import _/d' $(GO_SOURCES)
10431043
$(SED_INPLACE) -E 's!import (fmt|math) "github.com/cockroachdb/cockroach/pkg/(fmt|math)"! !g' $(GO_SOURCES)
1044-
$(SED_INPLACE) -E 's!cockroachdb/cockroach/pkg/(etcd)!coreos/\1!g' $(GO_SOURCES)
1044+
$(SED_INPLACE) -E 's!github\.com/cockroachdb/cockroach/pkg/(etcd)!go.etcd.io/\1!g' $(GO_SOURCES)
10451045
$(SED_INPLACE) -E 's!cockroachdb/cockroach/pkg/(prometheus/client_model)!\1/go!g' $(GO_SOURCES)
10461046
$(SED_INPLACE) -E 's!github.com/cockroachdb/cockroach/pkg/(bytes|encoding/binary|errors|fmt|io|math|github\.com|(google\.)?golang\.org)!\1!g' $(GO_SOURCES)
10471047
@# TODO(benesch): Remove after https://github.com/grpc/grpc-go/issues/711.

‎pkg/cli/debug.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ import (
5454
"github.com/cockroachdb/cockroach/pkg/util/sysutil"
5555
"github.com/cockroachdb/cockroach/pkg/util/timeutil"
5656
"github.com/cockroachdb/cockroach/pkg/util/uuid"
57-
"github.com/coreos/etcd/raft/raftpb"
5857
"github.com/gogo/protobuf/jsonpb"
5958
"github.com/kr/pretty"
6059
"github.com/pkg/errors"
6160
"github.com/spf13/cobra"
61+
"go.etcd.io/etcd/raft/raftpb"
6262
)
6363

6464
var debugKeysCmd = &cobra.Command{

‎pkg/cli/debug/print.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"github.com/cockroachdb/cockroach/pkg/storage/storagebase"
3030
"github.com/cockroachdb/cockroach/pkg/util/hlc"
3131
"github.com/cockroachdb/cockroach/pkg/util/protoutil"
32-
"github.com/coreos/etcd/raft/raftpb"
32+
"go.etcd.io/etcd/raft/raftpb"
3333
)
3434

3535
// PrintKeyValue attempts to pretty-print the specified MVCCKeyValue to

‎pkg/server/serverpb/status.pb.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/server/serverpb/status.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ message NodeRequest {
110110
}
111111

112112
// RaftState gives internal details about a Raft group's state.
113-
// Closely mirrors the upstream definitions in github.com/coreos/etcd/raft.
113+
// Closely mirrors the upstream definitions in github.com/etcd-io/etcd/raft.
114114
message RaftState {
115115
message Progress {
116116
uint64 match = 1;

‎pkg/server/status.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ import (
3333
"sync"
3434

3535
"github.com/cockroachdb/cockroach/pkg/storage/engine"
36-
"github.com/coreos/etcd/raft"
3736
gwruntime "github.com/grpc-ecosystem/grpc-gateway/runtime"
3837
"github.com/pkg/errors"
38+
"go.etcd.io/etcd/raft"
3939
"google.golang.org/grpc"
4040
"google.golang.org/grpc/codes"
4141
"google.golang.org/grpc/metadata"

‎pkg/storage/allocator.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222
"math/rand"
2323
"time"
2424

25-
"github.com/coreos/etcd/raft"
2625
"github.com/pkg/errors"
26+
"go.etcd.io/etcd/raft"
2727

2828
"github.com/cockroachdb/cockroach/pkg/config"
2929
"github.com/cockroachdb/cockroach/pkg/roachpb"

‎pkg/storage/allocator_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ import (
2626
"testing"
2727
"time"
2828

29-
"github.com/coreos/etcd/raft"
3029
"github.com/olekukonko/tablewriter"
3130
"github.com/pkg/errors"
31+
"go.etcd.io/etcd/raft"
3232

3333
"github.com/cockroachdb/cockroach/pkg/base"
3434
"github.com/cockroachdb/cockroach/pkg/config"

‎pkg/storage/below_raft_protos_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"reflect"
2222
"testing"
2323

24-
"github.com/coreos/etcd/raft/raftpb"
24+
"go.etcd.io/etcd/raft/raftpb"
2525

2626
"github.com/cockroachdb/cockroach/pkg/roachpb"
2727
"github.com/cockroachdb/cockroach/pkg/storage"

‎pkg/storage/client_raft_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ import (
2727
"testing"
2828
"time"
2929

30-
"github.com/coreos/etcd/raft"
31-
"github.com/coreos/etcd/raft/raftpb"
3230
"github.com/pkg/errors"
31+
"go.etcd.io/etcd/raft"
32+
"go.etcd.io/etcd/raft/raftpb"
3333

3434
"github.com/cockroachdb/cockroach/pkg/base"
3535
"github.com/cockroachdb/cockroach/pkg/gossip"

‎pkg/storage/client_split_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ import (
2727
"testing"
2828
"time"
2929

30-
"github.com/coreos/etcd/raft/raftpb"
3130
"github.com/pkg/errors"
31+
"go.etcd.io/etcd/raft/raftpb"
3232

3333
"github.com/cockroachdb/cockroach/pkg/base"
3434
"github.com/cockroachdb/cockroach/pkg/config"

‎pkg/storage/client_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ import (
3434
"time"
3535

3636
"github.com/cenk/backoff"
37-
"github.com/coreos/etcd/raft"
3837
"github.com/kr/pretty"
3938
"github.com/pkg/errors"
4039
circuit "github.com/rubyist/circuitbreaker"
40+
"go.etcd.io/etcd/raft"
4141
"google.golang.org/grpc"
4242

4343
"github.com/cockroachdb/cockroach/pkg/base"

‎pkg/storage/entry_cache.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package storage
1717

1818
import (
1919
"github.com/biogo/store/llrb"
20-
"github.com/coreos/etcd/raft/raftpb"
20+
"go.etcd.io/etcd/raft/raftpb"
2121

2222
"github.com/cockroachdb/cockroach/pkg/roachpb"
2323
"github.com/cockroachdb/cockroach/pkg/util/cache"

‎pkg/storage/entry_cache_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"reflect"
1919
"testing"
2020

21-
"github.com/coreos/etcd/raft/raftpb"
21+
"go.etcd.io/etcd/raft/raftpb"
2222

2323
"github.com/cockroachdb/cockroach/pkg/roachpb"
2424
"github.com/cockroachdb/cockroach/pkg/util/leaktest"

‎pkg/storage/metrics.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/cockroachdb/cockroach/pkg/util/log"
2525
"github.com/cockroachdb/cockroach/pkg/util/metric"
2626
"github.com/cockroachdb/cockroach/pkg/util/syncutil"
27-
"github.com/coreos/etcd/raft/raftpb"
27+
"go.etcd.io/etcd/raft/raftpb"
2828
)
2929

3030
var (

‎pkg/storage/raft.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222

2323
"github.com/cockroachdb/cockroach/pkg/security"
2424
"github.com/cockroachdb/cockroach/pkg/util/log"
25-
"github.com/coreos/etcd/raft"
26-
"github.com/coreos/etcd/raft/raftpb"
25+
"go.etcd.io/etcd/raft"
26+
"go.etcd.io/etcd/raft/raftpb"
2727
)
2828

2929
// init installs an adapter to use clog for log messages from raft which

‎pkg/storage/raft.pb.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/storage/raft_log_queue.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919
"sort"
2020
"time"
2121

22-
"github.com/coreos/etcd/raft"
2322
"github.com/pkg/errors"
23+
"go.etcd.io/etcd/raft"
2424

2525
"github.com/cockroachdb/cockroach/pkg/config"
2626
"github.com/cockroachdb/cockroach/pkg/gossip"

‎pkg/storage/raft_log_queue_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"strings"
2222
"testing"
2323

24-
"github.com/coreos/etcd/raft"
2524
"github.com/pkg/errors"
25+
"go.etcd.io/etcd/raft"
2626

2727
"github.com/cockroachdb/cockroach/pkg/internal/client"
2828
"github.com/cockroachdb/cockroach/pkg/roachpb"

‎pkg/storage/raft_snapshot_queue.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818
"context"
1919
"time"
2020

21-
"github.com/coreos/etcd/raft"
2221
"github.com/pkg/errors"
22+
"go.etcd.io/etcd/raft"
2323

2424
"github.com/cockroachdb/cockroach/pkg/config"
2525
"github.com/cockroachdb/cockroach/pkg/gossip"

‎pkg/storage/raft_transport.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import (
2525
"time"
2626
"unsafe"
2727

28-
"github.com/coreos/etcd/raft/raftpb"
2928
"github.com/pkg/errors"
29+
"go.etcd.io/etcd/raft/raftpb"
3030
"google.golang.org/grpc"
3131

3232
"github.com/cockroachdb/cockroach/pkg/roachpb"

‎pkg/storage/raft_transport_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import (
2121
"testing"
2222
"time"
2323

24-
"github.com/coreos/etcd/raft/raftpb"
2524
"github.com/gogo/protobuf/proto"
2625
"github.com/pkg/errors"
26+
"go.etcd.io/etcd/raft/raftpb"
2727

2828
"github.com/cockroachdb/cockroach/pkg/gossip"
2929
"github.com/cockroachdb/cockroach/pkg/roachpb"

‎pkg/storage/replica.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ import (
2727
"time"
2828
"unsafe"
2929

30-
"github.com/coreos/etcd/raft"
31-
"github.com/coreos/etcd/raft/raftpb"
3230
"github.com/google/btree"
3331
"github.com/kr/pretty"
3432
opentracing "github.com/opentracing/opentracing-go"
3533
"github.com/pkg/errors"
34+
"go.etcd.io/etcd/raft"
35+
"go.etcd.io/etcd/raft/raftpb"
3636

3737
"github.com/cockroachdb/cockroach/pkg/base"
3838
"github.com/cockroachdb/cockroach/pkg/config"

‎pkg/storage/replica_command.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222
"strings"
2323
"time"
2424

25-
"github.com/coreos/etcd/raft/raftpb"
2625
"github.com/pkg/errors"
26+
"go.etcd.io/etcd/raft/raftpb"
2727

2828
"github.com/cockroachdb/cockroach/pkg/base"
2929
"github.com/cockroachdb/cockroach/pkg/internal/client"

‎pkg/storage/replica_gc_queue.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919
"math"
2020
"time"
2121

22-
"github.com/coreos/etcd/raft"
2322
"github.com/pkg/errors"
23+
"go.etcd.io/etcd/raft"
2424

2525
"github.com/cockroachdb/cockroach/pkg/config"
2626
"github.com/cockroachdb/cockroach/pkg/gossip"

‎pkg/storage/replica_proposal.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ import (
2323
"time"
2424
"unsafe"
2525

26-
"github.com/coreos/etcd/raft"
2726
"github.com/kr/pretty"
2827
opentracing "github.com/opentracing/opentracing-go"
2928
"github.com/pkg/errors"
29+
"go.etcd.io/etcd/raft"
3030
"golang.org/x/time/rate"
3131

3232
"github.com/cockroachdb/cockroach/pkg/keys"

‎pkg/storage/replica_raftstorage.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import (
2020
"math"
2121
"time"
2222

23-
"github.com/coreos/etcd/raft"
24-
"github.com/coreos/etcd/raft/raftpb"
2523
"github.com/pkg/errors"
24+
"go.etcd.io/etcd/raft"
25+
"go.etcd.io/etcd/raft/raftpb"
2626

2727
"github.com/cockroachdb/cockroach/pkg/keys"
2828
"github.com/cockroachdb/cockroach/pkg/roachpb"

‎pkg/storage/replica_sideload.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"github.com/cockroachdb/cockroach/pkg/storage/storagebase"
2222
"github.com/cockroachdb/cockroach/pkg/util/log"
2323
"github.com/cockroachdb/cockroach/pkg/util/protoutil"
24-
"github.com/coreos/etcd/raft/raftpb"
2524
"github.com/pkg/errors"
25+
"go.etcd.io/etcd/raft/raftpb"
2626
)
2727

2828
var errSideloadedFileNotFound = errors.New("sideloaded file not found")

0 commit comments

Comments
 (0)