Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rollback etcd to newer v3 version #321

Merged
merged 1 commit into from
Jan 18, 2021
Merged

rollback etcd to newer v3 version #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,11 @@ require (
github.com/sirupsen/logrus v1.6.0
github.com/stretchr/testify v1.6.1
github.com/urfave/cli/v2 v2.2.0
go.etcd.io/etcd v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5
go.etcd.io/etcd/v3 v3.3.0-rc.0.0.20200925060232-add86bbd1a7a
go.uber.org/automaxprocs v1.3.0
go.uber.org/zap v1.15.0 // indirect
golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de
golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc
google.golang.org/grpc v1.28.0
google.golang.org/grpc v1.29.1
google.golang.org/protobuf v1.23.0
gopkg.in/alexcesaro/statsd.v2 v2.0.0 // indirect
)
48 changes: 36 additions & 12 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions lock/etcdlock/mutex.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"time"

"github.com/projecteru2/core/types"
"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/clientv3/concurrency"
"go.etcd.io/etcd/v3/clientv3"
"go.etcd.io/etcd/v3/clientv3/concurrency"
"golang.org/x/net/context"
)

Expand Down
2 changes: 1 addition & 1 deletion lock/etcdlock/mutex_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/stretchr/testify/assert"

"go.etcd.io/etcd/integration"
"go.etcd.io/etcd/v3/integration"
)

func TestMutex(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion store/etcdv3/deploy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/projecteru2/core/log"
"github.com/projecteru2/core/strategy"
"github.com/projecteru2/core/types"
"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/v3/clientv3"
)

// MakeDeployStatus get deploy status from store
Expand Down
4 changes: 2 additions & 2 deletions store/etcdv3/embedded/embeded.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package embedded
import (
"testing"

"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/v3/clientv3"

"go.etcd.io/etcd/integration"
"go.etcd.io/etcd/v3/integration"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion store/etcdv3/meta/ephemeral.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"time"

"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/v3/clientv3"

"github.com/projecteru2/core/log"
"github.com/projecteru2/core/types"
Expand Down
8 changes: 4 additions & 4 deletions store/etcdv3/meta/etcd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"sync"
"time"

"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/clientv3/namespace"
"go.etcd.io/etcd/mvcc/mvccpb"
"go.etcd.io/etcd/pkg/transport"
"go.etcd.io/etcd/v3/clientv3"
"go.etcd.io/etcd/v3/clientv3/namespace"
"go.etcd.io/etcd/v3/mvcc/mvccpb"
"go.etcd.io/etcd/v3/pkg/transport"

"github.com/projecteru2/core/lock"
"github.com/projecteru2/core/lock/etcdlock"
Expand Down
2 changes: 1 addition & 1 deletion store/etcdv3/meta/etcd_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/v3/clientv3"

"github.com/projecteru2/core/store/etcdv3/meta/mocks"
"github.com/projecteru2/core/types"
Expand Down
4 changes: 2 additions & 2 deletions store/etcdv3/meta/meta.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"time"

"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/mvcc/mvccpb"
"go.etcd.io/etcd/v3/clientv3"
"go.etcd.io/etcd/v3/mvcc/mvccpb"

"github.com/projecteru2/core/lock"
)
Expand Down
2 changes: 1 addition & 1 deletion store/etcdv3/meta/mocks/ETCDClientV3.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion store/etcdv3/meta/mocks/Txn.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions store/etcdv3/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
"github.com/projecteru2/core/metrics"
"github.com/projecteru2/core/types"
"github.com/projecteru2/core/utils"
"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/mvcc/mvccpb"
"go.etcd.io/etcd/v3/clientv3"
"go.etcd.io/etcd/v3/mvcc/mvccpb"
)

// AddNode save it to etcd
Expand Down
2 changes: 1 addition & 1 deletion store/etcdv3/pod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"fmt"

"github.com/projecteru2/core/types"
"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/v3/clientv3"
)

// AddPod add a pod
Expand Down
2 changes: 1 addition & 1 deletion store/etcdv3/processing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/projecteru2/core/log"
"github.com/projecteru2/core/strategy"
"github.com/projecteru2/core/types"
"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/v3/clientv3"
)

// SaveProcessing save processing status in etcd
Expand Down
4 changes: 2 additions & 2 deletions store/etcdv3/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"time"

"github.com/projecteru2/core/log"
"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/mvcc/mvccpb"
"go.etcd.io/etcd/v3/clientv3"
"go.etcd.io/etcd/v3/mvcc/mvccpb"
)

type endpoints map[string]struct{}
Expand Down
4 changes: 2 additions & 2 deletions store/etcdv3/workload.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/projecteru2/core/log"
"github.com/projecteru2/core/types"
"github.com/projecteru2/core/utils"
"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/mvcc/mvccpb"
"go.etcd.io/etcd/v3/clientv3"
"go.etcd.io/etcd/v3/mvcc/mvccpb"
)

// AddWorkload add a workload
Expand Down