Skip to content

Commit ce29112

Browse files
tonicmuroqtonicmuroq
authored
rollback etcd to newer v3 version (#321)
1 parent 4f1307e commit ce29112

17 files changed

+62
-39
lines changed

‎go.mod

+2-3
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,11 @@ require (
3838
github.com/sirupsen/logrus v1.6.0
3939
github.com/stretchr/testify v1.6.1
4040
github.com/urfave/cli/v2 v2.2.0
41-
go.etcd.io/etcd v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5
41+
go.etcd.io/etcd/v3 v3.3.0-rc.0.0.20200925060232-add86bbd1a7a
4242
go.uber.org/automaxprocs v1.3.0
43-
go.uber.org/zap v1.15.0 // indirect
4443
golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de
4544
golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc
46-
google.golang.org/grpc v1.28.0
45+
google.golang.org/grpc v1.29.1
4746
google.golang.org/protobuf v1.23.0
4847
gopkg.in/alexcesaro/statsd.v2 v2.0.0 // indirect
4948
)

‎go.sum

+36-12
Large diffs are not rendered by default.

‎lock/etcdlock/mutex.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"time"
88

99
"github.com/projecteru2/core/types"
10-
"go.etcd.io/etcd/clientv3"
11-
"go.etcd.io/etcd/clientv3/concurrency"
10+
"go.etcd.io/etcd/v3/clientv3"
11+
"go.etcd.io/etcd/v3/clientv3/concurrency"
1212
"golang.org/x/net/context"
1313
)
1414

‎lock/etcdlock/mutex_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
"github.com/stretchr/testify/assert"
99

10-
"go.etcd.io/etcd/integration"
10+
"go.etcd.io/etcd/v3/integration"
1111
)
1212

1313
func TestMutex(t *testing.T) {

‎store/etcdv3/deploy.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/projecteru2/core/log"
99
"github.com/projecteru2/core/strategy"
1010
"github.com/projecteru2/core/types"
11-
"go.etcd.io/etcd/clientv3"
11+
"go.etcd.io/etcd/v3/clientv3"
1212
)
1313

1414
// MakeDeployStatus get deploy status from store

‎store/etcdv3/embedded/embeded.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package embedded
33
import (
44
"testing"
55

6-
"go.etcd.io/etcd/clientv3"
6+
"go.etcd.io/etcd/v3/clientv3"
77

8-
"go.etcd.io/etcd/integration"
8+
"go.etcd.io/etcd/v3/integration"
99
)
1010

1111
var (

‎store/etcdv3/meta/ephemeral.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"time"
66

7-
"go.etcd.io/etcd/clientv3"
7+
"go.etcd.io/etcd/v3/clientv3"
88

99
"github.com/projecteru2/core/log"
1010
"github.com/projecteru2/core/types"

‎store/etcdv3/meta/etcd.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import (
77
"sync"
88
"time"
99

10-
"go.etcd.io/etcd/clientv3"
11-
"go.etcd.io/etcd/clientv3/namespace"
12-
"go.etcd.io/etcd/mvcc/mvccpb"
13-
"go.etcd.io/etcd/pkg/transport"
10+
"go.etcd.io/etcd/v3/clientv3"
11+
"go.etcd.io/etcd/v3/clientv3/namespace"
12+
"go.etcd.io/etcd/v3/mvcc/mvccpb"
13+
"go.etcd.io/etcd/v3/pkg/transport"
1414

1515
"github.com/projecteru2/core/lock"
1616
"github.com/projecteru2/core/lock/etcdlock"

‎store/etcdv3/meta/etcd_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
"github.com/stretchr/testify/mock"
99
"github.com/stretchr/testify/require"
10-
"go.etcd.io/etcd/clientv3"
10+
"go.etcd.io/etcd/v3/clientv3"
1111

1212
"github.com/projecteru2/core/store/etcdv3/meta/mocks"
1313
"github.com/projecteru2/core/types"

‎store/etcdv3/meta/meta.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"context"
55
"time"
66

7-
"go.etcd.io/etcd/clientv3"
8-
"go.etcd.io/etcd/mvcc/mvccpb"
7+
"go.etcd.io/etcd/v3/clientv3"
8+
"go.etcd.io/etcd/v3/mvcc/mvccpb"
99

1010
"github.com/projecteru2/core/lock"
1111
)

‎store/etcdv3/meta/mocks/ETCDClientV3.go

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

‎store/etcdv3/meta/mocks/Txn.go

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

‎store/etcdv3/node.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import (
1515
"github.com/projecteru2/core/metrics"
1616
"github.com/projecteru2/core/types"
1717
"github.com/projecteru2/core/utils"
18-
"go.etcd.io/etcd/clientv3"
19-
"go.etcd.io/etcd/mvcc/mvccpb"
18+
"go.etcd.io/etcd/v3/clientv3"
19+
"go.etcd.io/etcd/v3/mvcc/mvccpb"
2020
)
2121

2222
// AddNode save it to etcd

‎store/etcdv3/pod.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"fmt"
77

88
"github.com/projecteru2/core/types"
9-
"go.etcd.io/etcd/clientv3"
9+
"go.etcd.io/etcd/v3/clientv3"
1010
)
1111

1212
// AddPod add a pod

‎store/etcdv3/processing.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/projecteru2/core/log"
1313
"github.com/projecteru2/core/strategy"
1414
"github.com/projecteru2/core/types"
15-
"go.etcd.io/etcd/clientv3"
15+
"go.etcd.io/etcd/v3/clientv3"
1616
)
1717

1818
// SaveProcessing save processing status in etcd

‎store/etcdv3/service.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"time"
88

99
"github.com/projecteru2/core/log"
10-
"go.etcd.io/etcd/clientv3"
11-
"go.etcd.io/etcd/mvcc/mvccpb"
10+
"go.etcd.io/etcd/v3/clientv3"
11+
"go.etcd.io/etcd/v3/mvcc/mvccpb"
1212
)
1313

1414
type endpoints map[string]struct{}

‎store/etcdv3/workload.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"github.com/projecteru2/core/log"
1111
"github.com/projecteru2/core/types"
1212
"github.com/projecteru2/core/utils"
13-
"go.etcd.io/etcd/clientv3"
14-
"go.etcd.io/etcd/mvcc/mvccpb"
13+
"go.etcd.io/etcd/v3/clientv3"
14+
"go.etcd.io/etcd/v3/mvcc/mvccpb"
1515
)
1616

1717
// AddWorkload add a workload

0 commit comments

Comments
 (0)