Skip to content

Commit b9b2168

Browse files
DuodenumLDuodenumL
authored
Reduce unnecessary ETCD Put operations (#472)
1 parent a5e6c1d commit b9b2168

File tree

137 files changed

+295
-219
lines changed

Some content is hidden

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

137 files changed

+295
-219
lines changed

‎auth/auth.go

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55

66
"github.com/projecteru2/core/auth/simple"
77
"github.com/projecteru2/core/types"
8+
89
"google.golang.org/grpc"
910
)
1011

‎auth/simple/simple.go

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

66
"github.com/projecteru2/core/types"
7+
78
"google.golang.org/grpc"
89
"google.golang.org/grpc/metadata"
910
)

‎auth/simple/simple_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"errors"
66
"testing"
77

8-
"github.com/stretchr/testify/assert"
9-
108
grpcmocks "github.com/projecteru2/core/3rdmocks"
9+
10+
"github.com/stretchr/testify/assert"
1111
"google.golang.org/grpc"
1212
"google.golang.org/grpc/metadata"
1313
)

‎client/client.go

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
pb "github.com/projecteru2/core/rpc/gen"
1212
"github.com/projecteru2/core/types"
1313
"github.com/projecteru2/core/utils"
14+
1415
"google.golang.org/grpc"
1516
"google.golang.org/grpc/keepalive"
1617
)

‎client/interceptor/retry.go

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

7-
"github.com/cenkalti/backoff/v4"
87
"github.com/projecteru2/core/log"
98

9+
"github.com/cenkalti/backoff/v4"
1010
"google.golang.org/grpc"
1111
)
1212

‎client/resolver/eru/resolver.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66

77
"github.com/projecteru2/core/client/servicediscovery"
88
"github.com/projecteru2/core/log"
9-
109
"github.com/projecteru2/core/types"
10+
1111
"google.golang.org/grpc/resolver"
1212
)
1313

‎client/servicediscovery/eru_service_discovery.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import (
1010
"github.com/projecteru2/core/client/interceptor"
1111
"github.com/projecteru2/core/client/utils"
1212
"github.com/projecteru2/core/log"
13-
1413
pb "github.com/projecteru2/core/rpc/gen"
1514
"github.com/projecteru2/core/types"
15+
1616
"google.golang.org/grpc"
1717
)
1818

‎client/utils/servicepusher.go

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

10-
"github.com/go-ping/ping"
1110
"github.com/projecteru2/core/log"
11+
12+
"github.com/go-ping/ping"
1213
)
1314

1415
// EndpointPusher pushes endpoints to registered channels if the ep is L3 reachable

‎cluster/calcium/build.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@ import (
99
"os"
1010
"time"
1111

12-
"github.com/pkg/errors"
1312
enginetypes "github.com/projecteru2/core/engine/types"
1413
"github.com/projecteru2/core/log"
1514
"github.com/projecteru2/core/types"
1615
"github.com/projecteru2/core/utils"
16+
17+
"github.com/pkg/errors"
1718
)
1819

1920
// BuildImage will build image

‎cluster/calcium/build_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ import (
77
"io/ioutil"
88
"testing"
99

10-
"github.com/stretchr/testify/assert"
11-
"github.com/stretchr/testify/mock"
12-
1310
enginemocks "github.com/projecteru2/core/engine/mocks"
1411
schedulermocks "github.com/projecteru2/core/scheduler/mocks"
1512
storemocks "github.com/projecteru2/core/store/mocks"
1613
"github.com/projecteru2/core/types"
14+
15+
"github.com/stretchr/testify/assert"
16+
"github.com/stretchr/testify/mock"
1717
)
1818

1919
const (

‎cluster/calcium/calcium.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"strings"
66
"testing"
77

8-
"github.com/pkg/errors"
98
"github.com/projecteru2/core/cluster"
109
"github.com/projecteru2/core/discovery"
1110
"github.com/projecteru2/core/discovery/helium"
@@ -19,6 +18,8 @@ import (
1918
"github.com/projecteru2/core/store/etcdv3"
2019
"github.com/projecteru2/core/store/redis"
2120
"github.com/projecteru2/core/types"
21+
22+
"github.com/pkg/errors"
2223
)
2324

2425
// Calcium implement the cluster

‎cluster/calcium/calcium_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ import (
99
"testing"
1010
"time"
1111

12-
"github.com/stretchr/testify/assert"
13-
"github.com/stretchr/testify/mock"
14-
1512
schedulermocks "github.com/projecteru2/core/scheduler/mocks"
1613
sourcemocks "github.com/projecteru2/core/source/mocks"
1714
storemocks "github.com/projecteru2/core/store/mocks"
1815
"github.com/projecteru2/core/types"
1916
"github.com/projecteru2/core/wal"
2017
walmocks "github.com/projecteru2/core/wal/mocks"
18+
19+
"github.com/stretchr/testify/assert"
20+
"github.com/stretchr/testify/mock"
2121
)
2222

2323
// DummyLock replace lock for testing

‎cluster/calcium/capacity.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ package calcium
33
import (
44
"context"
55

6-
"github.com/pkg/errors"
76
"github.com/projecteru2/core/log"
87
"github.com/projecteru2/core/resources"
98
resourcetypes "github.com/projecteru2/core/resources/types"
109
"github.com/projecteru2/core/strategy"
1110
"github.com/projecteru2/core/types"
11+
12+
"github.com/pkg/errors"
1213
)
1314

1415
// CalculateCapacity calculates capacity

‎cluster/calcium/capacity_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
storemocks "github.com/projecteru2/core/store/mocks"
1313
"github.com/projecteru2/core/strategy"
1414
"github.com/projecteru2/core/types"
15+
1516
"github.com/stretchr/testify/assert"
1617
"github.com/stretchr/testify/mock"
1718
)

‎cluster/calcium/control.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ import (
55
"context"
66
"sync"
77

8-
"github.com/pkg/errors"
98
"github.com/projecteru2/core/cluster"
109
"github.com/projecteru2/core/log"
1110
"github.com/projecteru2/core/types"
1211
"github.com/projecteru2/core/utils"
12+
13+
"github.com/pkg/errors"
1314
)
1415

1516
// ControlWorkload control workloads status

‎cluster/calcium/control_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import (
1111
lockmocks "github.com/projecteru2/core/lock/mocks"
1212
storemocks "github.com/projecteru2/core/store/mocks"
1313
"github.com/projecteru2/core/types"
14+
1415
"github.com/stretchr/testify/assert"
1516
"github.com/stretchr/testify/mock"
1617
)

‎cluster/calcium/copy_test.go

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

7-
"github.com/stretchr/testify/assert"
8-
97
enginemocks "github.com/projecteru2/core/engine/mocks"
108
lockmocks "github.com/projecteru2/core/lock/mocks"
119
storemocks "github.com/projecteru2/core/store/mocks"
1210
"github.com/projecteru2/core/types"
11+
12+
"github.com/stretchr/testify/assert"
1313
"github.com/stretchr/testify/mock"
1414
)
1515

‎cluster/calcium/create.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ import (
77
"sync"
88
"time"
99

10-
"github.com/pkg/errors"
11-
"github.com/sanity-io/litter"
12-
1310
"github.com/projecteru2/core/cluster"
1411
enginetypes "github.com/projecteru2/core/engine/types"
1512
"github.com/projecteru2/core/log"
@@ -18,6 +15,9 @@ import (
1815
"github.com/projecteru2/core/types"
1916
"github.com/projecteru2/core/utils"
2017
"github.com/projecteru2/core/wal"
18+
19+
"github.com/pkg/errors"
20+
"github.com/sanity-io/litter"
2121
)
2222

2323
// CreateWorkload use options to create workloads

‎cluster/calcium/create_test.go

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

7-
"github.com/pkg/errors"
87
enginemocks "github.com/projecteru2/core/engine/mocks"
98
enginetypes "github.com/projecteru2/core/engine/types"
109
lockmocks "github.com/projecteru2/core/lock/mocks"
@@ -16,6 +15,8 @@ import (
1615
"github.com/projecteru2/core/types"
1716
"github.com/projecteru2/core/wal"
1817
walmocks "github.com/projecteru2/core/wal/mocks"
18+
19+
"github.com/pkg/errors"
1920
"github.com/stretchr/testify/assert"
2021
"github.com/stretchr/testify/mock"
2122
)

‎cluster/calcium/dissociate.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ package calcium
33
import (
44
"context"
55

6-
"github.com/pkg/errors"
76
"github.com/projecteru2/core/log"
87
"github.com/projecteru2/core/store"
98
"github.com/projecteru2/core/types"
109
"github.com/projecteru2/core/utils"
10+
11+
"github.com/pkg/errors"
1112
)
1213

1314
// DissociateWorkload dissociate workload from eru, return it resource but not modity it

‎cluster/calcium/dissociate_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ import (
44
"context"
55
"testing"
66

7-
"github.com/docker/go-units"
87
lockmocks "github.com/projecteru2/core/lock/mocks"
98
storemocks "github.com/projecteru2/core/store/mocks"
109
"github.com/projecteru2/core/types"
10+
11+
"github.com/docker/go-units"
1112
"github.com/stretchr/testify/assert"
1213
"github.com/stretchr/testify/mock"
1314
)

‎cluster/calcium/execute_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
enginemocks "github.com/projecteru2/core/engine/mocks"
1111
storemocks "github.com/projecteru2/core/store/mocks"
1212
"github.com/projecteru2/core/types"
13+
1314
"github.com/stretchr/testify/assert"
1415
"github.com/stretchr/testify/mock"
1516
)

‎cluster/calcium/helper.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@ import (
88
"io/ioutil"
99
"sync"
1010

11-
"github.com/pkg/errors"
1211
"github.com/projecteru2/core/engine"
1312
enginetypes "github.com/projecteru2/core/engine/types"
1413
"github.com/projecteru2/core/log"
1514
"github.com/projecteru2/core/types"
1615
"github.com/projecteru2/core/utils"
16+
17+
"github.com/pkg/errors"
1718
"golang.org/x/net/context"
1819
)
1920

‎cluster/calcium/hook.go

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

7-
"github.com/pkg/errors"
87
"github.com/projecteru2/core/engine"
8+
9+
"github.com/pkg/errors"
910
)
1011

1112
func (c *Calcium) doHook(

‎cluster/calcium/image.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@ import (
55
"fmt"
66
"sync"
77

8-
"github.com/pkg/errors"
98
"github.com/projecteru2/core/log"
109
"github.com/projecteru2/core/types"
1110
"github.com/projecteru2/core/utils"
11+
12+
"github.com/pkg/errors"
1213
)
1314

1415
// RemoveImage remove images

‎cluster/calcium/image_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
enginemocks "github.com/projecteru2/core/engine/mocks"
1010
storemocks "github.com/projecteru2/core/store/mocks"
1111
"github.com/projecteru2/core/types"
12+
1213
"github.com/stretchr/testify/assert"
1314
"github.com/stretchr/testify/mock"
1415
)

‎cluster/calcium/lambda.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ import (
88
"strconv"
99
"sync"
1010

11-
"github.com/google/uuid"
12-
"github.com/pkg/errors"
13-
1411
enginetypes "github.com/projecteru2/core/engine/types"
1512
"github.com/projecteru2/core/log"
1613
"github.com/projecteru2/core/strategy"
1714
"github.com/projecteru2/core/types"
1815
"github.com/projecteru2/core/utils"
1916
"github.com/projecteru2/core/wal"
17+
18+
"github.com/google/uuid"
19+
"github.com/pkg/errors"
2020
)
2121

2222
const (

‎cluster/calcium/lambda_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ import (
88
"strings"
99
"testing"
1010

11-
"github.com/stretchr/testify/assert"
12-
"github.com/stretchr/testify/mock"
13-
1411
enginemocks "github.com/projecteru2/core/engine/mocks"
1512
enginetypes "github.com/projecteru2/core/engine/types"
1613
lockmocks "github.com/projecteru2/core/lock/mocks"
@@ -22,6 +19,9 @@ import (
2219
"github.com/projecteru2/core/types"
2320
"github.com/projecteru2/core/wal"
2421
walmocks "github.com/projecteru2/core/wal/mocks"
22+
23+
"github.com/stretchr/testify/assert"
24+
"github.com/stretchr/testify/mock"
2525
)
2626

2727
func TestRunAndWaitFailedThenWALCommitted(t *testing.T) {

‎cluster/calcium/lock.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ import (
66
"sort"
77
"time"
88

9-
"github.com/pkg/errors"
109
"github.com/projecteru2/core/cluster"
1110
"github.com/projecteru2/core/lock"
1211
"github.com/projecteru2/core/log"
1312
"github.com/projecteru2/core/types"
1413
"github.com/projecteru2/core/utils"
14+
15+
"github.com/pkg/errors"
1516
)
1617

1718
func (c *Calcium) doLock(ctx context.Context, name string, timeout time.Duration) (lock lock.DistributedLock, rCtx context.Context, err error) {

‎cluster/calcium/lock_test.go

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

7-
"github.com/stretchr/testify/assert"
8-
97
enginemocks "github.com/projecteru2/core/engine/mocks"
108
"github.com/projecteru2/core/lock"
119
lockmocks "github.com/projecteru2/core/lock/mocks"
1210
storemocks "github.com/projecteru2/core/store/mocks"
1311
"github.com/projecteru2/core/types"
12+
13+
"github.com/stretchr/testify/assert"
1414
"github.com/stretchr/testify/mock"
1515
)
1616

0 commit comments

Comments
 (0)