diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index c8c894c261e..c9587219814 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -4,4 +4,4 @@ A good bug report has some very specific qualities, so please read over our shor To ask a question, go ahead and ignore this. -[report_bugs]: https://github.com/coreos/etcd/blob/master/Documentation/reporting_bugs.md +[report_bugs]: https://github.com/ozonru/etcd/blob/master/Documentation/reporting_bugs.md diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 4fa34e9b378..bb00585b31d 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -2,4 +2,4 @@ Please read our [contribution workflow][contributing] before submitting a pull request. -[contributing]: https://github.com/coreos/etcd/blob/master/CONTRIBUTING.md#contribution-flow +[contributing]: https://github.com/ozonru/etcd/blob/master/CONTRIBUTING.md#contribution-flow diff --git a/.godir b/.godir index 00ff6aa802e..a1c22728a2a 100644 --- a/.godir +++ b/.godir @@ -1 +1 @@ -github.com/coreos/etcd +github.com/ozonru/etcd diff --git a/.travis.yml b/.travis.yml index d8ab669db99..af47eed3942 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: go -go_import_path: github.com/coreos/etcd +go_import_path: github.com/ozonru/etcd sudo: required diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 31cef1fa0dc..326444f7bb5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,7 +14,7 @@ etcd is Apache 2.0 licensed and accepts contributions via GitHub pull requests. ## Reporting bugs and creating issues -Reporting bugs is one of the best ways to contribute. However, a good bug report has some very specific qualities, so please read over our short document on [reporting bugs](https://github.com/coreos/etcd/blob/master/Documentation/reporting_bugs.md) before submitting a bug report. This document might contain links to known issues, another good reason to take a look there before reporting a bug. +Reporting bugs is one of the best ways to contribute. However, a good bug report has some very specific qualities, so please read over our short document on [reporting bugs](https://github.com/ozonru/etcd/blob/master/Documentation/reporting_bugs.md) before submitting a bug report. This document might contain links to known issues, another good reason to take a look there before reporting a bug. ## Contribution flow diff --git a/Dockerfile b/Dockerfile index c653734f84b..a41a966dee5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM golang -ADD . /go/src/github.com/coreos/etcd -ADD cmd/vendor /go/src/github.com/coreos/etcd/vendor -RUN go install github.com/coreos/etcd +ADD . /go/src/github.com/ozonru/etcd +ADD cmd/vendor /go/src/github.com/ozonru/etcd/vendor +RUN go install github.com/ozonru/etcd EXPOSE 2379 2380 ENTRYPOINT ["etcd"] diff --git a/Dockerfile-functional-tester b/Dockerfile-functional-tester index cfd80867570..a803c6ece1a 100644 --- a/Dockerfile-functional-tester +++ b/Dockerfile-functional-tester @@ -33,11 +33,11 @@ RUN rm -rf ${GOROOT} \ && mkdir -p ${GOPATH}/src ${GOPATH}/bin \ && go version -RUN mkdir -p ${GOPATH}/src/github.com/coreos/etcd -ADD . ${GOPATH}/src/github.com/coreos/etcd +RUN mkdir -p ${GOPATH}/src/github.com/ozonru/etcd +ADD . ${GOPATH}/src/github.com/ozonru/etcd RUN go get -v github.com/coreos/gofail \ - && pushd ${GOPATH}/src/github.com/coreos/etcd \ + && pushd ${GOPATH}/src/github.com/ozonru/etcd \ && GO_BUILD_FLAGS="-v" ./build \ && cp ./bin/etcd /etcd \ && cp ./bin/etcdctl /etcdctl \ @@ -50,4 +50,4 @@ RUN go get -v github.com/coreos/gofail \ && go build -v -o /benchmark ./cmd/tools/benchmark \ && go build -v -o /etcd-test-proxy ./cmd/tools/etcd-test-proxy \ && popd \ - && rm -rf ${GOPATH}/src/github.com/coreos/etcd + && rm -rf ${GOPATH}/src/github.com/ozonru/etcd diff --git a/Dockerfile-test b/Dockerfile-test index dea3ab0f8db..95348a1148f 100644 --- a/Dockerfile-test +++ b/Dockerfile-test @@ -39,8 +39,8 @@ RUN rm -rf ${GOROOT} \ && mkdir -p ${GOPATH}/src ${GOPATH}/bin \ && go version -RUN mkdir -p ${GOPATH}/src/github.com/coreos/etcd -WORKDIR ${GOPATH}/src/github.com/coreos/etcd +RUN mkdir -p ${GOPATH}/src/github.com/ozonru/etcd +WORKDIR ${GOPATH}/src/github.com/ozonru/etcd ADD ./scripts/install-marker.sh /tmp/install-marker.sh diff --git a/Documentation/benchmarks/etcd-2-1-0-alpha-benchmarks.md b/Documentation/benchmarks/etcd-2-1-0-alpha-benchmarks.md index 7f2e4a333d9..1a3904740c4 100644 --- a/Documentation/benchmarks/etcd-2-1-0-alpha-benchmarks.md +++ b/Documentation/benchmarks/etcd-2-1-0-alpha-benchmarks.md @@ -53,4 +53,4 @@ Bootstrap another machine and use the [hey HTTP benchmark tool][hey] to send req | 256 | 256 | all servers | 3061 | 119.3 | [hey]: https://github.com/rakyll/hey -[hack-benchmark]: https://github.com/coreos/etcd/tree/master/hack/benchmark +[hack-benchmark]: https://github.com/ozonru/etcd/tree/master/hack/benchmark diff --git a/Documentation/benchmarks/etcd-2-2-0-rc-benchmarks.md b/Documentation/benchmarks/etcd-2-2-0-rc-benchmarks.md index df325103de4..2211215631e 100644 --- a/Documentation/benchmarks/etcd-2-2-0-rc-benchmarks.md +++ b/Documentation/benchmarks/etcd-2-2-0-rc-benchmarks.md @@ -71,6 +71,6 @@ Bootstrap another machine and use the [hey HTTP benchmark tool][hey] to send req - write QPS to all servers is increased by 30~80% because follower could receive latest commit index earlier and commit proposals faster. [hey]: https://github.com/rakyll/hey -[c7146bd5]: https://github.com/coreos/etcd/commits/c7146bd5f2c73716091262edc638401bb8229144 +[c7146bd5]: https://github.com/ozonru/etcd/commits/c7146bd5f2c73716091262edc638401bb8229144 [etcd-2.1-benchmark]: etcd-2-1-0-alpha-benchmarks.md [hack-benchmark]: ../../hack/benchmark/ diff --git a/Documentation/benchmarks/etcd-3-watch-memory-benchmark.md b/Documentation/benchmarks/etcd-3-watch-memory-benchmark.md index 226e10d1e57..c3f6adb6199 100644 --- a/Documentation/benchmarks/etcd-3-watch-memory-benchmark.md +++ b/Documentation/benchmarks/etcd-3-watch-memory-benchmark.md @@ -45,7 +45,7 @@ The theoretical memory consumption of watch can be approximated with the formula ## Testing Environment etcd version -- git head https://github.com/coreos/etcd/commit/185097ffaa627b909007e772c175e8fefac17af3 +- git head https://github.com/ozonru/etcd/commit/185097ffaa627b909007e772c175e8fefac17af3 GCE n1-standard-2 machine type - 7.5 GB memory diff --git a/Documentation/benchmarks/etcd-storage-memory-benchmark.md b/Documentation/benchmarks/etcd-storage-memory-benchmark.md index 034f622fa5f..d7a6ac5c98c 100644 --- a/Documentation/benchmarks/etcd-storage-memory-benchmark.md +++ b/Documentation/benchmarks/etcd-storage-memory-benchmark.md @@ -51,7 +51,7 @@ The graph shows the detailed structure of the in-memory index B-tree. ## Testing Environment etcd version -- git head https://github.com/coreos/etcd/commit/776e9fb7be7eee5e6b58ab977c8887b4fe4d48db +- git head https://github.com/ozonru/etcd/commit/776e9fb7be7eee5e6b58ab977c8887b4fe4d48db GCE n1-standard-2 machine type diff --git a/Documentation/branch_management.md b/Documentation/branch_management.md index b236c1a2a07..0a88a68cfc2 100644 --- a/Documentation/branch_management.md +++ b/Documentation/branch_management.md @@ -25,4 +25,4 @@ All branches with prefix `release-` are considered _stable_ branches. After every minor release (http://semver.org/), we will have a new stable branch for that release, managed by a [patch release manager](./dev-internal/release.md#release-management). We will keep fixing the backwards-compatible bugs for the latest two stable releases. A _patch_ release to each supported release branch, incorporating any bug fixes, will be once every two weeks, given any patches. -[master]: https://github.com/coreos/etcd/tree/master +[master]: https://github.com/ozonru/etcd/tree/master diff --git a/Documentation/dev-guide/api_grpc_gateway.md b/Documentation/dev-guide/api_grpc_gateway.md index 433959d30e9..555c6a645b1 100644 --- a/Documentation/dev-guide/api_grpc_gateway.md +++ b/Documentation/dev-guide/api_grpc_gateway.md @@ -128,8 +128,8 @@ curl -L http://localhost:2379/v3/kv/put \ Generated [Swagger][swagger] API definitions can be found at [rpc.swagger.json][swagger-doc]. [api-ref]: ./api_reference_v3.md -[go-client]: https://github.com/coreos/etcd/tree/master/clientv3 -[etcdctl]: https://github.com/coreos/etcd/tree/master/etcdctl +[go-client]: https://github.com/ozonru/etcd/tree/master/clientv3 +[etcdctl]: https://github.com/ozonru/etcd/tree/master/etcdctl [grpc]: https://www.grpc.io/ [grpc-gateway]: https://github.com/grpc-ecosystem/grpc-gateway [json-mapping]: https://developers.google.com/protocol-buffers/docs/proto3#json diff --git a/Documentation/faq.md b/Documentation/faq.md index f89f2342256..483c35cadbb 100644 --- a/Documentation/faq.md +++ b/Documentation/faq.md @@ -155,7 +155,7 @@ etcd sends a snapshot of its complete key-value store to refresh slow followers [backup]: https://github.com/etcd-io/etcd/blob/master/Documentation/op-guide/recovery.md#snapshotting-the-keyspace [chubby]: http://static.googleusercontent.com/media/research.google.com/en//archive/chubby-osdi06.pdf [runtime reconfiguration]: https://github.com/etcd-io/etcd/blob/master/Documentation/op-guide/runtime-configuration.md -[benchmark]: https://github.com/coreos/etcd/tree/master/tools/benchmark +[benchmark]: https://github.com/ozonru/etcd/tree/master/tools/benchmark [benchmark-result]: https://github.com/etcd-io/etcd/blob/master/Documentation/op-guide/performance.md [api-mvcc]: learning/api.md#revisions [maintenance-compact]: op-guide/maintenance.md#history-compaction diff --git a/Documentation/learning/why.md b/Documentation/learning/why.md index 0ce20a6c0c6..1397ba919ce 100644 --- a/Documentation/learning/why.md +++ b/Documentation/learning/why.md @@ -85,7 +85,7 @@ For distributed coordination, choosing etcd can help prevent operational headach [spanner]: https://cloud.google.com/spanner/ [tidb]: https://github.com/pingcap/tidb [etcd-v3lock]: https://godoc.org/github.com/etcd-io/etcd/etcdserver/api/v3lock/v3lockpb -[etcd-v3election]: https://godoc.org/github.com/coreos/etcd-io/etcdserver/api/v3election/v3electionpb +[etcd-v3election]: https://godoc.org/github.com/ozonru/etcd-io/etcdserver/api/v3election/v3electionpb [etcd-etcdctl-lock]: ../../etcdctl/README.md#lock-lockname-command-arg1-arg2- [etcd-etcdctl-elect]: ../../etcdctl/README.md#elect-options-election-name-proposal [etcd-mvcc]: data_model.md diff --git a/Documentation/op-guide/clustering.md b/Documentation/op-guide/clustering.md index 99d411441a4..9ce092ae7f4 100644 --- a/Documentation/op-guide/clustering.md +++ b/Documentation/op-guide/clustering.md @@ -490,8 +490,8 @@ To setup an etcd cluster with proxies of v2 API, please read the the [clustering [rfc-srv]: http://www.ietf.org/rfc/rfc2052.txt [runtime-conf]: runtime-configuration.md [runtime-reconf-design]: runtime-reconf-design.md -[proxy]: https://github.com/coreos/etcd/blob/release-2.3/Documentation/proxy.md -[clustering_etcd2]: https://github.com/coreos/etcd/blob/release-2.3/Documentation/clustering.md +[proxy]: https://github.com/ozonru/etcd/blob/release-2.3/Documentation/proxy.md +[clustering_etcd2]: https://github.com/ozonru/etcd/blob/release-2.3/Documentation/clustering.md [security-guide]: security.md [security-guide-dns-srv]: security.md#notes-for-dns-srv [tls-setup]: ../../hack/tls-setup diff --git a/Documentation/op-guide/monitoring.md b/Documentation/op-guide/monitoring.md index 4c2e7e4d40f..bed5bac68df 100644 --- a/Documentation/op-guide/monitoring.md +++ b/Documentation/op-guide/monitoring.md @@ -22,14 +22,14 @@ Showing top 10 nodes out of 157 (cum >= 10ms) flat flat% sum% cum cum% 130ms 27.08% 27.08% 130ms 27.08% runtime.futex 70ms 14.58% 41.67% 70ms 14.58% syscall.Syscall - 20ms 4.17% 45.83% 20ms 4.17% github.com/coreos/etcd/vendor/golang.org/x/net/http2/hpack.huffmanDecode + 20ms 4.17% 45.83% 20ms 4.17% github.com/ozonru/etcd/vendor/golang.org/x/net/http2/hpack.huffmanDecode 20ms 4.17% 50.00% 30ms 6.25% runtime.pcvalue 20ms 4.17% 54.17% 50ms 10.42% runtime.schedule - 10ms 2.08% 56.25% 10ms 2.08% github.com/coreos/etcd/vendor/github.com/coreos/etcd/etcdserver.(*EtcdServer).AuthInfoFromCtx - 10ms 2.08% 58.33% 10ms 2.08% github.com/coreos/etcd/vendor/github.com/coreos/etcd/etcdserver.(*EtcdServer).Lead - 10ms 2.08% 60.42% 10ms 2.08% github.com/coreos/etcd/vendor/github.com/coreos/etcd/pkg/wait.(*timeList).Trigger - 10ms 2.08% 62.50% 10ms 2.08% github.com/coreos/etcd/vendor/github.com/prometheus/client_golang/prometheus.(*MetricVec).hashLabelValues - 10ms 2.08% 64.58% 10ms 2.08% github.com/coreos/etcd/vendor/golang.org/x/net/http2.(*Framer).WriteHeaders + 10ms 2.08% 56.25% 10ms 2.08% github.com/ozonru/etcd/vendor/github.com/ozonru/etcd/etcdserver.(*EtcdServer).AuthInfoFromCtx + 10ms 2.08% 58.33% 10ms 2.08% github.com/ozonru/etcd/vendor/github.com/ozonru/etcd/etcdserver.(*EtcdServer).Lead + 10ms 2.08% 60.42% 10ms 2.08% github.com/ozonru/etcd/vendor/github.com/ozonru/etcd/pkg/wait.(*timeList).Trigger + 10ms 2.08% 62.50% 10ms 2.08% github.com/ozonru/etcd/vendor/github.com/prometheus/client_golang/prometheus.(*MetricVec).hashLabelValues + 10ms 2.08% 64.58% 10ms 2.08% github.com/ozonru/etcd/vendor/golang.org/x/net/http2.(*Framer).WriteHeaders ``` The `/debug/requests` endpoint gives gRPC traces and performance statistics through a web browser. For example, here is a `Range` request for the key `abc`: diff --git a/Documentation/op-guide/performance.md b/Documentation/op-guide/performance.md index 40bb7f9568e..989d71b7877 100644 --- a/Documentation/op-guide/performance.md +++ b/Documentation/op-guide/performance.md @@ -12,7 +12,7 @@ There are other sub-systems which impact the overall performance of etcd. Each s ## Benchmarks -Benchmarking etcd performance can be done with the [benchmark](https://github.com/coreos/etcd/tree/master/tools/benchmark) CLI tool included with etcd. +Benchmarking etcd performance can be done with the [benchmark](https://github.com/ozonru/etcd/tree/master/tools/benchmark) CLI tool included with etcd. For some baseline performance numbers, we consider a three member etcd cluster with the following hardware configuration: diff --git a/Documentation/op-guide/security.md b/Documentation/op-guide/security.md index 305cbb2fed7..12b0c307d6b 100644 --- a/Documentation/op-guide/security.md +++ b/Documentation/op-guide/security.md @@ -242,7 +242,7 @@ When client authentication is enabled for an etcd member, the administrator must ## Notes for TLS authentication -Since [v3.2.0](https://github.com/etcd-io/etcd/blob/master/CHANGELOG-3.2.md#v320-2017-06-09), [TLS certificates get reloaded on every client connection](https://github.com/etcd-io/etcd/pull/7829). This is useful when replacing expiry certs without stopping etcd servers; it can be done by overwriting old certs with new ones. Refreshing certs for every connection should not have too much overhead, but can be improved in the future, with caching layer. Example tests can be found [here](https://github.com/coreos/etcd/blob/b041ce5d514a4b4aaeefbffb008f0c7570a18986/integration/v3_grpc_test.go#L1601-L1757). +Since [v3.2.0](https://github.com/etcd-io/etcd/blob/master/CHANGELOG-3.2.md#v320-2017-06-09), [TLS certificates get reloaded on every client connection](https://github.com/etcd-io/etcd/pull/7829). This is useful when replacing expiry certs without stopping etcd servers; it can be done by overwriting old certs with new ones. Refreshing certs for every connection should not have too much overhead, but can be improved in the future, with caching layer. Example tests can be found [here](https://github.com/ozonru/etcd/blob/b041ce5d514a4b4aaeefbffb008f0c7570a18986/integration/v3_grpc_test.go#L1601-L1757). Since [v3.2.0](https://github.com/etcd-io/etcd/blob/master/CHANGELOG-3.2.md#v320-2017-06-09), [server denies incoming peer certs with wrong IP `SAN`](https://github.com/etcd-io/etcd/pull/7687). For instance, if peer cert contains any IP addresses in Subject Alternative Name (SAN) field, server authenticates a peer only when the remote IP address matches one of those IP addresses. This is to prevent unauthorized endpoints from joining the cluster. For example, peer B's CSR (with `cfssl`) is: diff --git a/Documentation/op-guide/v2-migration.md b/Documentation/op-guide/v2-migration.md index 981ace24f38..6d1ebee7a5d 100644 --- a/Documentation/op-guide/v2-migration.md +++ b/Documentation/op-guide/v2-migration.md @@ -8,7 +8,7 @@ Migrating an application from the API v2 to the API v3 involves two steps: 1) mi ## Migrate client library -API v3 is different from API v2, thus application developers need to use a new client library to send requests to etcd API v3. The documentation of the client v3 is available at https://godoc.org/github.com/coreos/etcd/clientv3. +API v3 is different from API v2, thus application developers need to use a new client library to send requests to etcd API v3. The documentation of the client v3 is available at https://godoc.org/github.com/ozonru/etcd/clientv3. There are some notable differences between API v2 and API v3: diff --git a/Documentation/rfc/_index.md b/Documentation/rfc/_index.md index 37b08181aef..24f40ebee1f 100644 --- a/Documentation/rfc/_index.md +++ b/Documentation/rfc/_index.md @@ -4,7 +4,7 @@ title: etcd v3 API The etcd v3 API is designed to give users a more efficient and cleaner abstraction compared to etcd v2. There are a number of semantic and protocol changes in this new API. For an overview [see Xiang Li's video](https://youtu.be/J5AioGtEPeQ?t=211). -To prove out the design of the v3 API the team has also built [a number of example recipes](https://github.com/coreos/etcd/tree/master/contrib/recipes), there is a [video discussing these recipes too](https://www.youtube.com/watch?v=fj-2RY-3yVU&feature=youtu.be&t=590). +To prove out the design of the v3 API the team has also built [a number of example recipes](https://github.com/ozonru/etcd/tree/master/contrib/recipes), there is a [video discussing these recipes too](https://www.youtube.com/watch?v=fj-2RY-3yVU&feature=youtu.be&t=590). # Design diff --git a/Documentation/upgrades/upgrade_3_0.md b/Documentation/upgrades/upgrade_3_0.md index 36fc061e8be..8db1c1a2fb0 100644 --- a/Documentation/upgrades/upgrade_3_0.md +++ b/Documentation/upgrades/upgrade_3_0.md @@ -14,7 +14,7 @@ Before [starting an upgrade](#upgrade-procedure), read through the rest of this #### Upgrade requirements -To upgrade an existing etcd deployment to 3.0, the running cluster must be 2.3 or greater. If it's before 2.3, please upgrade to [2.3](https://github.com/coreos/etcd/releases/tag/v2.3.8) before upgrading to 3.0. +To upgrade an existing etcd deployment to 3.0, the running cluster must be 2.3 or greater. If it's before 2.3, please upgrade to [2.3](https://github.com/ozonru/etcd/releases/tag/v2.3.8) before upgrading to 3.0. Also, to ensure a smooth rolling upgrade, the running cluster must be healthy. Check the health of the cluster by using the `etcdctl cluster-health` command before proceeding. @@ -122,7 +122,7 @@ $ ETCDCTL_API=3 etcdctl endpoint health ## Further considerations -- etcdctl environment variables have been updated. If `ETCDCTL_API=2 etcdctl cluster-health` works properly but `ETCDCTL_API=3 etcdctl endpoints health` responds with `Error: grpc: timed out when dialing`, be sure to use the [new variable names](https://github.com/coreos/etcd/tree/master/etcdctl#etcdctl). +- etcdctl environment variables have been updated. If `ETCDCTL_API=2 etcdctl cluster-health` works properly but `ETCDCTL_API=3 etcdctl endpoints health` responds with `Error: grpc: timed out when dialing`, be sure to use the [new variable names](https://github.com/ozonru/etcd/tree/master/etcdctl#etcdctl). ## Known Issues diff --git a/Documentation/upgrades/upgrade_3_2.md b/Documentation/upgrades/upgrade_3_2.md index f99a2afef0c..04d26a5c4a9 100644 --- a/Documentation/upgrades/upgrade_3_2.md +++ b/Documentation/upgrades/upgrade_3_2.md @@ -31,14 +31,14 @@ Since v3.2, the default value of `--snapshot-count` has [changed from from 10,00 Before ```go -import "github.com/coreos/etcd/clientv3" +import "github.com/ozonru/etcd/clientv3" clientv3.SetLogger(log.New(os.Stderr, "grpc: ", 0)) ``` After ```go -import "github.com/coreos/etcd/clientv3" +import "github.com/ozonru/etcd/clientv3" import "google.golang.org/grpc/grpclog" clientv3.SetLogger(grpclog.NewLoggerV2(os.Stderr, os.Stderr, os.Stderr)) @@ -92,8 +92,8 @@ etcdctl put foo [LARGE VALUE...] Or configure `embed.Config.MaxRequestBytes` field: ```go -import "github.com/coreos/etcd/embed" -import "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" +import "github.com/ozonru/etcd/embed" +import "github.com/ozonru/etcd/etcdserver/api/v3rpc/rpctypes" // limit requests to 5 MiB cfg := embed.NewConfig() @@ -114,7 +114,7 @@ etcd --max-request-bytes 1048576 ``` ```go -import "github.com/coreos/etcd/clientv3" +import "github.com/ozonru/etcd/clientv3" cli, _ := clientv3.New(clientv3.Config{ Endpoints: []string{"127.0.0.1:2379"}, @@ -145,7 +145,7 @@ _, err = cli.Get(ctx, "foo", clientv3.WithPrefix()) err.Error() == "rpc error: code = ResourceExhausted desc = grpc: received message larger than max (5240509 vs. 3145728)" ``` -**If not specified, client-side send limit defaults to 2 MiB (1.5 MiB + gRPC overhead bytes) and receive limit to `math.MaxInt32`**. Please see [clientv3 godoc](https://godoc.org/github.com/coreos/etcd/clientv3#Config) for more detail. +**If not specified, client-side send limit defaults to 2 MiB (1.5 MiB + gRPC overhead bytes) and receive limit to `math.MaxInt32`**. Please see [clientv3 godoc](https://godoc.org/github.com/ozonru/etcd/clientv3#Config) for more detail. #### Changed raw gRPC client wrappers @@ -199,14 +199,14 @@ err == nil Before ```go -import "github.com/coreos/etcd/clientv3" +import "github.com/ozonru/etcd/clientv3" clientv3.NewFromConfigFile ``` After ```go -import clientv3yaml "github.com/coreos/etcd/clientv3/yaml" +import clientv3yaml "github.com/ozonru/etcd/clientv3/yaml" clientv3yaml.NewConfig ``` diff --git a/Documentation/upgrades/upgrade_3_3.md b/Documentation/upgrades/upgrade_3_3.md index 85e60805e29..7390b0fed23 100644 --- a/Documentation/upgrades/upgrade_3_3.md +++ b/Documentation/upgrades/upgrade_3_3.md @@ -34,7 +34,7 @@ Changed `--auto-compaction-retention` flag to [accept string values](https://git Before and after (e.g. [k8s.io/kubernetes/test/e2e_node/services/etcd.go](https://github.com/kubernetes/kubernetes/blob/release-1.8/test/e2e_node/services/etcd.go#L50-L55)) ```diff -import "github.com/coreos/etcd/etcdserver" +import "github.com/ozonru/etcd/etcdserver" type EtcdServer struct { *etcdserver.EtcdServer @@ -85,7 +85,7 @@ From v3.3, gRPC server logs are disabled by default. **Note that `embed.Config.SetupLogging` method has been deprecated in v3.4. Please see [v3.4 upgrade guide](https://github.com/etcd-io/etcd/blob/master/Documentation/upgrades/upgrade_3_4.md) for more details.** ```go -import "github.com/coreos/etcd/embed" +import "github.com/ozonru/etcd/embed" cfg := &embed.Config{Debug: false} cfg.SetupLogging() @@ -95,7 +95,7 @@ Set `embed.Config.Debug` field to `true` to enable gRPC server logs. #### Changed `/health` endpoint response -Previously, `[endpoint]:[client-port]/health` returned manually marshaled JSON value. 3.3 now defines [`etcdhttp.Health`](https://godoc.org/github.com/coreos/etcd/etcdserver/api/etcdhttp#Health) struct. +Previously, `[endpoint]:[client-port]/health` returned manually marshaled JSON value. 3.3 now defines [`etcdhttp.Health`](https://godoc.org/github.com/ozonru/etcd/etcdserver/api/etcdhttp#Health) struct. Note that in v3.3.0-rc.0, v3.3.0-rc.1, and v3.3.0-rc.2, `etcdhttp.Health` has boolean type `"health"` and `"errors"` fields. For backward compatibilities, we reverted `"health"` field to `string` type and removed `"errors"` field. Further health information will be provided in separate APIs. @@ -140,8 +140,8 @@ etcdctl put foo [LARGE VALUE...] Or configure `embed.Config.MaxRequestBytes` field: ```go -import "github.com/coreos/etcd/embed" -import "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" +import "github.com/ozonru/etcd/embed" +import "github.com/ozonru/etcd/etcdserver/api/v3rpc/rpctypes" // limit requests to 5 MiB cfg := embed.NewConfig() @@ -162,7 +162,7 @@ etcd --max-request-bytes 1048576 ``` ```go -import "github.com/coreos/etcd/clientv3" +import "github.com/ozonru/etcd/clientv3" cli, _ := clientv3.New(clientv3.Config{ Endpoints: []string{"127.0.0.1:2379"}, @@ -193,7 +193,7 @@ _, err = cli.Get(ctx, "foo", clientv3.WithPrefix()) err.Error() == "rpc error: code = ResourceExhausted desc = grpc: received message larger than max (5240509 vs. 3145728)" ``` -**If not specified, client-side send limit defaults to 2 MiB (1.5 MiB + gRPC overhead bytes) and receive limit to `math.MaxInt32`**. Please see [clientv3 godoc](https://godoc.org/github.com/coreos/etcd/clientv3#Config) for more detail. +**If not specified, client-side send limit defaults to 2 MiB (1.5 MiB + gRPC overhead bytes) and receive limit to `math.MaxInt32`**. Please see [clientv3 godoc](https://godoc.org/github.com/ozonru/etcd/clientv3#Config) for more detail. #### Changed raw gRPC client wrapper function signatures @@ -283,7 +283,7 @@ lease 2d8257079fa1bc0c already expired #### Changed `golang.org/x/net/context` imports -`clientv3` has deprecated `golang.org/x/net/context`. If a project vendors `golang.org/x/net/context` in other code (e.g. etcd generated protocol buffer code) and imports `github.com/coreos/etcd/clientv3`, it requires Go 1.9+ to compile. +`clientv3` has deprecated `golang.org/x/net/context`. If a project vendors `golang.org/x/net/context` in other code (e.g. etcd generated protocol buffer code) and imports `github.com/ozonru/etcd/clientv3`, it requires Go 1.9+ to compile. Before @@ -310,14 +310,14 @@ cli.Put(context.Background(), "f", "v") Before ```go -import "github.com/coreos/etcd/clientv3" +import "github.com/ozonru/etcd/clientv3" clientv3.SetLogger(log.New(os.Stderr, "grpc: ", 0)) ``` After ```go -import "github.com/coreos/etcd/clientv3" +import "github.com/ozonru/etcd/clientv3" import "google.golang.org/grpc/grpclog" clientv3.SetLogger(grpclog.NewLoggerV2(os.Stderr, os.Stderr, os.Stderr)) diff --git a/MAINTAINERS b/MAINTAINERS index 9983e3c50d8..816de9dbd35 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4,5 +4,5 @@ Fanmin Shi (@fanminshi) pkg:* Gyu-Ho Lee (@gyuho) pkg:* Xiang Li (@xiang90) pkg:* -Ben Darnell (@bdarnell) pkg:github.com/coreos/etcd/raft -Hitoshi Mitake (@mitake) pkg:github.com/coreos/etcd/auth +Ben Darnell (@bdarnell) pkg:github.com/ozonru/etcd/raft +Hitoshi Mitake (@mitake) pkg:github.com/ozonru/etcd/auth diff --git a/Makefile b/Makefile index ffa6fca9d26..7f8803abc3f 100644 --- a/Makefile +++ b/Makefile @@ -101,7 +101,7 @@ compile-with-docker-test: $(info GO_VERSION: $(GO_VERSION)) docker run \ --rm \ - --mount type=bind,source=`pwd`,destination=/go/src/github.com/coreos/etcd \ + --mount type=bind,source=`pwd`,destination=/go/src/github.com/ozonru/etcd \ gcr.io/etcd-development/etcd-test:go$(GO_VERSION)-release-3.3 \ /bin/bash -c "GO_BUILD_FLAGS=-v GOOS=linux GOARCH=amd64 ./build && ./bin/etcd --version" @@ -157,7 +157,7 @@ docker-test: docker run \ --rm \ $(TMP_DIR_MOUNT_FLAG) \ - --mount type=bind,source=`pwd`,destination=/go/src/github.com/coreos/etcd \ + --mount type=bind,source=`pwd`,destination=/go/src/github.com/ozonru/etcd \ gcr.io/etcd-development/etcd-test:go$(GO_VERSION)-release-3.3 \ /bin/bash -c "$(TEST_OPTS) ./test 2>&1 | tee test-$(TEST_SUFFIX).log" ! egrep "(--- FAIL:|DATA RACE|panic: test timed out|appears to have leaked)" -B50 -A10 test-$(TEST_SUFFIX).log @@ -171,7 +171,7 @@ docker-test-coverage: docker run \ --rm \ $(TMP_DIR_MOUNT_FLAG) \ - --mount type=bind,source=`pwd`,destination=/go/src/github.com/coreos/etcd \ + --mount type=bind,source=`pwd`,destination=/go/src/github.com/ozonru/etcd \ gcr.io/etcd-development/etcd-test:go$(GO_VERSION)-release-3.3 \ /bin/bash -c "COVERDIR=covdir PASSES='build build_cov cov' ./test 2>&1 | tee docker-test-coverage-$(TEST_SUFFIX).log && /codecov -t 6040de41-c073-4d6f-bbf8-d89256ef31e1" ! egrep "(--- FAIL:|DATA RACE|panic: test timed out|appears to have leaked)" -B50 -A10 docker-test-coverage-$(TEST_SUFFIX).log diff --git a/README.md b/README.md index 2b559014e52..47422f20722 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ # etcd -[![Go Report Card](https://goreportcard.com/badge/github.com/coreos/etcd?style=flat-square)](https://goreportcard.com/report/github.com/coreos/etcd) +[![Go Report Card](https://goreportcard.com/badge/github.com/ozonru/etcd?style=flat-square)](https://goreportcard.com/report/github.com/ozonru/etcd) [![Coverage](https://codecov.io/gh/coreos/etcd/branch/master/graph/badge.svg)](https://codecov.io/gh/coreos/etcd) [![Build Status Travis](https://img.shields.io/travis/coreos/etcdlabs.svg?style=flat-square&&branch=master)](https://travis-ci.org/coreos/etcd) [![Build Status Semaphore](https://semaphoreci.com/api/v1/coreos/etcd/branches/master/shields_badge.svg)](https://semaphoreci.com/coreos/etcd) -[![Godoc](http://img.shields.io/badge/go-documentation-blue.svg?style=flat-square)](https://godoc.org/github.com/coreos/etcd) -[![Releases](https://img.shields.io/github/release/coreos/etcd/all.svg?style=flat-square)](https://github.com/coreos/etcd/releases) -[![LICENSE](https://img.shields.io/github/license/coreos/etcd.svg?style=flat-square)](https://github.com/coreos/etcd/blob/master/LICENSE) +[![Godoc](http://img.shields.io/badge/go-documentation-blue.svg?style=flat-square)](https://godoc.org/github.com/ozonru/etcd) +[![Releases](https://img.shields.io/github/release/coreos/etcd/all.svg?style=flat-square)](https://github.com/ozonru/etcd/releases) +[![LICENSE](https://img.shields.io/github/license/coreos/etcd.svg?style=flat-square)](https://github.com/ozonru/etcd/blob/master/LICENSE) **Note**: The `master` branch may be in an *unstable or even broken state* during development. Please use [releases][github-release] instead of the `master` branch in order to get stable binaries. @@ -33,7 +33,7 @@ See [etcdctl][etcdctl] for a simple command line client. [fleet]: https://github.com/coreos/fleet [locksmith]: https://github.com/coreos/locksmith [vulcand]: https://github.com/vulcand/vulcand -[etcdctl]: https://github.com/coreos/etcd/tree/master/etcdctl +[etcdctl]: https://github.com/ozonru/etcd/tree/master/etcdctl [etcd-tests]: http://dash.etcd.io ## Community meetings @@ -53,7 +53,7 @@ The easiest way to get etcd is to use one of the pre-built release binaries whic For those wanting to try the very latest version, [build the latest version of etcd][dl-build] from the `master` branch. This first needs [*Go*](https://golang.org/) installed (version 1.9+ is required). All development occurs on `master`, including new features and bug fixes. Bug fixes are first targeted at `master` and subsequently ported to release branches, as described in the [branch management][branch-management] guide. [rkt]: https://github.com/rkt/rkt/releases/ -[github-release]: https://github.com/coreos/etcd/releases/ +[github-release]: https://github.com/ozonru/etcd/releases/ [branch-management]: ./Documentation/branch_management.md [dl-build]: ./Documentation/dl_build.md#build-the-latest-version @@ -119,7 +119,7 @@ Every cluster member and proxy accepts key value reads and key value writes. ### Running etcd on Kubernetes -To run an etcd cluster on Kubernetes, try [etcd operator](https://github.com/coreos/etcd-operator). +To run an etcd cluster on Kubernetes, try [etcd operator](https://github.com/ozonru/etcd-operator). ### Next steps @@ -145,8 +145,8 @@ Now it's time to dig into the full etcd API and other guides. - Mailing list: [etcd-dev](https://groups.google.com/forum/?hl=en#!forum/etcd-dev) - IRC: #[etcd](irc://irc.freenode.org:6667/#etcd) on freenode.org -- Planning/Roadmap: [milestones](https://github.com/coreos/etcd/milestones), [roadmap](./ROADMAP.md) -- Bugs: [issues](https://github.com/coreos/etcd/issues) +- Planning/Roadmap: [milestones](https://github.com/ozonru/etcd/milestones), [roadmap](./ROADMAP.md) +- Bugs: [issues](https://github.com/ozonru/etcd/issues) ## Contributing diff --git a/ROADMAP.md b/ROADMAP.md index f7ae890d35f..c8221cfec32 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -4,7 +4,7 @@ This document defines a high level roadmap for etcd development. -The dates below should not be considered authoritative, but rather indicative of the projected timeline of the project. The [milestones defined in GitHub](https://github.com/coreos/etcd/milestones) represent the most up-to-date and issue-for-issue plans. +The dates below should not be considered authoritative, but rather indicative of the projected timeline of the project. The [milestones defined in GitHub](https://github.com/ozonru/etcd/milestones) represent the most up-to-date and issue-for-issue plans. etcd 3.2 is our current stable branch. The roadmap below outlines new features that will be added to etcd, and while subject to change, define what future stable will look like. diff --git a/alarm/alarms.go b/alarm/alarms.go index 4f0ebe93f3b..8cf694c3bda 100644 --- a/alarm/alarms.go +++ b/alarm/alarms.go @@ -18,15 +18,15 @@ package alarm import ( "sync" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/pkg/types" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/mvcc/backend" + "github.com/ozonru/etcd/pkg/types" "github.com/coreos/pkg/capnslog" ) var ( alarmBucketName = []byte("alarm") - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "alarm") + plog = capnslog.NewPackageLogger("github.com/ozonru/etcd", "alarm") ) type BackendGetter interface { diff --git a/auth/range_perm_cache.go b/auth/range_perm_cache.go index 7d47d26102b..f46ed8a70b2 100644 --- a/auth/range_perm_cache.go +++ b/auth/range_perm_cache.go @@ -15,9 +15,9 @@ package auth import ( - "github.com/coreos/etcd/auth/authpb" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/pkg/adt" + "github.com/ozonru/etcd/auth/authpb" + "github.com/ozonru/etcd/mvcc/backend" + "github.com/ozonru/etcd/pkg/adt" ) func getMergedPerms(tx backend.BatchTx, userName string) *unifiedRangePermissions { diff --git a/auth/range_perm_cache_test.go b/auth/range_perm_cache_test.go index fa632224806..ee848b9dcf4 100644 --- a/auth/range_perm_cache_test.go +++ b/auth/range_perm_cache_test.go @@ -17,8 +17,8 @@ package auth import ( "testing" - "github.com/coreos/etcd/auth/authpb" - "github.com/coreos/etcd/pkg/adt" + "github.com/ozonru/etcd/auth/authpb" + "github.com/ozonru/etcd/pkg/adt" ) func TestRangePermission(t *testing.T) { diff --git a/auth/store.go b/auth/store.go index d676cb5553b..d54c5db9eee 100644 --- a/auth/store.go +++ b/auth/store.go @@ -24,9 +24,9 @@ import ( "sync" "sync/atomic" - "github.com/coreos/etcd/auth/authpb" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/mvcc/backend" + "github.com/ozonru/etcd/auth/authpb" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/mvcc/backend" "github.com/coreos/pkg/capnslog" "golang.org/x/crypto/bcrypt" @@ -46,7 +46,7 @@ var ( authUsersBucketName = []byte("authUsers") authRolesBucketName = []byte("authRoles") - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "auth") + plog = capnslog.NewPackageLogger("github.com/ozonru/etcd", "auth") ErrRootUserNotExist = errors.New("auth: root user does not exist") ErrRootRoleNotExist = errors.New("auth: root user does not have root role") diff --git a/auth/store_test.go b/auth/store_test.go index 155b2f07f52..43e64d52eee 100644 --- a/auth/store_test.go +++ b/auth/store_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/auth/authpb" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/mvcc/backend" + "github.com/ozonru/etcd/auth/authpb" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/mvcc/backend" "golang.org/x/crypto/bcrypt" "google.golang.org/grpc/metadata" diff --git a/bill-of-materials.json b/bill-of-materials.json index c4f41954c03..487562602e7 100644 --- a/bill-of-materials.json +++ b/bill-of-materials.json @@ -36,7 +36,7 @@ ] }, { - "project": "github.com/coreos/etcd", + "project": "github.com/ozonru/etcd", "licenses": [ { "type": "Apache License 2.0", diff --git a/build b/build index 5cf4d7c6426..830be8f053c 100755 --- a/build +++ b/build @@ -1,7 +1,7 @@ #!/usr/bin/env bash # set some environment variables -ORG_PATH="github.com/coreos" +ORG_PATH="github.com/ozonru" REPO_PATH="${ORG_PATH}/etcd" GIT_SHA=$(git rev-parse --short HEAD || echo "GitNotFound") @@ -37,7 +37,7 @@ etcd_setup_gopath() { mkdir -p "${etcdGOPATH}/vendor" "${etcdGOPATH}/etcd_src/src/github.com/coreos" export GOPATH=${etcdGOPATH}/vendor:${etcdGOPATH}/etcd_src${GOPATH} ln -s "${CDIR}/vendor" "${etcdGOPATH}/vendor/src" - ln -s "${CDIR}" "${etcdGOPATH}/etcd_src/src/github.com/coreos/etcd" + ln -s "${CDIR}" "${etcdGOPATH}/etcd_src/src/github.com/ozonru/etcd" } toggle_failpoints_default() { diff --git a/client/README.md b/client/README.md index 2be731ede0b..8631491553b 100644 --- a/client/README.md +++ b/client/README.md @@ -2,7 +2,7 @@ etcd/client is the Go client library for etcd. -[![GoDoc](https://godoc.org/github.com/coreos/etcd/client?status.png)](https://godoc.org/github.com/coreos/etcd/client) +[![GoDoc](https://godoc.org/github.com/ozonru/etcd/client?status.png)](https://godoc.org/github.com/ozonru/etcd/client) etcd uses `cmd/vendor` directory to store external dependencies, which are to be compiled into etcd release binaries. `client` can be imported without @@ -14,7 +14,7 @@ For more detail, please read [Go vendor design](https://golang.org/s/go15vendor) ## Install ```bash -go get github.com/coreos/etcd/client +go get github.com/ozonru/etcd/client ``` ## Usage @@ -27,7 +27,7 @@ import ( "time" "context" - "github.com/coreos/etcd/client" + "github.com/ozonru/etcd/client" ) func main() { diff --git a/client/client.go b/client/client.go index e6874505666..933fad87c1c 100644 --- a/client/client.go +++ b/client/client.go @@ -29,7 +29,7 @@ import ( "sync" "time" - "github.com/coreos/etcd/version" + "github.com/ozonru/etcd/version" ) var ( diff --git a/client/client_test.go b/client/client_test.go index 40328a1e9b8..2d5af11ddca 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -29,8 +29,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/version" + "github.com/ozonru/etcd/pkg/testutil" + "github.com/ozonru/etcd/version" ) type actionAssertingHTTPClient struct { diff --git a/client/discover.go b/client/discover.go index 442e35fe543..63eb66d5a0d 100644 --- a/client/discover.go +++ b/client/discover.go @@ -15,7 +15,7 @@ package client import ( - "github.com/coreos/etcd/pkg/srv" + "github.com/ozonru/etcd/pkg/srv" ) // Discoverer is an interface that wraps the Discover method. diff --git a/client/doc.go b/client/doc.go index ad4eca4e163..a855982f0c3 100644 --- a/client/doc.go +++ b/client/doc.go @@ -21,7 +21,7 @@ Create a Config and exchange it for a Client: "net/http" "context" - "github.com/coreos/etcd/client" + "github.com/ozonru/etcd/client" ) cfg := client.Config{ diff --git a/client/example_keys_test.go b/client/example_keys_test.go index 66063571dd4..cd399b6abac 100644 --- a/client/example_keys_test.go +++ b/client/example_keys_test.go @@ -20,7 +20,7 @@ import ( "log" "sort" - "github.com/coreos/etcd/client" + "github.com/ozonru/etcd/client" ) func ExampleKeysAPI_directory() { diff --git a/client/integration/client_test.go b/client/integration/client_test.go index 5d4d0a05e30..5b9489785a8 100644 --- a/client/integration/client_test.go +++ b/client/integration/client_test.go @@ -24,9 +24,9 @@ import ( "sync/atomic" "testing" - "github.com/coreos/etcd/client" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/client" + "github.com/ozonru/etcd/integration" + "github.com/ozonru/etcd/pkg/testutil" ) // TestV2NoRetryEOF tests destructive api calls won't retry on a disconnection. diff --git a/client/integration/main_test.go b/client/integration/main_test.go index 2913ce51154..fc5dcfda721 100644 --- a/client/integration/main_test.go +++ b/client/integration/main_test.go @@ -8,7 +8,7 @@ import ( "os" "testing" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/pkg/testutil" ) func TestMain(m *testing.M) { diff --git a/client/keys.go b/client/keys.go index f8f2c7b186c..2a2dec3de13 100644 --- a/client/keys.go +++ b/client/keys.go @@ -25,7 +25,7 @@ import ( "strings" "time" - "github.com/coreos/etcd/pkg/pathutil" + "github.com/ozonru/etcd/pkg/pathutil" ) const ( diff --git a/client/main_test.go b/client/main_test.go index 1f2f3f30665..0568b713aeb 100644 --- a/client/main_test.go +++ b/client/main_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/pkg/transport" + "github.com/ozonru/etcd/integration" + "github.com/ozonru/etcd/pkg/testutil" + "github.com/ozonru/etcd/pkg/transport" ) var exampleEndpoints []string diff --git a/client/members.go b/client/members.go index aafa3d1b870..3e4a4902290 100644 --- a/client/members.go +++ b/client/members.go @@ -23,7 +23,7 @@ import ( "net/url" "path" - "github.com/coreos/etcd/pkg/types" + "github.com/ozonru/etcd/pkg/types" ) var ( diff --git a/client/members_test.go b/client/members_test.go index 706b6aeb8cd..b0dcc269b98 100644 --- a/client/members_test.go +++ b/client/members_test.go @@ -23,7 +23,7 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/pkg/types" + "github.com/ozonru/etcd/pkg/types" ) func TestMembersAPIActionList(t *testing.T) { diff --git a/clientv3/auth.go b/clientv3/auth.go index edccf1a8caf..57938e9f873 100644 --- a/clientv3/auth.go +++ b/clientv3/auth.go @@ -19,8 +19,8 @@ import ( "fmt" "strings" - "github.com/coreos/etcd/auth/authpb" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/auth/authpb" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" ) diff --git a/clientv3/balancer/balancer.go b/clientv3/balancer/balancer.go index 9306385e96c..178d239ea44 100644 --- a/clientv3/balancer/balancer.go +++ b/clientv3/balancer/balancer.go @@ -20,8 +20,8 @@ import ( "sync" "time" - "github.com/coreos/etcd/clientv3/balancer/connectivity" - "github.com/coreos/etcd/clientv3/balancer/picker" + "github.com/ozonru/etcd/clientv3/balancer/connectivity" + "github.com/ozonru/etcd/clientv3/balancer/picker" "go.uber.org/zap" "google.golang.org/grpc/balancer" diff --git a/clientv3/balancer/balancer_test.go b/clientv3/balancer/balancer_test.go index 592eda1029a..56622490a67 100644 --- a/clientv3/balancer/balancer_test.go +++ b/clientv3/balancer/balancer_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3/balancer/picker" - "github.com/coreos/etcd/clientv3/balancer/resolver/endpoint" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/mock/mockserver" + "github.com/ozonru/etcd/clientv3/balancer/picker" + "github.com/ozonru/etcd/clientv3/balancer/resolver/endpoint" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/pkg/mock/mockserver" "go.uber.org/zap" "google.golang.org/grpc" diff --git a/clientv3/client.go b/clientv3/client.go index 5a15cf5faea..04569765ad8 100644 --- a/clientv3/client.go +++ b/clientv3/client.go @@ -25,12 +25,12 @@ import ( "sync" "time" - "github.com/coreos/etcd/clientv3/balancer" - "github.com/coreos/etcd/clientv3/balancer/picker" - "github.com/coreos/etcd/clientv3/balancer/resolver/endpoint" - "github.com/coreos/etcd/clientv3/credentials" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/coreos/etcd/pkg/logutil" + "github.com/ozonru/etcd/clientv3/balancer" + "github.com/ozonru/etcd/clientv3/balancer/picker" + "github.com/ozonru/etcd/clientv3/balancer/resolver/endpoint" + "github.com/ozonru/etcd/clientv3/credentials" + "github.com/ozonru/etcd/etcdserver/api/v3rpc/rpctypes" + "github.com/ozonru/etcd/pkg/logutil" "github.com/google/uuid" "go.uber.org/zap" "google.golang.org/grpc" diff --git a/clientv3/client_test.go b/clientv3/client_test.go index 31ffbbac039..aa0e5ecb05b 100644 --- a/clientv3/client_test.go +++ b/clientv3/client_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/etcdserver/api/v3rpc/rpctypes" + "github.com/ozonru/etcd/pkg/testutil" "google.golang.org/grpc" ) diff --git a/clientv3/clientv3util/example_key_test.go b/clientv3/clientv3util/example_key_test.go index 8b30ae5c82d..f7b8ea35906 100644 --- a/clientv3/clientv3util/example_key_test.go +++ b/clientv3/clientv3util/example_key_test.go @@ -18,8 +18,8 @@ import ( "context" "log" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/clientv3util" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/clientv3/clientv3util" ) func ExampleKeyExists_put() { diff --git a/clientv3/clientv3util/util.go b/clientv3/clientv3util/util.go index 3b296343ebb..fe1b69d57bc 100644 --- a/clientv3/clientv3util/util.go +++ b/clientv3/clientv3util/util.go @@ -16,7 +16,7 @@ package clientv3util import ( - "github.com/coreos/etcd/clientv3" + "github.com/ozonru/etcd/clientv3" ) // KeyExists returns a comparison operation that evaluates to true iff the given diff --git a/clientv3/cluster.go b/clientv3/cluster.go index 785672be8ca..b3aefc8404b 100644 --- a/clientv3/cluster.go +++ b/clientv3/cluster.go @@ -17,8 +17,8 @@ package clientv3 import ( "context" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/types" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/pkg/types" "google.golang.org/grpc" ) diff --git a/clientv3/compact_op.go b/clientv3/compact_op.go index 41e80c1da5d..75f2e025d50 100644 --- a/clientv3/compact_op.go +++ b/clientv3/compact_op.go @@ -15,7 +15,7 @@ package clientv3 import ( - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" ) // CompactOp represents a compact operation. diff --git a/clientv3/compact_op_test.go b/clientv3/compact_op_test.go index 6c91d3ab051..a9eb2637718 100644 --- a/clientv3/compact_op_test.go +++ b/clientv3/compact_op_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/etcdserver/etcdserverpb" ) func TestCompactOp(t *testing.T) { diff --git a/clientv3/compare.go b/clientv3/compare.go index b5f0a255279..8580cc70030 100644 --- a/clientv3/compare.go +++ b/clientv3/compare.go @@ -15,7 +15,7 @@ package clientv3 import ( - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" ) type CompareTarget int diff --git a/clientv3/concurrency/election.go b/clientv3/concurrency/election.go index 20160472af5..bd4d008eaff 100644 --- a/clientv3/concurrency/election.go +++ b/clientv3/concurrency/election.go @@ -19,9 +19,9 @@ import ( "errors" "fmt" - v3 "github.com/coreos/etcd/clientv3" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/mvcc/mvccpb" + v3 "github.com/ozonru/etcd/clientv3" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/mvcc/mvccpb" ) var ( diff --git a/clientv3/concurrency/election_test.go b/clientv3/concurrency/election_test.go index ea719192b97..de20d3bf7dc 100644 --- a/clientv3/concurrency/election_test.go +++ b/clientv3/concurrency/election_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/concurrency" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/clientv3/concurrency" ) func TestResumeElection(t *testing.T) { diff --git a/clientv3/concurrency/example_election_test.go b/clientv3/concurrency/example_election_test.go index 5cce9f49050..e8f80c28604 100644 --- a/clientv3/concurrency/example_election_test.go +++ b/clientv3/concurrency/example_election_test.go @@ -21,8 +21,8 @@ import ( "sync" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/concurrency" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/clientv3/concurrency" ) func ExampleElection_Campaign() { diff --git a/clientv3/concurrency/example_mutex_test.go b/clientv3/concurrency/example_mutex_test.go index c9a87880624..ed4bf4421e3 100644 --- a/clientv3/concurrency/example_mutex_test.go +++ b/clientv3/concurrency/example_mutex_test.go @@ -19,8 +19,8 @@ import ( "fmt" "log" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/concurrency" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/clientv3/concurrency" ) func ExampleMutex_Lock() { diff --git a/clientv3/concurrency/example_stm_test.go b/clientv3/concurrency/example_stm_test.go index 9eca5300956..f0006546243 100644 --- a/clientv3/concurrency/example_stm_test.go +++ b/clientv3/concurrency/example_stm_test.go @@ -21,8 +21,8 @@ import ( "math/rand" "sync" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/concurrency" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/clientv3/concurrency" ) // ExampleSTM_apply shows how to use STM with a transactional diff --git a/clientv3/concurrency/key.go b/clientv3/concurrency/key.go index 4b6e399bd4e..f22a990ed0f 100644 --- a/clientv3/concurrency/key.go +++ b/clientv3/concurrency/key.go @@ -18,9 +18,9 @@ import ( "context" "fmt" - v3 "github.com/coreos/etcd/clientv3" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/mvcc/mvccpb" + v3 "github.com/ozonru/etcd/clientv3" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/mvcc/mvccpb" ) func waitDelete(ctx context.Context, client *v3.Client, key string, rev int64) error { diff --git a/clientv3/concurrency/main_test.go b/clientv3/concurrency/main_test.go index 797fe9bd189..21f3455856c 100644 --- a/clientv3/concurrency/main_test.go +++ b/clientv3/concurrency/main_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/integration" + "github.com/ozonru/etcd/pkg/testutil" ) var endpoints []string diff --git a/clientv3/concurrency/mutex.go b/clientv3/concurrency/mutex.go index 77b3582cde5..d13a20431cc 100644 --- a/clientv3/concurrency/mutex.go +++ b/clientv3/concurrency/mutex.go @@ -19,8 +19,8 @@ import ( "fmt" "sync" - v3 "github.com/coreos/etcd/clientv3" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + v3 "github.com/ozonru/etcd/clientv3" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" ) // Mutex implements the sync Locker interface with etcd diff --git a/clientv3/concurrency/session.go b/clientv3/concurrency/session.go index c399d64a61d..618aaef9351 100644 --- a/clientv3/concurrency/session.go +++ b/clientv3/concurrency/session.go @@ -18,7 +18,7 @@ import ( "context" "time" - v3 "github.com/coreos/etcd/clientv3" + v3 "github.com/ozonru/etcd/clientv3" ) const defaultSessionTTL = 60 diff --git a/clientv3/concurrency/stm.go b/clientv3/concurrency/stm.go index d11023ebe36..b9a2fe54411 100644 --- a/clientv3/concurrency/stm.go +++ b/clientv3/concurrency/stm.go @@ -18,7 +18,7 @@ import ( "context" "math" - v3 "github.com/coreos/etcd/clientv3" + v3 "github.com/ozonru/etcd/clientv3" ) // STM is an interface for software transactional memory. diff --git a/clientv3/credentials/credentials.go b/clientv3/credentials/credentials.go index 2dc2012924e..c608e6218e6 100644 --- a/clientv3/credentials/credentials.go +++ b/clientv3/credentials/credentials.go @@ -22,8 +22,8 @@ import ( "net" "sync" - "github.com/coreos/etcd/clientv3/balancer/resolver/endpoint" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" + "github.com/ozonru/etcd/clientv3/balancer/resolver/endpoint" + "github.com/ozonru/etcd/etcdserver/api/v3rpc/rpctypes" grpccredentials "google.golang.org/grpc/credentials" ) diff --git a/clientv3/ctx.go b/clientv3/ctx.go index da8297b6c71..e9333499b81 100644 --- a/clientv3/ctx.go +++ b/clientv3/ctx.go @@ -18,8 +18,8 @@ import ( "context" "strings" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/coreos/etcd/version" + "github.com/ozonru/etcd/etcdserver/api/v3rpc/rpctypes" + "github.com/ozonru/etcd/version" "google.golang.org/grpc/metadata" ) diff --git a/clientv3/ctx_test.go b/clientv3/ctx_test.go index 4a357dae685..12e099072f9 100644 --- a/clientv3/ctx_test.go +++ b/clientv3/ctx_test.go @@ -19,8 +19,8 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/coreos/etcd/version" + "github.com/ozonru/etcd/etcdserver/api/v3rpc/rpctypes" + "github.com/ozonru/etcd/version" "google.golang.org/grpc/metadata" ) diff --git a/clientv3/doc.go b/clientv3/doc.go index 717fbe435ea..2cbd5223e7c 100644 --- a/clientv3/doc.go +++ b/clientv3/doc.go @@ -61,7 +61,7 @@ // // 1. context error: canceled or deadline exceeded. // 2. gRPC status error: e.g. when clock drifts in server-side before client's context deadline exceeded. -// 3. gRPC error: see https://github.com/coreos/etcd/blob/master/etcdserver/api/v3rpc/rpctypes/error.go +// 3. gRPC error: see https://github.com/ozonru/etcd/blob/master/etcdserver/api/v3rpc/rpctypes/error.go // // Here is the example code to handle client errors: // diff --git a/clientv3/example_auth_test.go b/clientv3/example_auth_test.go index 8200df99836..de7f379b3ae 100644 --- a/clientv3/example_auth_test.go +++ b/clientv3/example_auth_test.go @@ -19,7 +19,7 @@ import ( "fmt" "log" - "github.com/coreos/etcd/clientv3" + "github.com/ozonru/etcd/clientv3" ) func ExampleAuth() { diff --git a/clientv3/example_cluster_test.go b/clientv3/example_cluster_test.go index 5aa03fd65ee..e11ab213bbd 100644 --- a/clientv3/example_cluster_test.go +++ b/clientv3/example_cluster_test.go @@ -19,7 +19,7 @@ import ( "fmt" "log" - "github.com/coreos/etcd/clientv3" + "github.com/ozonru/etcd/clientv3" ) func ExampleCluster_memberList() { diff --git a/clientv3/example_kv_test.go b/clientv3/example_kv_test.go index e2476e3e781..83e930973d6 100644 --- a/clientv3/example_kv_test.go +++ b/clientv3/example_kv_test.go @@ -19,8 +19,8 @@ import ( "fmt" "log" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/etcdserver/api/v3rpc/rpctypes" ) func ExampleKV_put() { diff --git a/clientv3/example_lease_test.go b/clientv3/example_lease_test.go index 98db148b96e..b57b64b1c7e 100644 --- a/clientv3/example_lease_test.go +++ b/clientv3/example_lease_test.go @@ -19,7 +19,7 @@ import ( "fmt" "log" - "github.com/coreos/etcd/clientv3" + "github.com/ozonru/etcd/clientv3" ) func ExampleLease_grant() { diff --git a/clientv3/example_maintenence_test.go b/clientv3/example_maintenence_test.go index a66a23abc61..33411a5d049 100644 --- a/clientv3/example_maintenence_test.go +++ b/clientv3/example_maintenence_test.go @@ -19,7 +19,7 @@ import ( "fmt" "log" - "github.com/coreos/etcd/clientv3" + "github.com/ozonru/etcd/clientv3" ) func ExampleMaintenance_status() { diff --git a/clientv3/example_metrics_test.go b/clientv3/example_metrics_test.go index 802a2af1f70..2b9e0e894b3 100644 --- a/clientv3/example_metrics_test.go +++ b/clientv3/example_metrics_test.go @@ -23,7 +23,7 @@ import ( "net/http" "strings" - "github.com/coreos/etcd/clientv3" + "github.com/ozonru/etcd/clientv3" grpcprom "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" diff --git a/clientv3/example_test.go b/clientv3/example_test.go index e486981e5db..59b851ba352 100644 --- a/clientv3/example_test.go +++ b/clientv3/example_test.go @@ -20,8 +20,8 @@ import ( "os" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/pkg/transport" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/pkg/transport" "google.golang.org/grpc/grpclog" ) diff --git a/clientv3/example_watch_test.go b/clientv3/example_watch_test.go index 08c199b38e3..34ebf180306 100644 --- a/clientv3/example_watch_test.go +++ b/clientv3/example_watch_test.go @@ -19,7 +19,7 @@ import ( "fmt" "log" - "github.com/coreos/etcd/clientv3" + "github.com/ozonru/etcd/clientv3" ) func ExampleWatcher_watch() { diff --git a/clientv3/integration/black_hole_test.go b/clientv3/integration/black_hole_test.go index 7f73c92737d..01174831a5d 100644 --- a/clientv3/integration/black_hole_test.go +++ b/clientv3/integration/black_hole_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/etcdserver/api/v3rpc/rpctypes" + "github.com/ozonru/etcd/integration" + "github.com/ozonru/etcd/pkg/testutil" "google.golang.org/grpc" ) diff --git a/clientv3/integration/cluster_test.go b/clientv3/integration/cluster_test.go index 4a81b89c871..dff2547c563 100644 --- a/clientv3/integration/cluster_test.go +++ b/clientv3/integration/cluster_test.go @@ -19,9 +19,9 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/pkg/types" + "github.com/ozonru/etcd/integration" + "github.com/ozonru/etcd/pkg/testutil" + "github.com/ozonru/etcd/pkg/types" ) func TestMemberList(t *testing.T) { diff --git a/clientv3/integration/dial_test.go b/clientv3/integration/dial_test.go index 9abe1b10218..975b3806abf 100644 --- a/clientv3/integration/dial_test.go +++ b/clientv3/integration/dial_test.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/pkg/transport" + "github.com/ozonru/etcd/clientv3" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/integration" + "github.com/ozonru/etcd/pkg/testutil" + "github.com/ozonru/etcd/pkg/transport" "google.golang.org/grpc" ) diff --git a/clientv3/integration/kv_test.go b/clientv3/integration/kv_test.go index a6161bb68c7..ab183ed97f9 100644 --- a/clientv3/integration/kv_test.go +++ b/clientv3/integration/kv_test.go @@ -23,11 +23,11 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/mvcc/mvccpb" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/etcdserver/api/v3rpc/rpctypes" + "github.com/ozonru/etcd/integration" + "github.com/ozonru/etcd/mvcc/mvccpb" + "github.com/ozonru/etcd/pkg/testutil" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/clientv3/integration/lease_test.go b/clientv3/integration/lease_test.go index 703ef80c0e9..0396a67308a 100644 --- a/clientv3/integration/lease_test.go +++ b/clientv3/integration/lease_test.go @@ -22,11 +22,11 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/concurrency" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/clientv3/concurrency" + "github.com/ozonru/etcd/etcdserver/api/v3rpc/rpctypes" + "github.com/ozonru/etcd/integration" + "github.com/ozonru/etcd/pkg/testutil" "google.golang.org/grpc" ) diff --git a/clientv3/integration/leasing_test.go b/clientv3/integration/leasing_test.go index b56478361d9..c8b5059e6a5 100644 --- a/clientv3/integration/leasing_test.go +++ b/clientv3/integration/leasing_test.go @@ -23,11 +23,11 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/concurrency" - "github.com/coreos/etcd/clientv3/leasing" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/clientv3/concurrency" + "github.com/ozonru/etcd/clientv3/leasing" + "github.com/ozonru/etcd/integration" + "github.com/ozonru/etcd/pkg/testutil" ) func TestLeasingPutGet(t *testing.T) { diff --git a/clientv3/integration/logger_test.go b/clientv3/integration/logger_test.go index 48da6e8bdcc..7824f67be34 100644 --- a/clientv3/integration/logger_test.go +++ b/clientv3/integration/logger_test.go @@ -17,7 +17,7 @@ package integration import ( "io/ioutil" - "github.com/coreos/etcd/clientv3" + "github.com/ozonru/etcd/clientv3" "google.golang.org/grpc/grpclog" ) diff --git a/clientv3/integration/main_test.go b/clientv3/integration/main_test.go index 2913ce51154..fc5dcfda721 100644 --- a/clientv3/integration/main_test.go +++ b/clientv3/integration/main_test.go @@ -8,7 +8,7 @@ import ( "os" "testing" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/pkg/testutil" ) func TestMain(m *testing.M) { diff --git a/clientv3/integration/maintenance_test.go b/clientv3/integration/maintenance_test.go index d25c4e9bad2..61387b0626d 100644 --- a/clientv3/integration/maintenance_test.go +++ b/clientv3/integration/maintenance_test.go @@ -24,12 +24,12 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/etcdserver/api/v3rpc/rpctypes" + "github.com/ozonru/etcd/integration" + "github.com/ozonru/etcd/lease" + "github.com/ozonru/etcd/mvcc" + "github.com/ozonru/etcd/mvcc/backend" + "github.com/ozonru/etcd/pkg/testutil" ) func TestMaintenanceHashKV(t *testing.T) { diff --git a/clientv3/integration/metrics_test.go b/clientv3/integration/metrics_test.go index cd45500ba3f..89c8819520b 100644 --- a/clientv3/integration/metrics_test.go +++ b/clientv3/integration/metrics_test.go @@ -25,10 +25,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/pkg/transport" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/integration" + "github.com/ozonru/etcd/pkg/testutil" + "github.com/ozonru/etcd/pkg/transport" grpcprom "github.com/grpc-ecosystem/go-grpc-prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" diff --git a/clientv3/integration/mirror_test.go b/clientv3/integration/mirror_test.go index 01bfef10a2c..c3e5a62ed59 100644 --- a/clientv3/integration/mirror_test.go +++ b/clientv3/integration/mirror_test.go @@ -22,10 +22,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3/mirror" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/mvcc/mvccpb" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/clientv3/mirror" + "github.com/ozonru/etcd/integration" + "github.com/ozonru/etcd/mvcc/mvccpb" + "github.com/ozonru/etcd/pkg/testutil" ) func TestMirrorSync(t *testing.T) { diff --git a/clientv3/integration/namespace_test.go b/clientv3/integration/namespace_test.go index b952d333d5b..6488120b7f6 100644 --- a/clientv3/integration/namespace_test.go +++ b/clientv3/integration/namespace_test.go @@ -19,11 +19,11 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/namespace" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/mvcc/mvccpb" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/clientv3/namespace" + "github.com/ozonru/etcd/integration" + "github.com/ozonru/etcd/mvcc/mvccpb" + "github.com/ozonru/etcd/pkg/testutil" ) func TestNamespacePutGet(t *testing.T) { diff --git a/clientv3/integration/network_partition_test.go b/clientv3/integration/network_partition_test.go index acba7472b87..59f7237e2cf 100644 --- a/clientv3/integration/network_partition_test.go +++ b/clientv3/integration/network_partition_test.go @@ -22,11 +22,11 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/etcdserver/api/v3rpc/rpctypes" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/integration" + "github.com/ozonru/etcd/pkg/testutil" "google.golang.org/grpc" ) diff --git a/clientv3/integration/role_test.go b/clientv3/integration/role_test.go index 5b4fad43c73..91e274d9170 100644 --- a/clientv3/integration/role_test.go +++ b/clientv3/integration/role_test.go @@ -18,9 +18,9 @@ import ( "context" "testing" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/etcdserver/api/v3rpc/rpctypes" + "github.com/ozonru/etcd/integration" + "github.com/ozonru/etcd/pkg/testutil" ) func TestRoleError(t *testing.T) { diff --git a/clientv3/integration/server_shutdown_test.go b/clientv3/integration/server_shutdown_test.go index 2058a3ebb2d..6de7c9f3029 100644 --- a/clientv3/integration/server_shutdown_test.go +++ b/clientv3/integration/server_shutdown_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/etcdserver/api/v3rpc/rpctypes" + "github.com/ozonru/etcd/integration" + "github.com/ozonru/etcd/pkg/testutil" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/clientv3/integration/txn_test.go b/clientv3/integration/txn_test.go index 14f8b81a7ba..e9e83146204 100644 --- a/clientv3/integration/txn_test.go +++ b/clientv3/integration/txn_test.go @@ -20,11 +20,11 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/embed" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/embed" + "github.com/ozonru/etcd/etcdserver/api/v3rpc/rpctypes" + "github.com/ozonru/etcd/integration" + "github.com/ozonru/etcd/pkg/testutil" ) func TestTxnError(t *testing.T) { diff --git a/clientv3/integration/user_test.go b/clientv3/integration/user_test.go index 11548123ddb..98cb6d5ff88 100644 --- a/clientv3/integration/user_test.go +++ b/clientv3/integration/user_test.go @@ -18,10 +18,10 @@ import ( "context" "testing" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/etcdserver/api/v3rpc/rpctypes" + "github.com/ozonru/etcd/integration" + "github.com/ozonru/etcd/pkg/testutil" ) func TestUserError(t *testing.T) { diff --git a/clientv3/integration/util.go b/clientv3/integration/util.go index 89796e17fcc..99194303922 100644 --- a/clientv3/integration/util.go +++ b/clientv3/integration/util.go @@ -19,7 +19,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" + "github.com/ozonru/etcd/clientv3" ) // mustWaitPinReady waits up to 3-second until connection is up (pin endpoint). diff --git a/clientv3/integration/watch_fragment_test.go b/clientv3/integration/watch_fragment_test.go index dd6a8448f06..ad2f83886b3 100644 --- a/clientv3/integration/watch_fragment_test.go +++ b/clientv3/integration/watch_fragment_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/integration" + "github.com/ozonru/etcd/pkg/testutil" ) // TestWatchFragmentDisable ensures that large watch diff --git a/clientv3/integration/watch_test.go b/clientv3/integration/watch_test.go index 3c2e3c0dc94..2294fdc9315 100644 --- a/clientv3/integration/watch_test.go +++ b/clientv3/integration/watch_test.go @@ -23,12 +23,12 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3rpc" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - "github.com/coreos/etcd/integration" - mvccpb "github.com/coreos/etcd/mvcc/mvccpb" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/etcdserver/api/v3rpc" + "github.com/ozonru/etcd/etcdserver/api/v3rpc/rpctypes" + "github.com/ozonru/etcd/integration" + mvccpb "github.com/ozonru/etcd/mvcc/mvccpb" + "github.com/ozonru/etcd/pkg/testutil" "google.golang.org/grpc/metadata" ) diff --git a/clientv3/kv.go b/clientv3/kv.go index 5a7469bd4c9..b4a84a15d6c 100644 --- a/clientv3/kv.go +++ b/clientv3/kv.go @@ -17,7 +17,7 @@ package clientv3 import ( "context" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" ) diff --git a/clientv3/lease.go b/clientv3/lease.go index 3729cf37be0..5dd6212713c 100644 --- a/clientv3/lease.go +++ b/clientv3/lease.go @@ -19,8 +19,8 @@ import ( "sync" "time" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/etcdserver/api/v3rpc/rpctypes" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" "google.golang.org/grpc/metadata" @@ -132,7 +132,7 @@ type Lease interface { // is returned. Otherwise, it retries. // // TODO(v4.0): post errors to last keep alive message before closing - // (see https://github.com/coreos/etcd/pull/7866) + // (see https://github.com/ozonru/etcd/pull/7866) KeepAlive(ctx context.Context, id LeaseID) (<-chan *LeaseKeepAliveResponse, error) // KeepAliveOnce renews the lease once. The response corresponds to the diff --git a/clientv3/leasing/cache.go b/clientv3/leasing/cache.go index 6903a785c78..f2b3bf5b151 100644 --- a/clientv3/leasing/cache.go +++ b/clientv3/leasing/cache.go @@ -20,9 +20,9 @@ import ( "sync" "time" - v3 "github.com/coreos/etcd/clientv3" - v3pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/mvcc/mvccpb" + v3 "github.com/ozonru/etcd/clientv3" + v3pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/mvcc/mvccpb" ) const revokeBackoff = 2 * time.Second diff --git a/clientv3/leasing/kv.go b/clientv3/leasing/kv.go index 5a5e2312b72..612c63a330a 100644 --- a/clientv3/leasing/kv.go +++ b/clientv3/leasing/kv.go @@ -20,11 +20,11 @@ import ( "sync" "time" - v3 "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/concurrency" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/mvcc/mvccpb" + v3 "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/clientv3/concurrency" + "github.com/ozonru/etcd/etcdserver/api/v3rpc/rpctypes" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/mvcc/mvccpb" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/clientv3/leasing/txn.go b/clientv3/leasing/txn.go index 76e4f36938a..191b8e8d3ae 100644 --- a/clientv3/leasing/txn.go +++ b/clientv3/leasing/txn.go @@ -18,8 +18,8 @@ import ( "context" "strings" - v3 "github.com/coreos/etcd/clientv3" - v3pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + v3 "github.com/ozonru/etcd/clientv3" + v3pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" ) type txnLeasing struct { diff --git a/clientv3/leasing/util.go b/clientv3/leasing/util.go index 61f6e8c33fc..47e47015b04 100644 --- a/clientv3/leasing/util.go +++ b/clientv3/leasing/util.go @@ -17,8 +17,8 @@ package leasing import ( "bytes" - v3 "github.com/coreos/etcd/clientv3" - v3pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + v3 "github.com/ozonru/etcd/clientv3" + v3pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" ) func compareInt64(a, b int64) int { diff --git a/clientv3/logger.go b/clientv3/logger.go index 3276372ad38..bbbf4f346d1 100644 --- a/clientv3/logger.go +++ b/clientv3/logger.go @@ -18,7 +18,7 @@ import ( "io/ioutil" "sync" - "github.com/coreos/etcd/pkg/logutil" + "github.com/ozonru/etcd/pkg/logutil" "google.golang.org/grpc/grpclog" ) diff --git a/clientv3/main_test.go b/clientv3/main_test.go index 89b30860b82..713ffc05ee7 100644 --- a/clientv3/main_test.go +++ b/clientv3/main_test.go @@ -22,9 +22,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/auth" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/auth" + "github.com/ozonru/etcd/integration" + "github.com/ozonru/etcd/pkg/testutil" "golang.org/x/crypto/bcrypt" ) diff --git a/clientv3/maintenance.go b/clientv3/maintenance.go index 6db6c0e96a3..b4f532ec4f7 100644 --- a/clientv3/maintenance.go +++ b/clientv3/maintenance.go @@ -19,7 +19,7 @@ import ( "fmt" "io" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" ) diff --git a/clientv3/mirror/syncer.go b/clientv3/mirror/syncer.go index b820933227c..9c658a116cd 100644 --- a/clientv3/mirror/syncer.go +++ b/clientv3/mirror/syncer.go @@ -18,7 +18,7 @@ package mirror import ( "context" - "github.com/coreos/etcd/clientv3" + "github.com/ozonru/etcd/clientv3" ) const ( diff --git a/clientv3/namespace/kv.go b/clientv3/namespace/kv.go index 13dd83a2455..5124070b9d5 100644 --- a/clientv3/namespace/kv.go +++ b/clientv3/namespace/kv.go @@ -17,9 +17,9 @@ package namespace import ( "context" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/etcdserver/api/v3rpc/rpctypes" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" ) type kvPrefix struct { diff --git a/clientv3/namespace/lease.go b/clientv3/namespace/lease.go index f092106cbf2..a64b6069d1f 100644 --- a/clientv3/namespace/lease.go +++ b/clientv3/namespace/lease.go @@ -18,7 +18,7 @@ import ( "bytes" "context" - "github.com/coreos/etcd/clientv3" + "github.com/ozonru/etcd/clientv3" ) type leasePrefix struct { diff --git a/clientv3/namespace/watch.go b/clientv3/namespace/watch.go index 5a9596df5d8..1bc34a4fef0 100644 --- a/clientv3/namespace/watch.go +++ b/clientv3/namespace/watch.go @@ -18,7 +18,7 @@ import ( "context" "sync" - "github.com/coreos/etcd/clientv3" + "github.com/ozonru/etcd/clientv3" ) type watcherPrefix struct { diff --git a/clientv3/naming/doc.go b/clientv3/naming/doc.go index 71608cc738b..13a4474491a 100644 --- a/clientv3/naming/doc.go +++ b/clientv3/naming/doc.go @@ -17,8 +17,8 @@ // To use, first import the packages: // // import ( -// "github.com/coreos/etcd/clientv3" -// etcdnaming "github.com/coreos/etcd/clientv3/naming" +// "github.com/ozonru/etcd/clientv3" +// etcdnaming "github.com/ozonru/etcd/clientv3/naming" // // "google.golang.org/grpc" // "google.golang.org/grpc/naming" diff --git a/clientv3/naming/grpc.go b/clientv3/naming/grpc.go index 3c0e8e664bd..78e4dffdf63 100644 --- a/clientv3/naming/grpc.go +++ b/clientv3/naming/grpc.go @@ -19,7 +19,7 @@ import ( "encoding/json" "fmt" - etcd "github.com/coreos/etcd/clientv3" + etcd "github.com/ozonru/etcd/clientv3" "google.golang.org/grpc/codes" "google.golang.org/grpc/naming" diff --git a/clientv3/naming/grpc_test.go b/clientv3/naming/grpc_test.go index d0157f132fb..649279c1520 100644 --- a/clientv3/naming/grpc_test.go +++ b/clientv3/naming/grpc_test.go @@ -20,9 +20,9 @@ import ( "reflect" "testing" - etcd "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" + etcd "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/integration" + "github.com/ozonru/etcd/pkg/testutil" "google.golang.org/grpc/naming" ) diff --git a/clientv3/op.go b/clientv3/op.go index 3dca41b5faa..505eab0c177 100644 --- a/clientv3/op.go +++ b/clientv3/op.go @@ -14,7 +14,7 @@ package clientv3 -import pb "github.com/coreos/etcd/etcdserver/etcdserverpb" +import pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" type opType int diff --git a/clientv3/op_test.go b/clientv3/op_test.go index de533f95435..5749daa67fd 100644 --- a/clientv3/op_test.go +++ b/clientv3/op_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" ) // TestOpWithSort tests if WithSort(ASCEND, KEY) and WithLimit are specified, diff --git a/clientv3/ordering/kv.go b/clientv3/ordering/kv.go index dc9926ec6c2..abd0fbb492f 100644 --- a/clientv3/ordering/kv.go +++ b/clientv3/ordering/kv.go @@ -18,7 +18,7 @@ import ( "context" "sync" - "github.com/coreos/etcd/clientv3" + "github.com/ozonru/etcd/clientv3" ) // kvOrdering ensures that serialized requests do not return diff --git a/clientv3/ordering/kv_test.go b/clientv3/ordering/kv_test.go index 9e884f3b291..1a4c37378fa 100644 --- a/clientv3/ordering/kv_test.go +++ b/clientv3/ordering/kv_test.go @@ -22,10 +22,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/clientv3" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/integration" + "github.com/ozonru/etcd/pkg/testutil" ) func TestDetectKvOrderViolation(t *testing.T) { diff --git a/clientv3/ordering/logger_test.go b/clientv3/ordering/logger_test.go index 986c54148ad..f6b16fe1180 100644 --- a/clientv3/ordering/logger_test.go +++ b/clientv3/ordering/logger_test.go @@ -17,7 +17,7 @@ package ordering import ( "io/ioutil" - "github.com/coreos/etcd/clientv3" + "github.com/ozonru/etcd/clientv3" "github.com/coreos/pkg/capnslog" "google.golang.org/grpc/grpclog" diff --git a/clientv3/ordering/util.go b/clientv3/ordering/util.go index 190a5919a52..4afb7c4a308 100644 --- a/clientv3/ordering/util.go +++ b/clientv3/ordering/util.go @@ -19,7 +19,7 @@ import ( "sync" "time" - "github.com/coreos/etcd/clientv3" + "github.com/ozonru/etcd/clientv3" ) type OrderViolationFunc func(op clientv3.Op, resp clientv3.OpResponse, prevRev int64) error diff --git a/clientv3/ordering/util_test.go b/clientv3/ordering/util_test.go index 142c67072c2..cc80bbbaa96 100644 --- a/clientv3/ordering/util_test.go +++ b/clientv3/ordering/util_test.go @@ -19,9 +19,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/integration" + "github.com/ozonru/etcd/pkg/testutil" ) func TestEndpointSwitchResolvesViolation(t *testing.T) { diff --git a/clientv3/retry.go b/clientv3/retry.go index 6baa52e14a5..4b9a4b35379 100644 --- a/clientv3/retry.go +++ b/clientv3/retry.go @@ -17,8 +17,8 @@ package clientv3 import ( "context" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/etcdserver/api/v3rpc/rpctypes" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/clientv3/retry_interceptor.go b/clientv3/retry_interceptor.go index f3c50570677..a3182e0321a 100644 --- a/clientv3/retry_interceptor.go +++ b/clientv3/retry_interceptor.go @@ -23,7 +23,7 @@ import ( "sync" "time" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" + "github.com/ozonru/etcd/etcdserver/api/v3rpc/rpctypes" "go.uber.org/zap" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/clientv3/snapshot/v3_snapshot.go b/clientv3/snapshot/v3_snapshot.go index 6bf9244aa66..6c54a43276d 100644 --- a/clientv3/snapshot/v3_snapshot.go +++ b/clientv3/snapshot/v3_snapshot.go @@ -29,21 +29,21 @@ import ( "time" bolt "github.com/coreos/bbolt" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/etcdserver/membership" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/pkg/fileutil" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/snap" - "github.com/coreos/etcd/store" - "github.com/coreos/etcd/wal" - "github.com/coreos/etcd/wal/walpb" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/etcdserver" + "github.com/ozonru/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/etcdserver/membership" + "github.com/ozonru/etcd/lease" + "github.com/ozonru/etcd/mvcc" + "github.com/ozonru/etcd/mvcc/backend" + "github.com/ozonru/etcd/pkg/fileutil" + "github.com/ozonru/etcd/pkg/types" + "github.com/ozonru/etcd/raft" + "github.com/ozonru/etcd/raft/raftpb" + "github.com/ozonru/etcd/snap" + "github.com/ozonru/etcd/store" + "github.com/ozonru/etcd/wal" + "github.com/ozonru/etcd/wal/walpb" "go.uber.org/zap" ) diff --git a/clientv3/txn.go b/clientv3/txn.go index c3c2d248569..44c28764bdf 100644 --- a/clientv3/txn.go +++ b/clientv3/txn.go @@ -18,7 +18,7 @@ import ( "context" "sync" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" ) diff --git a/clientv3/txn_test.go b/clientv3/txn_test.go index d48151612d5..0224e6a1471 100644 --- a/clientv3/txn_test.go +++ b/clientv3/txn_test.go @@ -18,7 +18,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/pkg/testutil" ) func TestTxnPanics(t *testing.T) { diff --git a/clientv3/watch.go b/clientv3/watch.go index 4a3b8cccda0..f8a6bdd0c81 100644 --- a/clientv3/watch.go +++ b/clientv3/watch.go @@ -21,9 +21,9 @@ import ( "sync" "time" - v3rpc "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - mvccpb "github.com/coreos/etcd/mvcc/mvccpb" + v3rpc "github.com/ozonru/etcd/etcdserver/api/v3rpc/rpctypes" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" + mvccpb "github.com/ozonru/etcd/mvcc/mvccpb" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/clientv3/watch_test.go b/clientv3/watch_test.go index 8d3380522f0..f64f956e348 100644 --- a/clientv3/watch_test.go +++ b/clientv3/watch_test.go @@ -17,7 +17,7 @@ package clientv3 import ( "testing" - "github.com/coreos/etcd/mvcc/mvccpb" + "github.com/ozonru/etcd/mvcc/mvccpb" ) func TestEvent(t *testing.T) { diff --git a/clientv3/yaml/config.go b/clientv3/yaml/config.go index ced50389590..0224a47aa7a 100644 --- a/clientv3/yaml/config.go +++ b/clientv3/yaml/config.go @@ -22,8 +22,8 @@ import ( "sigs.k8s.io/yaml" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/pkg/tlsutil" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/pkg/tlsutil" ) type yamlConfig struct { diff --git a/compactor/compactor.go b/compactor/compactor.go index 8100b69385a..3ad33d6b5d1 100644 --- a/compactor/compactor.go +++ b/compactor/compactor.go @@ -19,13 +19,13 @@ import ( "fmt" "time" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" "github.com/coreos/pkg/capnslog" ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "compactor") + plog = capnslog.NewPackageLogger("github.com/ozonru/etcd", "compactor") ) const ( diff --git a/compactor/compactor_test.go b/compactor/compactor_test.go index c3db1c1f8e1..640bdf3dfed 100644 --- a/compactor/compactor_test.go +++ b/compactor/compactor_test.go @@ -18,8 +18,8 @@ import ( "context" "sync/atomic" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/testutil" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/pkg/testutil" ) type fakeCompactable struct { diff --git a/compactor/periodic.go b/compactor/periodic.go index 9d9164e9c5c..9da4c07f364 100644 --- a/compactor/periodic.go +++ b/compactor/periodic.go @@ -19,8 +19,8 @@ import ( "sync" "time" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/mvcc" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/mvcc" "github.com/jonboulle/clockwork" ) diff --git a/compactor/periodic_test.go b/compactor/periodic_test.go index 21e539e765d..85c680ffff7 100644 --- a/compactor/periodic_test.go +++ b/compactor/periodic_test.go @@ -19,8 +19,8 @@ import ( "testing" "time" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/testutil" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/pkg/testutil" "github.com/jonboulle/clockwork" ) diff --git a/compactor/revision.go b/compactor/revision.go index 927e41c97fa..cfe1d9a786d 100644 --- a/compactor/revision.go +++ b/compactor/revision.go @@ -19,8 +19,8 @@ import ( "sync" "time" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/mvcc" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/mvcc" "github.com/jonboulle/clockwork" ) diff --git a/compactor/revision_test.go b/compactor/revision_test.go index 905683c36dd..0863facd9b4 100644 --- a/compactor/revision_test.go +++ b/compactor/revision_test.go @@ -19,8 +19,8 @@ import ( "testing" "time" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/testutil" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/pkg/testutil" "github.com/jonboulle/clockwork" ) diff --git a/contrib/raftexample/httpapi.go b/contrib/raftexample/httpapi.go index 10d3a5d9be4..4faf6b6be1b 100644 --- a/contrib/raftexample/httpapi.go +++ b/contrib/raftexample/httpapi.go @@ -20,7 +20,7 @@ import ( "net/http" "strconv" - "github.com/coreos/etcd/raft/raftpb" + "github.com/ozonru/etcd/raft/raftpb" ) // Handler for a http based key-value store backed by raft diff --git a/contrib/raftexample/kvstore.go b/contrib/raftexample/kvstore.go index d877bc7ad5e..b4091ece382 100644 --- a/contrib/raftexample/kvstore.go +++ b/contrib/raftexample/kvstore.go @@ -21,7 +21,7 @@ import ( "log" "sync" - "github.com/coreos/etcd/snap" + "github.com/ozonru/etcd/snap" ) // a key-value store backed by raft diff --git a/contrib/raftexample/main.go b/contrib/raftexample/main.go index 5826924695a..7dfe98211f6 100644 --- a/contrib/raftexample/main.go +++ b/contrib/raftexample/main.go @@ -18,7 +18,7 @@ import ( "flag" "strings" - "github.com/coreos/etcd/raft/raftpb" + "github.com/ozonru/etcd/raft/raftpb" ) func main() { diff --git a/contrib/raftexample/raft.go b/contrib/raftexample/raft.go index 2b7f3207a90..c79d1d54d94 100644 --- a/contrib/raftexample/raft.go +++ b/contrib/raftexample/raft.go @@ -24,15 +24,15 @@ import ( "strconv" "time" - "github.com/coreos/etcd/etcdserver/stats" - "github.com/coreos/etcd/pkg/fileutil" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/rafthttp" - "github.com/coreos/etcd/snap" - "github.com/coreos/etcd/wal" - "github.com/coreos/etcd/wal/walpb" + "github.com/ozonru/etcd/etcdserver/stats" + "github.com/ozonru/etcd/pkg/fileutil" + "github.com/ozonru/etcd/pkg/types" + "github.com/ozonru/etcd/raft" + "github.com/ozonru/etcd/raft/raftpb" + "github.com/ozonru/etcd/rafthttp" + "github.com/ozonru/etcd/snap" + "github.com/ozonru/etcd/wal" + "github.com/ozonru/etcd/wal/walpb" ) // A key-value stream backed by raft diff --git a/contrib/raftexample/raftexample_test.go b/contrib/raftexample/raftexample_test.go index 16b5a4e7754..ce05ecd133d 100644 --- a/contrib/raftexample/raftexample_test.go +++ b/contrib/raftexample/raftexample_test.go @@ -19,7 +19,7 @@ import ( "os" "testing" - "github.com/coreos/etcd/raft/raftpb" + "github.com/ozonru/etcd/raft/raftpb" ) type cluster struct { diff --git a/contrib/recipes/barrier.go b/contrib/recipes/barrier.go index 6e92817219d..1cd1dab7103 100644 --- a/contrib/recipes/barrier.go +++ b/contrib/recipes/barrier.go @@ -17,8 +17,8 @@ package recipe import ( "context" - v3 "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/mvcc/mvccpb" + v3 "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/mvcc/mvccpb" ) // Barrier creates a key in etcd to block processes, then deletes the key to diff --git a/contrib/recipes/client.go b/contrib/recipes/client.go index 111b0b40c5c..4b0ddf195f7 100644 --- a/contrib/recipes/client.go +++ b/contrib/recipes/client.go @@ -18,8 +18,8 @@ import ( "context" "errors" - v3 "github.com/coreos/etcd/clientv3" - spb "github.com/coreos/etcd/mvcc/mvccpb" + v3 "github.com/ozonru/etcd/clientv3" + spb "github.com/ozonru/etcd/mvcc/mvccpb" ) var ( diff --git a/contrib/recipes/double_barrier.go b/contrib/recipes/double_barrier.go index 93cc61b4f8a..d92bb34fe91 100644 --- a/contrib/recipes/double_barrier.go +++ b/contrib/recipes/double_barrier.go @@ -17,9 +17,9 @@ package recipe import ( "context" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/concurrency" - "github.com/coreos/etcd/mvcc/mvccpb" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/clientv3/concurrency" + "github.com/ozonru/etcd/mvcc/mvccpb" ) // DoubleBarrier blocks processes on Enter until an expected count enters, then diff --git a/contrib/recipes/key.go b/contrib/recipes/key.go index aea00059aa8..61cf62a1fee 100644 --- a/contrib/recipes/key.go +++ b/contrib/recipes/key.go @@ -20,8 +20,8 @@ import ( "strings" "time" - v3 "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/concurrency" + v3 "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/clientv3/concurrency" ) // RemoteKV is a key/revision pair created by the client and stored on etcd diff --git a/contrib/recipes/priority_queue.go b/contrib/recipes/priority_queue.go index 2378ce2f89f..12ec63938d4 100644 --- a/contrib/recipes/priority_queue.go +++ b/contrib/recipes/priority_queue.go @@ -18,8 +18,8 @@ import ( "context" "fmt" - v3 "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/mvcc/mvccpb" + v3 "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/mvcc/mvccpb" ) // PriorityQueue implements a multi-reader, multi-writer distributed queue. diff --git a/contrib/recipes/queue.go b/contrib/recipes/queue.go index 5d0423a427e..cfb2b254790 100644 --- a/contrib/recipes/queue.go +++ b/contrib/recipes/queue.go @@ -17,8 +17,8 @@ package recipe import ( "context" - v3 "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/mvcc/mvccpb" + v3 "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/mvcc/mvccpb" ) // Queue implements a multi-reader, multi-writer distributed queue. diff --git a/contrib/recipes/rwmutex.go b/contrib/recipes/rwmutex.go index 1213b7e4202..48b22f54c67 100644 --- a/contrib/recipes/rwmutex.go +++ b/contrib/recipes/rwmutex.go @@ -17,9 +17,9 @@ package recipe import ( "context" - v3 "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/concurrency" - "github.com/coreos/etcd/mvcc/mvccpb" + v3 "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/clientv3/concurrency" + "github.com/ozonru/etcd/mvcc/mvccpb" ) type RWMutex struct { diff --git a/contrib/recipes/watch.go b/contrib/recipes/watch.go index 5367872273f..fd13c737341 100644 --- a/contrib/recipes/watch.go +++ b/contrib/recipes/watch.go @@ -17,8 +17,8 @@ package recipe import ( "context" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/mvcc/mvccpb" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/mvcc/mvccpb" ) // WaitEvents waits on a key until it observes the given events and returns the final one. diff --git a/contrib/systemd/etcd.service b/contrib/systemd/etcd.service index 3550f3d77a2..893927fb84c 100644 --- a/contrib/systemd/etcd.service +++ b/contrib/systemd/etcd.service @@ -1,6 +1,6 @@ [Unit] Description=etcd key-value store -Documentation=https://github.com/coreos/etcd +Documentation=https://github.com/ozonru/etcd After=network.target [Service] diff --git a/contrib/systemd/etcd3-multinode/README.md b/contrib/systemd/etcd3-multinode/README.md index cab9ab4d4cb..985a397e18f 100644 --- a/contrib/systemd/etcd3-multinode/README.md +++ b/contrib/systemd/etcd3-multinode/README.md @@ -20,7 +20,7 @@ In each machine, write etcd systemd service files: cat > /tmp/my-etcd-1.service < /tmp/my-etcd-2.service < /tmp/my-etcd-3.service <&1 | tee test-$(TEST_SUFFIX).log" ! egrep "(--- FAIL:|panic: test timed out|appears to have leaked)" -B50 -A10 test-$(TEST_SUFFIX).log @@ -161,7 +161,7 @@ docker-test-coverage: docker run \ --rm \ $(TMP_DIR_MOUNT_FLAG) \ - --mount type=bind,source=`pwd`,destination=/go/src/github.com/coreos/etcd \ + --mount type=bind,source=`pwd`,destination=/go/src/github.com/ozonru/etcd \ gcr.io/etcd-development/etcd-test:go$(GO_VERSION) \ /bin/bash -c "COVERDIR=covdir PASSES='build build_cov cov' ./test 2>&1 | tee docker-test-coverage-$(TEST_SUFFIX).log && /codecov -t 6040de41-c073-4d6f-bbf8-d89256ef31e1" ! egrep "(--- FAIL:|panic: test timed out|appears to have leaked)" -B50 -A10 docker-test-coverage-$(TEST_SUFFIX).log diff --git a/hack/tls-setup/README.md b/hack/tls-setup/README.md index 9f68739592e..d9e5451b7e4 100644 --- a/hack/tls-setup/README.md +++ b/hack/tls-setup/README.md @@ -5,7 +5,7 @@ Defaults generate an ECDSA-384 root and leaf certificates for `localhost`. etcd **Instructions** 1. Install git, go, and make -2. Amend https://github.com/coreos/etcd/blob/master/hack/tls-setup/config/req-csr.json - IP's currently in the config should be replaced/added with IP addresses of each cluster node, please note 127.0.0.1 is always required for loopback purposes: +2. Amend https://github.com/ozonru/etcd/blob/master/hack/tls-setup/config/req-csr.json - IP's currently in the config should be replaced/added with IP addresses of each cluster node, please note 127.0.0.1 is always required for loopback purposes: ```json Example: { diff --git a/integration/bridge.go b/integration/bridge.go index 9792ba89f94..5be9e09037c 100644 --- a/integration/bridge.go +++ b/integration/bridge.go @@ -21,7 +21,7 @@ import ( "net" "sync" - "github.com/coreos/etcd/pkg/transport" + "github.com/ozonru/etcd/pkg/transport" ) // bridge creates a unix socket bridge to another unix socket, making it possible diff --git a/integration/cluster.go b/integration/cluster.go index d426e2770f9..dff235053e1 100644 --- a/integration/cluster.go +++ b/integration/cluster.go @@ -32,24 +32,24 @@ import ( "testing" "time" - "github.com/coreos/etcd/client" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/embed" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/api/etcdhttp" - "github.com/coreos/etcd/etcdserver/api/v2http" - "github.com/coreos/etcd/etcdserver/api/v3client" - "github.com/coreos/etcd/etcdserver/api/v3election" - epb "github.com/coreos/etcd/etcdserver/api/v3election/v3electionpb" - "github.com/coreos/etcd/etcdserver/api/v3lock" - lockpb "github.com/coreos/etcd/etcdserver/api/v3lock/v3lockpb" - "github.com/coreos/etcd/etcdserver/api/v3rpc" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/pkg/tlsutil" - "github.com/coreos/etcd/pkg/transport" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/rafthttp" + "github.com/ozonru/etcd/client" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/embed" + "github.com/ozonru/etcd/etcdserver" + "github.com/ozonru/etcd/etcdserver/api/etcdhttp" + "github.com/ozonru/etcd/etcdserver/api/v2http" + "github.com/ozonru/etcd/etcdserver/api/v3client" + "github.com/ozonru/etcd/etcdserver/api/v3election" + epb "github.com/ozonru/etcd/etcdserver/api/v3election/v3electionpb" + "github.com/ozonru/etcd/etcdserver/api/v3lock" + lockpb "github.com/ozonru/etcd/etcdserver/api/v3lock/v3lockpb" + "github.com/ozonru/etcd/etcdserver/api/v3rpc" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/pkg/testutil" + "github.com/ozonru/etcd/pkg/tlsutil" + "github.com/ozonru/etcd/pkg/transport" + "github.com/ozonru/etcd/pkg/types" + "github.com/ozonru/etcd/rafthttp" "github.com/coreos/pkg/capnslog" "github.com/soheilhy/cmux" @@ -91,7 +91,7 @@ var ( ClientCertAuth: true, } - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "integration") + plog = capnslog.NewPackageLogger("github.com/ozonru/etcd", "integration") ) type ClusterConfig struct { diff --git a/integration/cluster_direct.go b/integration/cluster_direct.go index ff97e6146ed..ff5cf580488 100644 --- a/integration/cluster_direct.go +++ b/integration/cluster_direct.go @@ -17,10 +17,10 @@ package integration import ( - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3election/v3electionpb" - "github.com/coreos/etcd/etcdserver/api/v3lock/v3lockpb" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/etcdserver/api/v3election/v3electionpb" + "github.com/ozonru/etcd/etcdserver/api/v3lock/v3lockpb" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" ) func toGRPC(c *clientv3.Client) grpcAPI { diff --git a/integration/cluster_proxy.go b/integration/cluster_proxy.go index 1e8d8b572fb..086faa10c86 100644 --- a/integration/cluster_proxy.go +++ b/integration/cluster_proxy.go @@ -19,10 +19,10 @@ package integration import ( "sync" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/namespace" - "github.com/coreos/etcd/proxy/grpcproxy" - "github.com/coreos/etcd/proxy/grpcproxy/adapter" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/clientv3/namespace" + "github.com/ozonru/etcd/proxy/grpcproxy" + "github.com/ozonru/etcd/proxy/grpcproxy/adapter" ) var ( diff --git a/integration/cluster_test.go b/integration/cluster_test.go index e7475abaa47..faab2e12e4f 100644 --- a/integration/cluster_test.go +++ b/integration/cluster_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/client" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/client" + "github.com/ozonru/etcd/etcdserver" + "github.com/ozonru/etcd/pkg/testutil" "github.com/coreos/pkg/capnslog" ) @@ -452,7 +452,7 @@ func TestRejectUnhealthyRemove(t *testing.T) { // TestRestartRemoved ensures that restarting removed member must exit // if 'initial-cluster-state' is set 'new' and old data directory still exists -// (see https://github.com/coreos/etcd/issues/7512 for more). +// (see https://github.com/ozonru/etcd/issues/7512 for more). func TestRestartRemoved(t *testing.T) { defer testutil.AfterTest(t) diff --git a/integration/embed_test.go b/integration/embed_test.go index 32691d2226f..bac4617c087 100644 --- a/integration/embed_test.go +++ b/integration/embed_test.go @@ -28,8 +28,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/embed" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/embed" ) func TestEmbedEtcd(t *testing.T) { diff --git a/integration/logger_test.go b/integration/logger_test.go index 7c6fc424875..eaadd582a31 100644 --- a/integration/logger_test.go +++ b/integration/logger_test.go @@ -17,7 +17,7 @@ package integration import ( "io/ioutil" - "github.com/coreos/etcd/clientv3" + "github.com/ozonru/etcd/clientv3" "github.com/coreos/pkg/capnslog" "google.golang.org/grpc/grpclog" diff --git a/integration/main_test.go b/integration/main_test.go index 2913ce51154..fc5dcfda721 100644 --- a/integration/main_test.go +++ b/integration/main_test.go @@ -8,7 +8,7 @@ import ( "os" "testing" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/pkg/testutil" ) func TestMain(m *testing.M) { diff --git a/integration/member_test.go b/integration/member_test.go index 539adfec9b0..724d8b614c8 100644 --- a/integration/member_test.go +++ b/integration/member_test.go @@ -22,8 +22,8 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/client" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/client" + "github.com/ozonru/etcd/pkg/testutil" ) func TestPauseMember(t *testing.T) { diff --git a/integration/metrics_test.go b/integration/metrics_test.go index bd7850cf2c4..366a664f5b1 100644 --- a/integration/metrics_test.go +++ b/integration/metrics_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/testutil" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/pkg/testutil" ) // TestMetricDbSizeBoot checks that the db size metric is set on boot. diff --git a/integration/network_partition_test.go b/integration/network_partition_test.go index cfbdda02a1b..19fd9977b01 100644 --- a/integration/network_partition_test.go +++ b/integration/network_partition_test.go @@ -19,7 +19,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/pkg/testutil" ) func TestNetworkPartition5MembersLeaderInMinority(t *testing.T) { diff --git a/integration/util_test.go b/integration/util_test.go index 18894198016..586c5f341c5 100644 --- a/integration/util_test.go +++ b/integration/util_test.go @@ -19,7 +19,7 @@ import ( "os" "path/filepath" - "github.com/coreos/etcd/pkg/transport" + "github.com/ozonru/etcd/pkg/transport" ) // copyTLSFiles clones certs files to dst directory. diff --git a/integration/v2_http_kv_test.go b/integration/v2_http_kv_test.go index 4b84444790b..f5f02337c78 100644 --- a/integration/v2_http_kv_test.go +++ b/integration/v2_http_kv_test.go @@ -26,8 +26,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/pkg/transport" + "github.com/ozonru/etcd/pkg/testutil" + "github.com/ozonru/etcd/pkg/transport" ) func TestV2Set(t *testing.T) { diff --git a/integration/v3_alarm_test.go b/integration/v3_alarm_test.go index 0dbaf6b7f3c..5174850c77b 100644 --- a/integration/v3_alarm_test.go +++ b/integration/v3_alarm_test.go @@ -22,11 +22,11 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/mvcc" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/etcdserver/api/v3rpc/rpctypes" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/mvcc" + "github.com/ozonru/etcd/mvcc/backend" + "github.com/ozonru/etcd/pkg/testutil" ) // TestV3StorageQuotaApply tests the V3 server respects quotas during apply diff --git a/integration/v3_auth_test.go b/integration/v3_auth_test.go index ab6825892aa..ab692e31335 100644 --- a/integration/v3_auth_test.go +++ b/integration/v3_auth_test.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "github.com/coreos/etcd/auth/authpb" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/auth/authpb" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/etcdserver/api/v3rpc/rpctypes" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/pkg/testutil" ) // TestV3AuthEmptyUserGet ensures that a get with an empty user will return an empty user error. diff --git a/integration/v3_barrier_test.go b/integration/v3_barrier_test.go index f86999c477e..f8b128dcea3 100644 --- a/integration/v3_barrier_test.go +++ b/integration/v3_barrier_test.go @@ -18,9 +18,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/contrib/recipes" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/contrib/recipes" + "github.com/ozonru/etcd/pkg/testutil" ) func TestBarrierSingleNode(t *testing.T) { diff --git a/integration/v3_double_barrier_test.go b/integration/v3_double_barrier_test.go index da520967d38..9301bccad43 100644 --- a/integration/v3_double_barrier_test.go +++ b/integration/v3_double_barrier_test.go @@ -18,8 +18,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3/concurrency" - "github.com/coreos/etcd/contrib/recipes" + "github.com/ozonru/etcd/clientv3/concurrency" + "github.com/ozonru/etcd/contrib/recipes" ) func TestDoubleBarrier(t *testing.T) { diff --git a/integration/v3_election_test.go b/integration/v3_election_test.go index 341430df529..18cad72867b 100644 --- a/integration/v3_election_test.go +++ b/integration/v3_election_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/concurrency" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/clientv3/concurrency" ) // TestElectionWait tests if followers can correctly wait for elections. @@ -201,7 +201,7 @@ func TestElectionSessionRecampaign(t *testing.T) { // TestElectionOnPrefixOfExistingKey checks that a single // candidate can be elected on a new key that is a prefix // of an existing key. To wit, check for regression -// of bug #6278. https://github.com/coreos/etcd/issues/6278 +// of bug #6278. https://github.com/ozonru/etcd/issues/6278 // func TestElectionOnPrefixOfExistingKey(t *testing.T) { clus := NewClusterV3(t, &ClusterConfig{Size: 1}) diff --git a/integration/v3_grpc_inflight_test.go b/integration/v3_grpc_inflight_test.go index 0fb796cd4a1..80ef9d6c62b 100644 --- a/integration/v3_grpc_inflight_test.go +++ b/integration/v3_grpc_inflight_test.go @@ -20,9 +20,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/etcdserver/api/v3rpc/rpctypes" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/pkg/testutil" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/integration/v3_grpc_test.go b/integration/v3_grpc_test.go index 50f656ca7c3..38777923eb0 100644 --- a/integration/v3_grpc_test.go +++ b/integration/v3_grpc_test.go @@ -25,11 +25,11 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/pkg/transport" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/etcdserver/api/v3rpc/rpctypes" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/pkg/testutil" + "github.com/ozonru/etcd/pkg/transport" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/integration/v3_health_test.go b/integration/v3_health_test.go index 1636983cdd0..50e64331534 100644 --- a/integration/v3_health_test.go +++ b/integration/v3_health_test.go @@ -18,7 +18,7 @@ import ( "context" "testing" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/pkg/testutil" healthpb "google.golang.org/grpc/health/grpc_health_v1" ) diff --git a/integration/v3_leadership_test.go b/integration/v3_leadership_test.go index 7f41f3bfe5b..3c69489ba96 100644 --- a/integration/v3_leadership_test.go +++ b/integration/v3_leadership_test.go @@ -19,9 +19,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/etcdserver/api/v3rpc/rpctypes" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/pkg/testutil" ) func TestMoveLeader(t *testing.T) { testMoveLeader(t, true) } diff --git a/integration/v3_lease_test.go b/integration/v3_lease_test.go index c1e1caceedb..69a1e3f4ace 100644 --- a/integration/v3_lease_test.go +++ b/integration/v3_lease_test.go @@ -20,10 +20,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/mvcc/mvccpb" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/etcdserver/api/v3rpc/rpctypes" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/mvcc/mvccpb" + "github.com/ozonru/etcd/pkg/testutil" "google.golang.org/grpc/metadata" ) @@ -285,14 +285,14 @@ func TestV3LeaseLeases(t *testing.T) { // TestV3LeaseRenewStress keeps creating lease and renewing it immediately to ensure the renewal goes through. // it was oberserved that the immediate lease renewal after granting a lease from follower resulted lease not found. -// related issue https://github.com/coreos/etcd/issues/6978 +// related issue https://github.com/ozonru/etcd/issues/6978 func TestV3LeaseRenewStress(t *testing.T) { testLeaseStress(t, stressLeaseRenew) } // TestV3LeaseTimeToLiveStress keeps creating lease and retrieving it immediately to ensure the lease can be retrieved. // it was oberserved that the immediate lease retrieval after granting a lease from follower resulted lease not found. -// related issue https://github.com/coreos/etcd/issues/6978 +// related issue https://github.com/ozonru/etcd/issues/6978 func TestV3LeaseTimeToLiveStress(t *testing.T) { testLeaseStress(t, stressLeaseTimeToLive) } @@ -385,7 +385,7 @@ func TestV3PutOnNonExistLease(t *testing.T) { } // TestV3GetNonExistLease ensures client retrieving nonexistent lease on a follower doesn't result node panic -// related issue https://github.com/coreos/etcd/issues/6537 +// related issue https://github.com/ozonru/etcd/issues/6537 func TestV3GetNonExistLease(t *testing.T) { defer testutil.AfterTest(t) clus := NewClusterV3(t, &ClusterConfig{Size: 3}) diff --git a/integration/v3_lock_test.go b/integration/v3_lock_test.go index 889a6ef1f62..17bfb81b4d7 100644 --- a/integration/v3_lock_test.go +++ b/integration/v3_lock_test.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/concurrency" - "github.com/coreos/etcd/contrib/recipes" - "github.com/coreos/etcd/mvcc/mvccpb" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/clientv3/concurrency" + "github.com/ozonru/etcd/contrib/recipes" + "github.com/ozonru/etcd/mvcc/mvccpb" + "github.com/ozonru/etcd/pkg/testutil" ) func TestMutexSingleNode(t *testing.T) { diff --git a/integration/v3_queue_test.go b/integration/v3_queue_test.go index f7673f9b711..9adb2367ed6 100644 --- a/integration/v3_queue_test.go +++ b/integration/v3_queue_test.go @@ -20,7 +20,7 @@ import ( "sync/atomic" "testing" - "github.com/coreos/etcd/contrib/recipes" + "github.com/ozonru/etcd/contrib/recipes" ) const ( diff --git a/integration/v3_stm_test.go b/integration/v3_stm_test.go index 7965b3c2c9c..9472d8430a2 100644 --- a/integration/v3_stm_test.go +++ b/integration/v3_stm_test.go @@ -21,9 +21,9 @@ import ( "strconv" "testing" - v3 "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/concurrency" - "github.com/coreos/etcd/pkg/testutil" + v3 "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/clientv3/concurrency" + "github.com/ozonru/etcd/pkg/testutil" ) // TestSTMConflict tests that conflicts are retried. diff --git a/integration/v3_tls_test.go b/integration/v3_tls_test.go index 280aa7d9fed..da60d3eaba8 100644 --- a/integration/v3_tls_test.go +++ b/integration/v3_tls_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/pkg/testutil" "google.golang.org/grpc" ) diff --git a/integration/v3_watch_test.go b/integration/v3_watch_test.go index c91f4df6503..267424432f8 100644 --- a/integration/v3_watch_test.go +++ b/integration/v3_watch_test.go @@ -24,10 +24,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver/api/v3rpc" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/mvcc/mvccpb" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/etcdserver/api/v3rpc" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/mvcc/mvccpb" + "github.com/ozonru/etcd/pkg/testutil" ) // TestV3WatchFromCurrentRevision tests Watch APIs from current revision. diff --git a/integration/v3election_grpc_test.go b/integration/v3election_grpc_test.go index 12a0908b722..e7395cebd61 100644 --- a/integration/v3election_grpc_test.go +++ b/integration/v3election_grpc_test.go @@ -20,9 +20,9 @@ import ( "testing" "time" - epb "github.com/coreos/etcd/etcdserver/api/v3election/v3electionpb" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/testutil" + epb "github.com/ozonru/etcd/etcdserver/api/v3election/v3electionpb" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/pkg/testutil" ) // TestV3ElectionCampaign checks that Campaign will not give diff --git a/integration/v3lock_grpc_test.go b/integration/v3lock_grpc_test.go index ccaf0a9ccbb..5835471e30c 100644 --- a/integration/v3lock_grpc_test.go +++ b/integration/v3lock_grpc_test.go @@ -19,9 +19,9 @@ import ( "testing" "time" - lockpb "github.com/coreos/etcd/etcdserver/api/v3lock/v3lockpb" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/testutil" + lockpb "github.com/ozonru/etcd/etcdserver/api/v3lock/v3lockpb" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/pkg/testutil" ) // TestV3LockLockWaiter tests that a client will wait for a lock, then acquire it diff --git a/lease/leasehttp/http.go b/lease/leasehttp/http.go index ac2e7880e8a..d0526f1b810 100644 --- a/lease/leasehttp/http.go +++ b/lease/leasehttp/http.go @@ -23,10 +23,10 @@ import ( "net/http" "time" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/lease/leasepb" - "github.com/coreos/etcd/pkg/httputil" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/lease" + "github.com/ozonru/etcd/lease/leasepb" + "github.com/ozonru/etcd/pkg/httputil" ) var ( diff --git a/lease/leasehttp/http_test.go b/lease/leasehttp/http_test.go index 367cd8e64a4..8293c0646f3 100644 --- a/lease/leasehttp/http_test.go +++ b/lease/leasehttp/http_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc/backend" + "github.com/ozonru/etcd/lease" + "github.com/ozonru/etcd/mvcc/backend" ) func TestRenewHTTP(t *testing.T) { diff --git a/lease/leasepb/lease.pb.go b/lease/leasepb/lease.pb.go index 433f0aad1d3..7cc57c62014 100644 --- a/lease/leasepb/lease.pb.go +++ b/lease/leasepb/lease.pb.go @@ -9,7 +9,7 @@ import ( math "math" math_bits "math/bits" - etcdserverpb "github.com/coreos/etcd/etcdserver/etcdserverpb" + etcdserverpb "github.com/ozonru/etcd/etcdserver/etcdserverpb" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/golang/protobuf/proto" ) diff --git a/lease/lessor.go b/lease/lessor.go index 43f0503531f..e22e28627c4 100644 --- a/lease/lessor.go +++ b/lease/lessor.go @@ -22,8 +22,8 @@ import ( "sync" "time" - "github.com/coreos/etcd/lease/leasepb" - "github.com/coreos/etcd/mvcc/backend" + "github.com/ozonru/etcd/lease/leasepb" + "github.com/ozonru/etcd/mvcc/backend" ) // NoLease is a special LeaseID representing the absence of a lease. diff --git a/lease/lessor_test.go b/lease/lessor_test.go index 3a39e846f72..c40102d7535 100644 --- a/lease/lessor_test.go +++ b/lease/lessor_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/mvcc/backend" + "github.com/ozonru/etcd/mvcc/backend" ) const ( diff --git a/main.go b/main.go index 0b7357376e6..95272fbab74 100644 --- a/main.go +++ b/main.go @@ -13,16 +13,16 @@ // limitations under the License. // Package main is a simple wrapper of the real etcd entrypoint package -// (located at github.com/coreos/etcd/etcdmain) to ensure that etcd is still -// "go getable"; e.g. `go get github.com/coreos/etcd` works as expected and +// (located at github.com/ozonru/etcd/etcdmain) to ensure that etcd is still +// "go getable"; e.g. `go get github.com/ozonru/etcd` works as expected and // builds a binary in $GOBIN/etcd // // This package should NOT be extended or modified in any way; to modify the -// etcd binary, work in the `github.com/coreos/etcd/etcdmain` package. +// etcd binary, work in the `github.com/ozonru/etcd/etcdmain` package. // package main -import "github.com/coreos/etcd/etcdmain" +import "github.com/ozonru/etcd/etcdmain" func main() { etcdmain.Main() diff --git a/mvcc/backend/backend.go b/mvcc/backend/backend.go index 2229d9ce1cb..887a0a89163 100644 --- a/mvcc/backend/backend.go +++ b/mvcc/backend/backend.go @@ -40,7 +40,7 @@ var ( // This only works for linux. initialMmapSize = uint64(10 * 1024 * 1024 * 1024) - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "mvcc/backend") + plog = capnslog.NewPackageLogger("github.com/ozonru/etcd", "mvcc/backend") // minSnapshotWarningTimeout is the minimum threshold to trigger a long running snapshot warning. minSnapshotWarningTimeout = time.Duration(30 * time.Second) diff --git a/mvcc/kv.go b/mvcc/kv.go index 2dad3ad8ef0..3b9b90105df 100644 --- a/mvcc/kv.go +++ b/mvcc/kv.go @@ -15,9 +15,9 @@ package mvcc import ( - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/mvcc/mvccpb" + "github.com/ozonru/etcd/lease" + "github.com/ozonru/etcd/mvcc/backend" + "github.com/ozonru/etcd/mvcc/mvccpb" ) type RangeOptions struct { diff --git a/mvcc/kv_test.go b/mvcc/kv_test.go index d6f49ee14a9..b6f96b5dc91 100644 --- a/mvcc/kv_test.go +++ b/mvcc/kv_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/mvcc/mvccpb" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/lease" + "github.com/ozonru/etcd/mvcc/backend" + "github.com/ozonru/etcd/mvcc/mvccpb" + "github.com/ozonru/etcd/pkg/testutil" "github.com/prometheus/client_golang/prometheus" dto "github.com/prometheus/client_model/go" diff --git a/mvcc/kv_view.go b/mvcc/kv_view.go index f40ba8edc22..968c3d44460 100644 --- a/mvcc/kv_view.go +++ b/mvcc/kv_view.go @@ -15,7 +15,7 @@ package mvcc import ( - "github.com/coreos/etcd/lease" + "github.com/ozonru/etcd/lease" ) type readView struct{ kv KV } diff --git a/mvcc/kvstore.go b/mvcc/kvstore.go index ba34cd1f314..563ff621069 100644 --- a/mvcc/kvstore.go +++ b/mvcc/kvstore.go @@ -24,10 +24,10 @@ import ( "sync/atomic" "time" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/mvcc/mvccpb" - "github.com/coreos/etcd/pkg/schedule" + "github.com/ozonru/etcd/lease" + "github.com/ozonru/etcd/mvcc/backend" + "github.com/ozonru/etcd/mvcc/mvccpb" + "github.com/ozonru/etcd/pkg/schedule" "github.com/coreos/pkg/capnslog" ) @@ -44,7 +44,7 @@ var ( ErrCanceled = errors.New("mvcc: watcher is canceled") ErrClosed = errors.New("mvcc: closed") - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "mvcc") + plog = capnslog.NewPackageLogger("github.com/ozonru/etcd", "mvcc") ) const ( diff --git a/mvcc/kvstore_bench_test.go b/mvcc/kvstore_bench_test.go index a64a3c5a57b..8c1e46fc8d7 100644 --- a/mvcc/kvstore_bench_test.go +++ b/mvcc/kvstore_bench_test.go @@ -18,8 +18,8 @@ import ( "sync/atomic" "testing" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc/backend" + "github.com/ozonru/etcd/lease" + "github.com/ozonru/etcd/mvcc/backend" ) type fakeConsistentIndex uint64 diff --git a/mvcc/kvstore_compaction_test.go b/mvcc/kvstore_compaction_test.go index b2ee570f9d5..6bb1b696771 100644 --- a/mvcc/kvstore_compaction_test.go +++ b/mvcc/kvstore_compaction_test.go @@ -20,8 +20,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc/backend" + "github.com/ozonru/etcd/lease" + "github.com/ozonru/etcd/mvcc/backend" ) func TestScheduleCompaction(t *testing.T) { diff --git a/mvcc/kvstore_test.go b/mvcc/kvstore_test.go index 2664f7e62e0..3e88a0c8fa5 100644 --- a/mvcc/kvstore_test.go +++ b/mvcc/kvstore_test.go @@ -26,11 +26,11 @@ import ( "testing" "time" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/mvcc/mvccpb" - "github.com/coreos/etcd/pkg/schedule" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/lease" + "github.com/ozonru/etcd/mvcc/backend" + "github.com/ozonru/etcd/mvcc/mvccpb" + "github.com/ozonru/etcd/pkg/schedule" + "github.com/ozonru/etcd/pkg/testutil" ) func TestStoreRev(t *testing.T) { diff --git a/mvcc/kvstore_txn.go b/mvcc/kvstore_txn.go index 8896fb86dbf..00cdf6afd76 100644 --- a/mvcc/kvstore_txn.go +++ b/mvcc/kvstore_txn.go @@ -15,9 +15,9 @@ package mvcc import ( - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/mvcc/mvccpb" + "github.com/ozonru/etcd/lease" + "github.com/ozonru/etcd/mvcc/backend" + "github.com/ozonru/etcd/mvcc/mvccpb" ) type storeTxnRead struct { diff --git a/mvcc/metrics_txn.go b/mvcc/metrics_txn.go index a305aa53180..5f301c290e5 100644 --- a/mvcc/metrics_txn.go +++ b/mvcc/metrics_txn.go @@ -15,7 +15,7 @@ package mvcc import ( - "github.com/coreos/etcd/lease" + "github.com/ozonru/etcd/lease" ) type metricsTxnWrite struct { diff --git a/mvcc/util.go b/mvcc/util.go index 8a0df0bfcc3..32e16fc0373 100644 --- a/mvcc/util.go +++ b/mvcc/util.go @@ -17,8 +17,8 @@ package mvcc import ( "encoding/binary" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/mvcc/mvccpb" + "github.com/ozonru/etcd/mvcc/backend" + "github.com/ozonru/etcd/mvcc/mvccpb" ) func UpdateConsistentIndex(be backend.Backend, index uint64) { diff --git a/mvcc/watchable_store.go b/mvcc/watchable_store.go index 78df19326b9..d7b601ccdfc 100644 --- a/mvcc/watchable_store.go +++ b/mvcc/watchable_store.go @@ -18,9 +18,9 @@ import ( "sync" "time" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/mvcc/mvccpb" + "github.com/ozonru/etcd/lease" + "github.com/ozonru/etcd/mvcc/backend" + "github.com/ozonru/etcd/mvcc/mvccpb" ) // non-const so modifiable by tests diff --git a/mvcc/watchable_store_bench_test.go b/mvcc/watchable_store_bench_test.go index 769d1bc38a8..509fd703efb 100644 --- a/mvcc/watchable_store_bench_test.go +++ b/mvcc/watchable_store_bench_test.go @@ -19,8 +19,8 @@ import ( "os" "testing" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc/backend" + "github.com/ozonru/etcd/lease" + "github.com/ozonru/etcd/mvcc/backend" ) func BenchmarkWatchableStorePut(b *testing.B) { diff --git a/mvcc/watchable_store_test.go b/mvcc/watchable_store_test.go index dc96d53366c..73d20843177 100644 --- a/mvcc/watchable_store_test.go +++ b/mvcc/watchable_store_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/mvcc/mvccpb" + "github.com/ozonru/etcd/lease" + "github.com/ozonru/etcd/mvcc/backend" + "github.com/ozonru/etcd/mvcc/mvccpb" ) func TestWatch(t *testing.T) { diff --git a/mvcc/watchable_store_txn.go b/mvcc/watchable_store_txn.go index 5c5bfda1341..7e988df2325 100644 --- a/mvcc/watchable_store_txn.go +++ b/mvcc/watchable_store_txn.go @@ -15,7 +15,7 @@ package mvcc import ( - "github.com/coreos/etcd/mvcc/mvccpb" + "github.com/ozonru/etcd/mvcc/mvccpb" ) func (tw *watchableStoreTxnWrite) End() { diff --git a/mvcc/watcher.go b/mvcc/watcher.go index bc0c6322fd1..c87128e73b2 100644 --- a/mvcc/watcher.go +++ b/mvcc/watcher.go @@ -19,7 +19,7 @@ import ( "errors" "sync" - "github.com/coreos/etcd/mvcc/mvccpb" + "github.com/ozonru/etcd/mvcc/mvccpb" ) var ( diff --git a/mvcc/watcher_bench_test.go b/mvcc/watcher_bench_test.go index 8a4242f3f20..a903be2afdd 100644 --- a/mvcc/watcher_bench_test.go +++ b/mvcc/watcher_bench_test.go @@ -18,8 +18,8 @@ import ( "fmt" "testing" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc/backend" + "github.com/ozonru/etcd/lease" + "github.com/ozonru/etcd/mvcc/backend" ) func BenchmarkKVWatcherMemoryUsage(b *testing.B) { diff --git a/mvcc/watcher_group.go b/mvcc/watcher_group.go index b569d04b390..09d2b02040f 100644 --- a/mvcc/watcher_group.go +++ b/mvcc/watcher_group.go @@ -18,8 +18,8 @@ import ( "fmt" "math" - "github.com/coreos/etcd/mvcc/mvccpb" - "github.com/coreos/etcd/pkg/adt" + "github.com/ozonru/etcd/mvcc/mvccpb" + "github.com/ozonru/etcd/pkg/adt" ) var ( diff --git a/mvcc/watcher_test.go b/mvcc/watcher_test.go index 3d259d1f160..dad107c9853 100644 --- a/mvcc/watcher_test.go +++ b/mvcc/watcher_test.go @@ -22,9 +22,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/mvcc/mvccpb" + "github.com/ozonru/etcd/lease" + "github.com/ozonru/etcd/mvcc/backend" + "github.com/ozonru/etcd/mvcc/mvccpb" ) // TestWatcherWatchID tests that each watcher provides unique watchID, diff --git a/pkg/adt/example_test.go b/pkg/adt/example_test.go index 4a67e41762c..afc9bccfb65 100644 --- a/pkg/adt/example_test.go +++ b/pkg/adt/example_test.go @@ -17,7 +17,7 @@ package adt_test import ( "fmt" - "github.com/coreos/etcd/pkg/adt" + "github.com/ozonru/etcd/pkg/adt" ) func Example() { diff --git a/pkg/fileutil/fileutil.go b/pkg/fileutil/fileutil.go index fce5126c695..38cbab41eab 100644 --- a/pkg/fileutil/fileutil.go +++ b/pkg/fileutil/fileutil.go @@ -34,7 +34,7 @@ const ( ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "pkg/fileutil") + plog = capnslog.NewPackageLogger("github.com/ozonru/etcd", "pkg/fileutil") ) // IsDirWriteable checks if dir is writable by writing and removing a file diff --git a/pkg/flags/flag.go b/pkg/flags/flag.go index 69c46411854..d9939db0728 100644 --- a/pkg/flags/flag.go +++ b/pkg/flags/flag.go @@ -27,7 +27,7 @@ import ( ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "pkg/flags") + plog = capnslog.NewPackageLogger("github.com/ozonru/etcd", "pkg/flags") ) // DeprecatedFlag encapsulates a flag that may have been previously valid but diff --git a/pkg/flags/urls.go b/pkg/flags/urls.go index 6383d7e9257..9a513a2160f 100644 --- a/pkg/flags/urls.go +++ b/pkg/flags/urls.go @@ -17,7 +17,7 @@ package flags import ( "strings" - "github.com/coreos/etcd/pkg/types" + "github.com/ozonru/etcd/pkg/types" ) type URLsValue types.URLs diff --git a/pkg/ioutil/util.go b/pkg/ioutil/util.go index 192ad888c24..b9ab9802f43 100644 --- a/pkg/ioutil/util.go +++ b/pkg/ioutil/util.go @@ -18,7 +18,7 @@ import ( "io" "os" - "github.com/coreos/etcd/pkg/fileutil" + "github.com/ozonru/etcd/pkg/fileutil" ) // WriteAndSyncFile behaves just like ioutil.WriteFile in the standard library, diff --git a/pkg/logutil/logger_test.go b/pkg/logutil/logger_test.go index 1f2ef9b6817..efbd96d9c6e 100644 --- a/pkg/logutil/logger_test.go +++ b/pkg/logutil/logger_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "github.com/coreos/etcd/pkg/logutil" + "github.com/ozonru/etcd/pkg/logutil" "google.golang.org/grpc/grpclog" ) diff --git a/pkg/logutil/merge_logger_test.go b/pkg/logutil/merge_logger_test.go index 10d0e43728a..5ddc458ede5 100644 --- a/pkg/logutil/merge_logger_test.go +++ b/pkg/logutil/merge_logger_test.go @@ -28,7 +28,7 @@ func TestMergeLogger(t *testing.T) { txt = "hello" repeatN = 6 duration = 2049843762 * time.Nanosecond - mg = NewMergeLogger(capnslog.NewPackageLogger("github.com/coreos/etcd", "pkg/logutil")) + mg = NewMergeLogger(capnslog.NewPackageLogger("github.com/ozonru/etcd", "pkg/logutil")) ) // overwrite this for testing defaultMergePeriod = time.Minute diff --git a/pkg/logutil/package_logger.go b/pkg/logutil/package_logger.go index 378bee0e3c3..c31dae54cd5 100644 --- a/pkg/logutil/package_logger.go +++ b/pkg/logutil/package_logger.go @@ -27,7 +27,7 @@ var _ Logger = &packageLogger{} // For example: // // var defaultLogger Logger -// defaultLogger = NewPackageLogger("github.com/coreos/etcd", "snapshot") +// defaultLogger = NewPackageLogger("github.com/ozonru/etcd", "snapshot") // func NewPackageLogger(repo, pkg string) Logger { return &packageLogger{p: capnslog.NewPackageLogger(repo, pkg)} diff --git a/pkg/logutil/package_logger_test.go b/pkg/logutil/package_logger_test.go index b6ab0052b54..7476fa1f39a 100644 --- a/pkg/logutil/package_logger_test.go +++ b/pkg/logutil/package_logger_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - "github.com/coreos/etcd/pkg/logutil" + "github.com/ozonru/etcd/pkg/logutil" "github.com/coreos/pkg/capnslog" ) @@ -29,9 +29,9 @@ func TestPackageLogger(t *testing.T) { buf := new(bytes.Buffer) capnslog.SetFormatter(capnslog.NewDefaultFormatter(buf)) - l := logutil.NewPackageLogger("github.com/coreos/etcd", "logger") + l := logutil.NewPackageLogger("github.com/ozonru/etcd", "logger") - r := capnslog.MustRepoLogger("github.com/coreos/etcd") + r := capnslog.MustRepoLogger("github.com/ozonru/etcd") r.SetLogLevel(map[string]capnslog.LogLevel{"logger": capnslog.INFO}) l.Infof("hello world!") diff --git a/pkg/logutil/zap_journal.go b/pkg/logutil/zap_journal.go index b1788bc83f8..5af4b66a801 100644 --- a/pkg/logutil/zap_journal.go +++ b/pkg/logutil/zap_journal.go @@ -24,7 +24,7 @@ import ( "os" "path/filepath" - "github.com/coreos/etcd/pkg/systemd" + "github.com/ozonru/etcd/pkg/systemd" "github.com/coreos/go-systemd/journal" "go.uber.org/zap/zapcore" diff --git a/pkg/logutil/zap_raft.go b/pkg/logutil/zap_raft.go index 012d688d2d9..6e5357a13ff 100644 --- a/pkg/logutil/zap_raft.go +++ b/pkg/logutil/zap_raft.go @@ -17,7 +17,7 @@ package logutil import ( "errors" - "github.com/coreos/etcd/raft" + "github.com/ozonru/etcd/raft" "go.uber.org/zap" "go.uber.org/zap/zapcore" diff --git a/pkg/mock/mockserver/mockserver.go b/pkg/mock/mockserver/mockserver.go index d72b40b45e7..532b11eda44 100644 --- a/pkg/mock/mockserver/mockserver.go +++ b/pkg/mock/mockserver/mockserver.go @@ -22,7 +22,7 @@ import ( "os" "sync" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" "google.golang.org/grpc/resolver" diff --git a/pkg/mock/mockstorage/storage_recorder.go b/pkg/mock/mockstorage/storage_recorder.go index 4ecab9831b3..e95f79cf86c 100644 --- a/pkg/mock/mockstorage/storage_recorder.go +++ b/pkg/mock/mockstorage/storage_recorder.go @@ -15,9 +15,9 @@ package mockstorage import ( - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/raft" - "github.com/coreos/etcd/raft/raftpb" + "github.com/ozonru/etcd/pkg/testutil" + "github.com/ozonru/etcd/raft" + "github.com/ozonru/etcd/raft/raftpb" ) type storageRecorder struct { diff --git a/pkg/mock/mockstore/store_recorder.go b/pkg/mock/mockstore/store_recorder.go index 4dad19ee52d..bd41edd4efe 100644 --- a/pkg/mock/mockstore/store_recorder.go +++ b/pkg/mock/mockstore/store_recorder.go @@ -17,8 +17,8 @@ package mockstore import ( "time" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/store" + "github.com/ozonru/etcd/pkg/testutil" + "github.com/ozonru/etcd/store" ) // StoreRecorder provides a Store interface with a testutil.Recorder diff --git a/pkg/mock/mockwait/wait_recorder.go b/pkg/mock/mockwait/wait_recorder.go index f9c820092f0..a1dd439b1f8 100644 --- a/pkg/mock/mockwait/wait_recorder.go +++ b/pkg/mock/mockwait/wait_recorder.go @@ -15,8 +15,8 @@ package mockwait import ( - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/pkg/wait" + "github.com/ozonru/etcd/pkg/testutil" + "github.com/ozonru/etcd/pkg/wait" ) type WaitRecorder struct { diff --git a/pkg/netutil/netutil.go b/pkg/netutil/netutil.go index e3db8c50a0d..3607739f0e0 100644 --- a/pkg/netutil/netutil.go +++ b/pkg/netutil/netutil.go @@ -24,12 +24,12 @@ import ( "sort" "time" - "github.com/coreos/etcd/pkg/types" + "github.com/ozonru/etcd/pkg/types" "github.com/coreos/pkg/capnslog" ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "pkg/netutil") + plog = capnslog.NewPackageLogger("github.com/ozonru/etcd", "pkg/netutil") // indirection for testing resolveTCPAddr = resolveTCPAddrDefault diff --git a/pkg/netutil/routes_linux.go b/pkg/netutil/routes_linux.go index 797baeb482a..d1841f0b9f2 100644 --- a/pkg/netutil/routes_linux.go +++ b/pkg/netutil/routes_linux.go @@ -24,7 +24,7 @@ import ( "sort" "syscall" - "github.com/coreos/etcd/pkg/cpuutil" + "github.com/ozonru/etcd/pkg/cpuutil" ) var errNoDefaultRoute = fmt.Errorf("could not find default route") diff --git a/pkg/osutil/osutil.go b/pkg/osutil/osutil.go index ef38280e713..24594f4d99b 100644 --- a/pkg/osutil/osutil.go +++ b/pkg/osutil/osutil.go @@ -23,7 +23,7 @@ import ( ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "pkg/osutil") + plog = capnslog.NewPackageLogger("github.com/ozonru/etcd", "pkg/osutil") // support to override setting SIG_DFL so tests don't terminate early setDflSignal = dflSignal diff --git a/pkg/pbutil/pbutil.go b/pkg/pbutil/pbutil.go index d70f98dd82f..0946d9c2b41 100644 --- a/pkg/pbutil/pbutil.go +++ b/pkg/pbutil/pbutil.go @@ -18,7 +18,7 @@ package pbutil import "github.com/coreos/pkg/capnslog" var ( - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "pkg/pbutil") + plog = capnslog.NewPackageLogger("github.com/ozonru/etcd", "pkg/pbutil") ) type Marshaler interface { diff --git a/pkg/proxy/server.go b/pkg/proxy/server.go index 311af966f22..9f03beacc0d 100644 --- a/pkg/proxy/server.go +++ b/pkg/proxy/server.go @@ -25,7 +25,7 @@ import ( "sync" "time" - "github.com/coreos/etcd/pkg/transport" + "github.com/ozonru/etcd/pkg/transport" humanize "github.com/dustin/go-humanize" "go.uber.org/zap" @@ -246,8 +246,8 @@ func (p *proxyServer) To() string { // TODO: implement packet reordering from multiple TCP connections // buffer packets per connection for awhile, reorder before transmit -// - https://github.com/coreos/etcd/issues/5614 -// - https://github.com/coreos/etcd/pull/6918#issuecomment-264093034 +// - https://github.com/ozonru/etcd/issues/5614 +// - https://github.com/ozonru/etcd/pull/6918#issuecomment-264093034 func (p *proxyServer) listenAndServe() { defer p.closeWg.Done() diff --git a/pkg/proxy/server_test.go b/pkg/proxy/server_test.go index 27e2784af17..e2b32b6e75f 100644 --- a/pkg/proxy/server_test.go +++ b/pkg/proxy/server_test.go @@ -28,7 +28,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/pkg/transport" + "github.com/ozonru/etcd/pkg/transport" "go.uber.org/zap" ) diff --git a/pkg/srv/srv.go b/pkg/srv/srv.go index 600061ce8ea..a5a2a9f3c39 100644 --- a/pkg/srv/srv.go +++ b/pkg/srv/srv.go @@ -21,7 +21,7 @@ import ( "net/url" "strings" - "github.com/coreos/etcd/pkg/types" + "github.com/ozonru/etcd/pkg/types" ) var ( diff --git a/pkg/srv/srv_test.go b/pkg/srv/srv_test.go index 17faa854867..2b8b5780997 100644 --- a/pkg/srv/srv_test.go +++ b/pkg/srv/srv_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/pkg/testutil" ) func TestSRVGetCluster(t *testing.T) { diff --git a/pkg/testutil/leak.go b/pkg/testutil/leak.go index 91effec1d4c..1b13dbac57e 100644 --- a/pkg/testutil/leak.go +++ b/pkg/testutil/leak.go @@ -21,7 +21,7 @@ CheckLeakedGoroutine verifies tests do not leave any leaky goroutines. It returns true when there are goroutines still running(leaking) after all tests. - import "github.com/coreos/etcd/pkg/testutil" + import "github.com/ozonru/etcd/pkg/testutil" func TestMain(m *testing.M) { v := m.Run() @@ -125,8 +125,8 @@ func interestingGoroutines() (gs []string) { strings.Contains(stack, "created by testing.RunTests") || strings.Contains(stack, "testing.Main(") || strings.Contains(stack, "runtime.goexit") || - strings.Contains(stack, "github.com/coreos/etcd/pkg/testutil.interestingGoroutines") || - strings.Contains(stack, "github.com/coreos/etcd/pkg/logutil.(*MergeLogger).outputLoop") || + strings.Contains(stack, "github.com/ozonru/etcd/pkg/testutil.interestingGoroutines") || + strings.Contains(stack, "github.com/ozonru/etcd/pkg/logutil.(*MergeLogger).outputLoop") || strings.Contains(stack, "github.com/golang/glog.(*loggingT).flushDaemon") || strings.Contains(stack, "created by runtime.gc") || strings.Contains(stack, "runtime.MHeap_Scavenger") { diff --git a/pkg/transport/listener.go b/pkg/transport/listener.go index 60a2f7a3345..72d8cb49cae 100644 --- a/pkg/transport/listener.go +++ b/pkg/transport/listener.go @@ -31,7 +31,7 @@ import ( "strings" "time" - "github.com/coreos/etcd/pkg/tlsutil" + "github.com/ozonru/etcd/pkg/tlsutil" ) func NewListener(addr, scheme string, tlsinfo *TLSInfo) (l net.Listener, err error) { diff --git a/pkg/types/urls_test.go b/pkg/types/urls_test.go index b91d1a92649..53e8a6a9452 100644 --- a/pkg/types/urls_test.go +++ b/pkg/types/urls_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/pkg/testutil" ) func TestNewURLs(t *testing.T) { diff --git a/pkg/types/urlsmap_test.go b/pkg/types/urlsmap_test.go index 6f58765c0cd..9905a8ec1b8 100644 --- a/pkg/types/urlsmap_test.go +++ b/pkg/types/urlsmap_test.go @@ -15,7 +15,7 @@ package types import ( - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/pkg/testutil" "reflect" "testing" ) diff --git a/proxy/grpcproxy/adapter/auth_client_adapter.go b/proxy/grpcproxy/adapter/auth_client_adapter.go index 33dc91f013f..55b80d908bf 100644 --- a/proxy/grpcproxy/adapter/auth_client_adapter.go +++ b/proxy/grpcproxy/adapter/auth_client_adapter.go @@ -17,7 +17,7 @@ package adapter import ( "context" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" grpc "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/adapter/cluster_client_adapter.go b/proxy/grpcproxy/adapter/cluster_client_adapter.go index 6c0340998b9..a10b56a3c49 100644 --- a/proxy/grpcproxy/adapter/cluster_client_adapter.go +++ b/proxy/grpcproxy/adapter/cluster_client_adapter.go @@ -17,7 +17,7 @@ package adapter import ( "context" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/adapter/election_client_adapter.go b/proxy/grpcproxy/adapter/election_client_adapter.go index a2ebf138f3b..854749ee50c 100644 --- a/proxy/grpcproxy/adapter/election_client_adapter.go +++ b/proxy/grpcproxy/adapter/election_client_adapter.go @@ -17,7 +17,7 @@ package adapter import ( "context" - "github.com/coreos/etcd/etcdserver/api/v3election/v3electionpb" + "github.com/ozonru/etcd/etcdserver/api/v3election/v3electionpb" "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/adapter/kv_client_adapter.go b/proxy/grpcproxy/adapter/kv_client_adapter.go index acd5673d005..985118771c0 100644 --- a/proxy/grpcproxy/adapter/kv_client_adapter.go +++ b/proxy/grpcproxy/adapter/kv_client_adapter.go @@ -17,7 +17,7 @@ package adapter import ( "context" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" grpc "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/adapter/lease_client_adapter.go b/proxy/grpcproxy/adapter/lease_client_adapter.go index 84c48b591b0..ac6942b51d3 100644 --- a/proxy/grpcproxy/adapter/lease_client_adapter.go +++ b/proxy/grpcproxy/adapter/lease_client_adapter.go @@ -17,7 +17,7 @@ package adapter import ( "context" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/adapter/lock_client_adapter.go b/proxy/grpcproxy/adapter/lock_client_adapter.go index 9ce7913a3ba..d441e4ba13d 100644 --- a/proxy/grpcproxy/adapter/lock_client_adapter.go +++ b/proxy/grpcproxy/adapter/lock_client_adapter.go @@ -17,7 +17,7 @@ package adapter import ( "context" - "github.com/coreos/etcd/etcdserver/api/v3lock/v3lockpb" + "github.com/ozonru/etcd/etcdserver/api/v3lock/v3lockpb" "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/adapter/maintenance_client_adapter.go b/proxy/grpcproxy/adapter/maintenance_client_adapter.go index 92d9dfd204e..87a027350a7 100644 --- a/proxy/grpcproxy/adapter/maintenance_client_adapter.go +++ b/proxy/grpcproxy/adapter/maintenance_client_adapter.go @@ -17,7 +17,7 @@ package adapter import ( "context" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/adapter/watch_client_adapter.go b/proxy/grpcproxy/adapter/watch_client_adapter.go index afe61e837b5..2446b057273 100644 --- a/proxy/grpcproxy/adapter/watch_client_adapter.go +++ b/proxy/grpcproxy/adapter/watch_client_adapter.go @@ -18,7 +18,7 @@ import ( "context" "errors" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/auth.go b/proxy/grpcproxy/auth.go index 0ed8d246d2b..68c2138e872 100644 --- a/proxy/grpcproxy/auth.go +++ b/proxy/grpcproxy/auth.go @@ -17,8 +17,8 @@ package grpcproxy import ( "context" - "github.com/coreos/etcd/clientv3" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/clientv3" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" ) type AuthProxy struct { diff --git a/proxy/grpcproxy/cache/store.go b/proxy/grpcproxy/cache/store.go index 89d808adb41..d5ff403993f 100644 --- a/proxy/grpcproxy/cache/store.go +++ b/proxy/grpcproxy/cache/store.go @@ -20,9 +20,9 @@ import ( "errors" "sync" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/pkg/adt" + "github.com/ozonru/etcd/etcdserver/api/v3rpc/rpctypes" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/pkg/adt" "github.com/golang/groupcache/lru" ) diff --git a/proxy/grpcproxy/cluster.go b/proxy/grpcproxy/cluster.go index 6e8d3c85bfb..794436a3f88 100644 --- a/proxy/grpcproxy/cluster.go +++ b/proxy/grpcproxy/cluster.go @@ -20,10 +20,10 @@ import ( "os" "sync" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/naming" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/clientv3/naming" + "github.com/ozonru/etcd/etcdserver/api/v3rpc/rpctypes" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" "golang.org/x/time/rate" gnaming "google.golang.org/grpc/naming" diff --git a/proxy/grpcproxy/cluster_test.go b/proxy/grpcproxy/cluster_test.go index f2c0af3f0a1..4ab7ce9644d 100644 --- a/proxy/grpcproxy/cluster_test.go +++ b/proxy/grpcproxy/cluster_test.go @@ -20,10 +20,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/clientv3" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/integration" + "github.com/ozonru/etcd/pkg/testutil" "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/election.go b/proxy/grpcproxy/election.go index 4b4a4cc4210..761738db41c 100644 --- a/proxy/grpcproxy/election.go +++ b/proxy/grpcproxy/election.go @@ -17,8 +17,8 @@ package grpcproxy import ( "context" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3election/v3electionpb" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/etcdserver/api/v3election/v3electionpb" ) type electionProxy struct { diff --git a/proxy/grpcproxy/health.go b/proxy/grpcproxy/health.go index e5e91f29bb3..1c71016575d 100644 --- a/proxy/grpcproxy/health.go +++ b/proxy/grpcproxy/health.go @@ -19,9 +19,9 @@ import ( "net/http" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/etcdhttp" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/etcdserver/api/etcdhttp" + "github.com/ozonru/etcd/etcdserver/api/v3rpc/rpctypes" ) // HandleHealth registers health handler on '/health'. diff --git a/proxy/grpcproxy/kv.go b/proxy/grpcproxy/kv.go index 1c9860f98af..b1978b0ce97 100644 --- a/proxy/grpcproxy/kv.go +++ b/proxy/grpcproxy/kv.go @@ -17,9 +17,9 @@ package grpcproxy import ( "context" - "github.com/coreos/etcd/clientv3" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/proxy/grpcproxy/cache" + "github.com/ozonru/etcd/clientv3" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/proxy/grpcproxy/cache" ) type kvProxy struct { diff --git a/proxy/grpcproxy/kv_test.go b/proxy/grpcproxy/kv_test.go index 33fb597c08b..59df1497bda 100644 --- a/proxy/grpcproxy/kv_test.go +++ b/proxy/grpcproxy/kv_test.go @@ -20,10 +20,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/clientv3" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/integration" + "github.com/ozonru/etcd/pkg/testutil" "google.golang.org/grpc" ) diff --git a/proxy/grpcproxy/leader.go b/proxy/grpcproxy/leader.go index 042c949b708..a038af3887a 100644 --- a/proxy/grpcproxy/leader.go +++ b/proxy/grpcproxy/leader.go @@ -19,8 +19,8 @@ import ( "math" "sync" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/etcdserver/api/v3rpc/rpctypes" "golang.org/x/time/rate" "google.golang.org/grpc" diff --git a/proxy/grpcproxy/lease.go b/proxy/grpcproxy/lease.go index 65f68b0ea0c..79a00cf1fbf 100644 --- a/proxy/grpcproxy/lease.go +++ b/proxy/grpcproxy/lease.go @@ -21,9 +21,9 @@ import ( "sync/atomic" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/etcdserver/api/v3rpc/rpctypes" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" "google.golang.org/grpc/metadata" diff --git a/proxy/grpcproxy/lock.go b/proxy/grpcproxy/lock.go index ceef26f0a0f..5d45bb6ef16 100644 --- a/proxy/grpcproxy/lock.go +++ b/proxy/grpcproxy/lock.go @@ -17,8 +17,8 @@ package grpcproxy import ( "context" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3lock/v3lockpb" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/etcdserver/api/v3lock/v3lockpb" ) type lockProxy struct { diff --git a/proxy/grpcproxy/logger.go b/proxy/grpcproxy/logger.go index c2d81804395..3f830e1a56c 100644 --- a/proxy/grpcproxy/logger.go +++ b/proxy/grpcproxy/logger.go @@ -16,4 +16,4 @@ package grpcproxy import "github.com/coreos/pkg/capnslog" -var plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "grpcproxy") +var plog = capnslog.NewPackageLogger("github.com/ozonru/etcd", "grpcproxy") diff --git a/proxy/grpcproxy/maintenance.go b/proxy/grpcproxy/maintenance.go index 291e8e3088f..739bd1754a0 100644 --- a/proxy/grpcproxy/maintenance.go +++ b/proxy/grpcproxy/maintenance.go @@ -18,8 +18,8 @@ import ( "context" "io" - "github.com/coreos/etcd/clientv3" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/clientv3" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" ) type maintenanceProxy struct { diff --git a/proxy/grpcproxy/metrics.go b/proxy/grpcproxy/metrics.go index 99630a32e54..feb50a70b68 100644 --- a/proxy/grpcproxy/metrics.go +++ b/proxy/grpcproxy/metrics.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "github.com/coreos/etcd/etcdserver/api/etcdhttp" + "github.com/ozonru/etcd/etcdserver/api/etcdhttp" "github.com/prometheus/client_golang/prometheus" ) diff --git a/proxy/grpcproxy/register.go b/proxy/grpcproxy/register.go index 598c71f07ae..c8818dc755b 100644 --- a/proxy/grpcproxy/register.go +++ b/proxy/grpcproxy/register.go @@ -18,9 +18,9 @@ import ( "encoding/json" "os" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/concurrency" - "github.com/coreos/etcd/clientv3/naming" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/clientv3/concurrency" + "github.com/ozonru/etcd/clientv3/naming" "golang.org/x/time/rate" gnaming "google.golang.org/grpc/naming" diff --git a/proxy/grpcproxy/register_test.go b/proxy/grpcproxy/register_test.go index 7679e0e7b2d..6cad0aae0be 100644 --- a/proxy/grpcproxy/register_test.go +++ b/proxy/grpcproxy/register_test.go @@ -18,10 +18,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/clientv3/naming" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/clientv3/naming" + "github.com/ozonru/etcd/integration" + "github.com/ozonru/etcd/pkg/testutil" gnaming "google.golang.org/grpc/naming" ) diff --git a/proxy/grpcproxy/watch.go b/proxy/grpcproxy/watch.go index 603095f27f1..be98669191e 100644 --- a/proxy/grpcproxy/watch.go +++ b/proxy/grpcproxy/watch.go @@ -18,10 +18,10 @@ import ( "context" "sync" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v3rpc" - "github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/etcdserver/api/v3rpc" + "github.com/ozonru/etcd/etcdserver/api/v3rpc/rpctypes" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" "google.golang.org/grpc" "google.golang.org/grpc/metadata" diff --git a/proxy/grpcproxy/watch_broadcast.go b/proxy/grpcproxy/watch_broadcast.go index 46e56c79a9d..fc7c1b81e6d 100644 --- a/proxy/grpcproxy/watch_broadcast.go +++ b/proxy/grpcproxy/watch_broadcast.go @@ -18,8 +18,8 @@ import ( "context" "sync" - "github.com/coreos/etcd/clientv3" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/clientv3" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" ) // watchBroadcast broadcasts a server watcher to many client watchers. diff --git a/proxy/grpcproxy/watcher.go b/proxy/grpcproxy/watcher.go index 1a497462f99..07cd6a6fdf1 100644 --- a/proxy/grpcproxy/watcher.go +++ b/proxy/grpcproxy/watcher.go @@ -17,10 +17,10 @@ package grpcproxy import ( "time" - "github.com/coreos/etcd/clientv3" - pb "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/mvcc" - "github.com/coreos/etcd/mvcc/mvccpb" + "github.com/ozonru/etcd/clientv3" + pb "github.com/ozonru/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/mvcc" + "github.com/ozonru/etcd/mvcc/mvccpb" ) type watchRange struct { diff --git a/proxy/httpproxy/reverse.go b/proxy/httpproxy/reverse.go index 2ecff3aaea9..d40a7f6fec5 100644 --- a/proxy/httpproxy/reverse.go +++ b/proxy/httpproxy/reverse.go @@ -27,12 +27,12 @@ import ( "sync/atomic" "time" - "github.com/coreos/etcd/etcdserver/api/v2http/httptypes" + "github.com/ozonru/etcd/etcdserver/api/v2http/httptypes" "github.com/coreos/pkg/capnslog" ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "proxy/httpproxy") + plog = capnslog.NewPackageLogger("github.com/ozonru/etcd", "proxy/httpproxy") // Hop-by-hop headers. These are removed when sent to the backend. // http://www.w3.org/Protocols/rfc2616/rfc2616-sec13.html diff --git a/proxy/tcpproxy/userspace.go b/proxy/tcpproxy/userspace.go index 6dc1d1d6d92..cb044562b20 100644 --- a/proxy/tcpproxy/userspace.go +++ b/proxy/tcpproxy/userspace.go @@ -26,7 +26,7 @@ import ( ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "proxy/tcpproxy") + plog = capnslog.NewPackageLogger("github.com/ozonru/etcd", "proxy/tcpproxy") ) type remote struct { diff --git a/raft/README.md b/raft/README.md index fde22b16519..9d65551618f 100644 --- a/raft/README.md +++ b/raft/README.md @@ -13,7 +13,7 @@ To keep the codebase small as well as provide flexibility, the library only impl In order to easily test the Raft library, its behavior should be deterministic. To achieve this determinism, the library models Raft as a state machine. The state machine takes a `Message` as input. A message can either be a local timer update or a network message sent from a remote peer. The state machine's output is a 3-tuple `{[]Messages, []LogEntries, NextState}` consisting of an array of `Messages`, `log entries`, and `Raft state changes`. For state machines with the same state, the same state machine input should always generate the same state machine output. -A simple example application, _raftexample_, is also available to help illustrate how to use this package in practice: https://github.com/coreos/etcd/tree/master/contrib/raftexample +A simple example application, _raftexample_, is also available to help illustrate how to use this package in practice: https://github.com/ozonru/etcd/tree/master/contrib/raftexample # Features @@ -46,7 +46,7 @@ This raft implementation also includes a few optional enhancements: - [cockroachdb](https://github.com/cockroachdb/cockroach) A Scalable, Survivable, Strongly-Consistent SQL Database - [dgraph](https://github.com/dgraph-io/dgraph) A Scalable, Distributed, Low Latency, High Throughput Graph Database -- [etcd](https://github.com/coreos/etcd) A distributed reliable key-value store +- [etcd](https://github.com/ozonru/etcd) A distributed reliable key-value store - [tikv](https://github.com/pingcap/tikv) A Distributed transactional key value database powered by Rust and Raft - [swarmkit](https://github.com/docker/swarmkit) A toolkit for orchestrating distributed systems at any scale. - [chain core](https://github.com/chain/chain) Software for operating permissioned, multi-asset blockchain networks diff --git a/raft/doc.go b/raft/doc.go index b55c591ff5d..98bd243bc76 100644 --- a/raft/doc.go +++ b/raft/doc.go @@ -23,7 +23,7 @@ For more details on Raft, see "In Search of an Understandable Consensus Algorith A simple example application, _raftexample_, is also available to help illustrate how to use this package in practice: -https://github.com/coreos/etcd/tree/master/contrib/raftexample +https://github.com/ozonru/etcd/tree/master/contrib/raftexample Usage diff --git a/raft/example_test.go b/raft/example_test.go index 26a1e0249ea..ed7e650c822 100644 --- a/raft/example_test.go +++ b/raft/example_test.go @@ -15,7 +15,7 @@ package raft import ( - pb "github.com/coreos/etcd/raft/raftpb" + pb "github.com/ozonru/etcd/raft/raftpb" ) func applyToStore(ents []pb.Entry) {} diff --git a/raft/log.go b/raft/log.go index c3036d3c90d..0067dd26061 100644 --- a/raft/log.go +++ b/raft/log.go @@ -18,7 +18,7 @@ import ( "fmt" "log" - pb "github.com/coreos/etcd/raft/raftpb" + pb "github.com/ozonru/etcd/raft/raftpb" ) type raftLog struct { diff --git a/raft/log_test.go b/raft/log_test.go index f80e41ce2ab..b123f118687 100644 --- a/raft/log_test.go +++ b/raft/log_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" - pb "github.com/coreos/etcd/raft/raftpb" + pb "github.com/ozonru/etcd/raft/raftpb" ) func TestFindConflict(t *testing.T) { diff --git a/raft/log_unstable.go b/raft/log_unstable.go index 263af9ce405..54cc9f38108 100644 --- a/raft/log_unstable.go +++ b/raft/log_unstable.go @@ -14,7 +14,7 @@ package raft -import pb "github.com/coreos/etcd/raft/raftpb" +import pb "github.com/ozonru/etcd/raft/raftpb" // unstable.entries[i] has raft log position i+unstable.offset. // Note that unstable.offset may be less than the highest log diff --git a/raft/log_unstable_test.go b/raft/log_unstable_test.go index 52cb9a20d43..e68372a6c6b 100644 --- a/raft/log_unstable_test.go +++ b/raft/log_unstable_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" - pb "github.com/coreos/etcd/raft/raftpb" + pb "github.com/ozonru/etcd/raft/raftpb" ) func TestUnstableMaybeFirstIndex(t *testing.T) { diff --git a/raft/node.go b/raft/node.go index 33a9db84001..b3e7e2dd104 100644 --- a/raft/node.go +++ b/raft/node.go @@ -18,7 +18,7 @@ import ( "context" "errors" - pb "github.com/coreos/etcd/raft/raftpb" + pb "github.com/ozonru/etcd/raft/raftpb" ) type SnapshotStatus int diff --git a/raft/node_test.go b/raft/node_test.go index 4401412e774..4ee14205acd 100644 --- a/raft/node_test.go +++ b/raft/node_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/raft/raftpb" + "github.com/ozonru/etcd/pkg/testutil" + "github.com/ozonru/etcd/raft/raftpb" ) // TestNodeStep ensures that node.Step sends msgProp to propc chan diff --git a/raft/raft.go b/raft/raft.go index 22ff138e9c4..2980d13526d 100644 --- a/raft/raft.go +++ b/raft/raft.go @@ -25,7 +25,7 @@ import ( "sync" "time" - pb "github.com/coreos/etcd/raft/raftpb" + pb "github.com/ozonru/etcd/raft/raftpb" ) // None is a placeholder node ID used when there is no leader. diff --git a/raft/raft_flow_control_test.go b/raft/raft_flow_control_test.go index c745050f8b4..85530f4dfba 100644 --- a/raft/raft_flow_control_test.go +++ b/raft/raft_flow_control_test.go @@ -17,7 +17,7 @@ package raft import ( "testing" - pb "github.com/coreos/etcd/raft/raftpb" + pb "github.com/ozonru/etcd/raft/raftpb" ) // TestMsgAppFlowControlFull ensures: diff --git a/raft/raft_paper_test.go b/raft/raft_paper_test.go index 2911e8aa333..7436aeef839 100644 --- a/raft/raft_paper_test.go +++ b/raft/raft_paper_test.go @@ -33,7 +33,7 @@ import ( "reflect" "sort" - pb "github.com/coreos/etcd/raft/raftpb" + pb "github.com/ozonru/etcd/raft/raftpb" ) func TestFollowerUpdateTermFromMessage(t *testing.T) { diff --git a/raft/raft_snap_test.go b/raft/raft_snap_test.go index 3908d581233..9b19af73f03 100644 --- a/raft/raft_snap_test.go +++ b/raft/raft_snap_test.go @@ -17,7 +17,7 @@ package raft import ( "testing" - pb "github.com/coreos/etcd/raft/raftpb" + pb "github.com/ozonru/etcd/raft/raftpb" ) var ( diff --git a/raft/raft_test.go b/raft/raft_test.go index e29bace2051..1339e876c14 100644 --- a/raft/raft_test.go +++ b/raft/raft_test.go @@ -22,7 +22,7 @@ import ( "reflect" "testing" - pb "github.com/coreos/etcd/raft/raftpb" + pb "github.com/ozonru/etcd/raft/raftpb" ) // nextEnts returns the appliable entries and updates the applied index @@ -1374,7 +1374,7 @@ func TestHandleHeartbeatResp(t *testing.T) { // TestRaftFreesReadOnlyMem ensures raft will free read request from // readOnly readIndexQueue and pendingReadIndex map. -// related issue: https://github.com/coreos/etcd/issues/7571 +// related issue: https://github.com/ozonru/etcd/issues/7571 func TestRaftFreesReadOnlyMem(t *testing.T) { sm := newTestRaft(1, []uint64{1, 2}, 5, 1, NewMemoryStorage()) sm.becomeCandidate() diff --git a/raft/rafttest/network.go b/raft/rafttest/network.go index d10530e835d..31932c83320 100644 --- a/raft/rafttest/network.go +++ b/raft/rafttest/network.go @@ -19,7 +19,7 @@ import ( "sync" "time" - "github.com/coreos/etcd/raft/raftpb" + "github.com/ozonru/etcd/raft/raftpb" ) // a network interface diff --git a/raft/rafttest/network_test.go b/raft/rafttest/network_test.go index 52cde4393cc..a6a1044b203 100644 --- a/raft/rafttest/network_test.go +++ b/raft/rafttest/network_test.go @@ -18,7 +18,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/raft/raftpb" + "github.com/ozonru/etcd/raft/raftpb" ) func TestNetworkDrop(t *testing.T) { diff --git a/raft/rafttest/node.go b/raft/rafttest/node.go index 0c47bb2f9be..3c96f28d6f8 100644 --- a/raft/rafttest/node.go +++ b/raft/rafttest/node.go @@ -20,8 +20,8 @@ import ( "sync" "time" - "github.com/coreos/etcd/raft" - "github.com/coreos/etcd/raft/raftpb" + "github.com/ozonru/etcd/raft" + "github.com/ozonru/etcd/raft/raftpb" ) type node struct { diff --git a/raft/rafttest/node_bench_test.go b/raft/rafttest/node_bench_test.go index 17cce676721..c3ccef005b7 100644 --- a/raft/rafttest/node_bench_test.go +++ b/raft/rafttest/node_bench_test.go @@ -19,7 +19,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/raft" + "github.com/ozonru/etcd/raft" ) func BenchmarkProposal3Nodes(b *testing.B) { diff --git a/raft/rafttest/node_test.go b/raft/rafttest/node_test.go index 6a81c8b4f3e..ca04c400872 100644 --- a/raft/rafttest/node_test.go +++ b/raft/rafttest/node_test.go @@ -19,7 +19,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/raft" + "github.com/ozonru/etcd/raft" ) func TestBasicProgress(t *testing.T) { diff --git a/raft/rawnode.go b/raft/rawnode.go index 925cb851c4a..b49a85bf6aa 100644 --- a/raft/rawnode.go +++ b/raft/rawnode.go @@ -17,7 +17,7 @@ package raft import ( "errors" - pb "github.com/coreos/etcd/raft/raftpb" + pb "github.com/ozonru/etcd/raft/raftpb" ) // ErrStepLocalMsg is returned when try to step a local raft message diff --git a/raft/rawnode_test.go b/raft/rawnode_test.go index 4ccf72de45a..edeff9e189c 100644 --- a/raft/rawnode_test.go +++ b/raft/rawnode_test.go @@ -19,7 +19,7 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/raft/raftpb" + "github.com/ozonru/etcd/raft/raftpb" ) // TestRawNodeStep ensures that RawNode.Step ignore local message. diff --git a/raft/read_only.go b/raft/read_only.go index ae746fa73eb..a3ee43e7249 100644 --- a/raft/read_only.go +++ b/raft/read_only.go @@ -14,7 +14,7 @@ package raft -import pb "github.com/coreos/etcd/raft/raftpb" +import pb "github.com/ozonru/etcd/raft/raftpb" // ReadState provides state for read only query. // It's caller's responsibility to call ReadIndex first before getting diff --git a/raft/status.go b/raft/status.go index f4d3d86a4e3..0e63304f1d4 100644 --- a/raft/status.go +++ b/raft/status.go @@ -17,7 +17,7 @@ package raft import ( "fmt" - pb "github.com/coreos/etcd/raft/raftpb" + pb "github.com/ozonru/etcd/raft/raftpb" ) type Status struct { diff --git a/raft/storage.go b/raft/storage.go index 69c3a7d9033..82536566563 100644 --- a/raft/storage.go +++ b/raft/storage.go @@ -18,7 +18,7 @@ import ( "errors" "sync" - pb "github.com/coreos/etcd/raft/raftpb" + pb "github.com/ozonru/etcd/raft/raftpb" ) // ErrCompacted is returned by Storage.Entries/Compact when a requested diff --git a/raft/storage_test.go b/raft/storage_test.go index 71d50b4c946..4a10df8cc8d 100644 --- a/raft/storage_test.go +++ b/raft/storage_test.go @@ -19,7 +19,7 @@ import ( "reflect" "testing" - pb "github.com/coreos/etcd/raft/raftpb" + pb "github.com/ozonru/etcd/raft/raftpb" ) func TestStorageTerm(t *testing.T) { diff --git a/raft/util.go b/raft/util.go index f4141fe65dd..e7c68200faa 100644 --- a/raft/util.go +++ b/raft/util.go @@ -18,7 +18,7 @@ import ( "bytes" "fmt" - pb "github.com/coreos/etcd/raft/raftpb" + pb "github.com/ozonru/etcd/raft/raftpb" ) func (st StateType) MarshalJSON() ([]byte, error) { diff --git a/raft/util_test.go b/raft/util_test.go index 9d7eeb07b87..36af82f8acd 100644 --- a/raft/util_test.go +++ b/raft/util_test.go @@ -20,7 +20,7 @@ import ( "strings" "testing" - pb "github.com/coreos/etcd/raft/raftpb" + pb "github.com/ozonru/etcd/raft/raftpb" ) var testFormatter EntryFormatter = func(data []byte) string { diff --git a/rafthttp/coder.go b/rafthttp/coder.go index 86ede972e1f..c7de2da282c 100644 --- a/rafthttp/coder.go +++ b/rafthttp/coder.go @@ -14,7 +14,7 @@ package rafthttp -import "github.com/coreos/etcd/raft/raftpb" +import "github.com/ozonru/etcd/raft/raftpb" type encoder interface { // encode encodes the given message to an output stream. diff --git a/rafthttp/functional_test.go b/rafthttp/functional_test.go index 2a04a91cdce..fe59b5644c8 100644 --- a/rafthttp/functional_test.go +++ b/rafthttp/functional_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver/stats" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft" - "github.com/coreos/etcd/raft/raftpb" + "github.com/ozonru/etcd/etcdserver/stats" + "github.com/ozonru/etcd/pkg/types" + "github.com/ozonru/etcd/raft" + "github.com/ozonru/etcd/raft/raftpb" ) func TestSendMessage(t *testing.T) { diff --git a/rafthttp/http.go b/rafthttp/http.go index 817d6c64ba6..9d3452fe0bd 100644 --- a/rafthttp/http.go +++ b/rafthttp/http.go @@ -24,11 +24,11 @@ import ( "strings" "time" - pioutil "github.com/coreos/etcd/pkg/ioutil" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/snap" - "github.com/coreos/etcd/version" + pioutil "github.com/ozonru/etcd/pkg/ioutil" + "github.com/ozonru/etcd/pkg/types" + "github.com/ozonru/etcd/raft/raftpb" + "github.com/ozonru/etcd/snap" + "github.com/ozonru/etcd/version" ) const ( diff --git a/rafthttp/http_test.go b/rafthttp/http_test.go index e7f6e034f1e..3398ecec9ca 100644 --- a/rafthttp/http_test.go +++ b/rafthttp/http_test.go @@ -26,11 +26,11 @@ import ( "testing" "time" - "github.com/coreos/etcd/pkg/pbutil" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/snap" - "github.com/coreos/etcd/version" + "github.com/ozonru/etcd/pkg/pbutil" + "github.com/ozonru/etcd/pkg/types" + "github.com/ozonru/etcd/raft/raftpb" + "github.com/ozonru/etcd/snap" + "github.com/ozonru/etcd/version" ) func TestServeRaftPrefix(t *testing.T) { diff --git a/rafthttp/msg_codec.go b/rafthttp/msg_codec.go index ef59bc8883f..56ff937029b 100644 --- a/rafthttp/msg_codec.go +++ b/rafthttp/msg_codec.go @@ -19,8 +19,8 @@ import ( "errors" "io" - "github.com/coreos/etcd/pkg/pbutil" - "github.com/coreos/etcd/raft/raftpb" + "github.com/ozonru/etcd/pkg/pbutil" + "github.com/ozonru/etcd/raft/raftpb" ) // messageEncoder is a encoder that can encode all kinds of messages. diff --git a/rafthttp/msg_codec_test.go b/rafthttp/msg_codec_test.go index 6e92771329e..879695653f0 100644 --- a/rafthttp/msg_codec_test.go +++ b/rafthttp/msg_codec_test.go @@ -19,7 +19,7 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/raft/raftpb" + "github.com/ozonru/etcd/raft/raftpb" ) func TestMessage(t *testing.T) { diff --git a/rafthttp/msgappv2_codec.go b/rafthttp/msgappv2_codec.go index 013ffe7c736..7f3024207c6 100644 --- a/rafthttp/msgappv2_codec.go +++ b/rafthttp/msgappv2_codec.go @@ -20,10 +20,10 @@ import ( "io" "time" - "github.com/coreos/etcd/etcdserver/stats" - "github.com/coreos/etcd/pkg/pbutil" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft/raftpb" + "github.com/ozonru/etcd/etcdserver/stats" + "github.com/ozonru/etcd/pkg/pbutil" + "github.com/ozonru/etcd/pkg/types" + "github.com/ozonru/etcd/raft/raftpb" ) const ( diff --git a/rafthttp/msgappv2_codec_test.go b/rafthttp/msgappv2_codec_test.go index 394c63f09b9..cb96afc6f6e 100644 --- a/rafthttp/msgappv2_codec_test.go +++ b/rafthttp/msgappv2_codec_test.go @@ -19,9 +19,9 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/etcdserver/stats" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft/raftpb" + "github.com/ozonru/etcd/etcdserver/stats" + "github.com/ozonru/etcd/pkg/types" + "github.com/ozonru/etcd/raft/raftpb" ) func TestMsgAppV2(t *testing.T) { diff --git a/rafthttp/peer.go b/rafthttp/peer.go index e9a25bb3aa9..95934fd5aab 100644 --- a/rafthttp/peer.go +++ b/rafthttp/peer.go @@ -19,11 +19,11 @@ import ( "sync" "time" - "github.com/coreos/etcd/etcdserver/stats" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/snap" + "github.com/ozonru/etcd/etcdserver/stats" + "github.com/ozonru/etcd/pkg/types" + "github.com/ozonru/etcd/raft" + "github.com/ozonru/etcd/raft/raftpb" + "github.com/ozonru/etcd/snap" "golang.org/x/time/rate" ) diff --git a/rafthttp/peer_status.go b/rafthttp/peer_status.go index 69cbd384ca0..bc386ecac41 100644 --- a/rafthttp/peer_status.go +++ b/rafthttp/peer_status.go @@ -19,7 +19,7 @@ import ( "sync" "time" - "github.com/coreos/etcd/pkg/types" + "github.com/ozonru/etcd/pkg/types" ) type failureType struct { diff --git a/rafthttp/peer_test.go b/rafthttp/peer_test.go index 00e00853bf9..4c59a0c1763 100644 --- a/rafthttp/peer_test.go +++ b/rafthttp/peer_test.go @@ -17,7 +17,7 @@ package rafthttp import ( "testing" - "github.com/coreos/etcd/raft/raftpb" + "github.com/ozonru/etcd/raft/raftpb" ) func TestPeerPick(t *testing.T) { diff --git a/rafthttp/pipeline.go b/rafthttp/pipeline.go index d9f07c3479d..5701a042f6f 100644 --- a/rafthttp/pipeline.go +++ b/rafthttp/pipeline.go @@ -22,11 +22,11 @@ import ( "sync" "time" - "github.com/coreos/etcd/etcdserver/stats" - "github.com/coreos/etcd/pkg/pbutil" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft" - "github.com/coreos/etcd/raft/raftpb" + "github.com/ozonru/etcd/etcdserver/stats" + "github.com/ozonru/etcd/pkg/pbutil" + "github.com/ozonru/etcd/pkg/types" + "github.com/ozonru/etcd/raft" + "github.com/ozonru/etcd/raft/raftpb" ) const ( diff --git a/rafthttp/pipeline_test.go b/rafthttp/pipeline_test.go index bdcdbc87053..0c500177ce1 100644 --- a/rafthttp/pipeline_test.go +++ b/rafthttp/pipeline_test.go @@ -24,11 +24,11 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver/stats" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/version" + "github.com/ozonru/etcd/etcdserver/stats" + "github.com/ozonru/etcd/pkg/testutil" + "github.com/ozonru/etcd/pkg/types" + "github.com/ozonru/etcd/raft/raftpb" + "github.com/ozonru/etcd/version" ) // TestPipelineSend tests that pipeline could send data using roundtripper diff --git a/rafthttp/remote.go b/rafthttp/remote.go index f7f9d2ceb53..dfaa4c18134 100644 --- a/rafthttp/remote.go +++ b/rafthttp/remote.go @@ -15,8 +15,8 @@ package rafthttp import ( - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft/raftpb" + "github.com/ozonru/etcd/pkg/types" + "github.com/ozonru/etcd/raft/raftpb" ) type remote struct { diff --git a/rafthttp/snapshot_sender.go b/rafthttp/snapshot_sender.go index a97c6f34564..ef76c6d8f7f 100644 --- a/rafthttp/snapshot_sender.go +++ b/rafthttp/snapshot_sender.go @@ -22,11 +22,11 @@ import ( "net/http" "time" - "github.com/coreos/etcd/pkg/httputil" - pioutil "github.com/coreos/etcd/pkg/ioutil" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft" - "github.com/coreos/etcd/snap" + "github.com/ozonru/etcd/pkg/httputil" + pioutil "github.com/ozonru/etcd/pkg/ioutil" + "github.com/ozonru/etcd/pkg/types" + "github.com/ozonru/etcd/raft" + "github.com/ozonru/etcd/snap" ) var ( diff --git a/rafthttp/snapshot_test.go b/rafthttp/snapshot_test.go index fbf482d0999..fe8fcf573ef 100644 --- a/rafthttp/snapshot_test.go +++ b/rafthttp/snapshot_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/snap" + "github.com/ozonru/etcd/pkg/types" + "github.com/ozonru/etcd/raft/raftpb" + "github.com/ozonru/etcd/snap" ) type strReaderCloser struct{ *strings.Reader } diff --git a/rafthttp/stream.go b/rafthttp/stream.go index af49c18b1d9..9a394764bcb 100644 --- a/rafthttp/stream.go +++ b/rafthttp/stream.go @@ -27,12 +27,12 @@ import ( "golang.org/x/time/rate" - "github.com/coreos/etcd/etcdserver/stats" - "github.com/coreos/etcd/pkg/httputil" - "github.com/coreos/etcd/pkg/transport" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/version" + "github.com/ozonru/etcd/etcdserver/stats" + "github.com/ozonru/etcd/pkg/httputil" + "github.com/ozonru/etcd/pkg/transport" + "github.com/ozonru/etcd/pkg/types" + "github.com/ozonru/etcd/raft/raftpb" + "github.com/ozonru/etcd/version" "github.com/coreos/go-semver/semver" ) diff --git a/rafthttp/stream_test.go b/rafthttp/stream_test.go index c9cd2b3d69c..bfa0a8c8623 100644 --- a/rafthttp/stream_test.go +++ b/rafthttp/stream_test.go @@ -28,11 +28,11 @@ import ( "golang.org/x/time/rate" - "github.com/coreos/etcd/etcdserver/stats" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/version" + "github.com/ozonru/etcd/etcdserver/stats" + "github.com/ozonru/etcd/pkg/testutil" + "github.com/ozonru/etcd/pkg/types" + "github.com/ozonru/etcd/raft/raftpb" + "github.com/ozonru/etcd/version" "github.com/coreos/go-semver/semver" ) diff --git a/rafthttp/transport.go b/rafthttp/transport.go index 9ec765086be..9268496dd0a 100644 --- a/rafthttp/transport.go +++ b/rafthttp/transport.go @@ -20,20 +20,20 @@ import ( "sync" "time" - "github.com/coreos/etcd/etcdserver/stats" - "github.com/coreos/etcd/pkg/logutil" - "github.com/coreos/etcd/pkg/transport" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/snap" + "github.com/ozonru/etcd/etcdserver/stats" + "github.com/ozonru/etcd/pkg/logutil" + "github.com/ozonru/etcd/pkg/transport" + "github.com/ozonru/etcd/pkg/types" + "github.com/ozonru/etcd/raft" + "github.com/ozonru/etcd/raft/raftpb" + "github.com/ozonru/etcd/snap" "github.com/coreos/pkg/capnslog" "github.com/xiang90/probing" "golang.org/x/time/rate" ) -var plog = logutil.NewMergeLogger(capnslog.NewPackageLogger("github.com/coreos/etcd", "rafthttp")) +var plog = logutil.NewMergeLogger(capnslog.NewPackageLogger("github.com/ozonru/etcd", "rafthttp")) type Raft interface { Process(ctx context.Context, m raftpb.Message) error diff --git a/rafthttp/transport_bench_test.go b/rafthttp/transport_bench_test.go index cd586461fb4..aca55bcd9b6 100644 --- a/rafthttp/transport_bench_test.go +++ b/rafthttp/transport_bench_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver/stats" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft" - "github.com/coreos/etcd/raft/raftpb" + "github.com/ozonru/etcd/etcdserver/stats" + "github.com/ozonru/etcd/pkg/types" + "github.com/ozonru/etcd/raft" + "github.com/ozonru/etcd/raft/raftpb" ) func BenchmarkSendingMsgApp(b *testing.B) { diff --git a/rafthttp/transport_test.go b/rafthttp/transport_test.go index 4a82a97a4e1..7d0efa7d376 100644 --- a/rafthttp/transport_test.go +++ b/rafthttp/transport_test.go @@ -20,10 +20,10 @@ import ( "testing" "time" - "github.com/coreos/etcd/etcdserver/stats" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft/raftpb" + "github.com/ozonru/etcd/etcdserver/stats" + "github.com/ozonru/etcd/pkg/testutil" + "github.com/ozonru/etcd/pkg/types" + "github.com/ozonru/etcd/raft/raftpb" "github.com/xiang90/probing" ) diff --git a/rafthttp/urlpick.go b/rafthttp/urlpick.go index 61839deeb70..2a4fa718933 100644 --- a/rafthttp/urlpick.go +++ b/rafthttp/urlpick.go @@ -18,7 +18,7 @@ import ( "net/url" "sync" - "github.com/coreos/etcd/pkg/types" + "github.com/ozonru/etcd/pkg/types" ) type urlPicker struct { diff --git a/rafthttp/urlpick_test.go b/rafthttp/urlpick_test.go index 70ebbd326b4..58c85e52528 100644 --- a/rafthttp/urlpick_test.go +++ b/rafthttp/urlpick_test.go @@ -18,7 +18,7 @@ import ( "net/url" "testing" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/pkg/testutil" ) // TestURLPickerPickTwice tests that pick returns a possible url, diff --git a/rafthttp/util.go b/rafthttp/util.go index 6ec3641aa7a..02639b8cabd 100644 --- a/rafthttp/util.go +++ b/rafthttp/util.go @@ -23,9 +23,9 @@ import ( "strings" "time" - "github.com/coreos/etcd/pkg/transport" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/version" + "github.com/ozonru/etcd/pkg/transport" + "github.com/ozonru/etcd/pkg/types" + "github.com/ozonru/etcd/version" "github.com/coreos/go-semver/semver" ) diff --git a/rafthttp/util_test.go b/rafthttp/util_test.go index 6ff47969985..37dbb5776fe 100644 --- a/rafthttp/util_test.go +++ b/rafthttp/util_test.go @@ -22,8 +22,8 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/version" + "github.com/ozonru/etcd/raft/raftpb" + "github.com/ozonru/etcd/version" "github.com/coreos/go-semver/semver" ) diff --git a/scripts/build-docker b/scripts/build-docker index 40a4dd3a969..241e970431b 100755 --- a/scripts/build-docker +++ b/scripts/build-docker @@ -15,7 +15,7 @@ if [ -z "${BINARYDIR}" ]; then RELEASE="etcd-${1}"-$(go env GOOS)-$(go env GOARCH) BINARYDIR="${RELEASE}" TARFILE="${RELEASE}.tar.gz" - TARURL="https://github.com/coreos/etcd/releases/download/${1}/${TARFILE}" + TARURL="https://github.com/ozonru/etcd/releases/download/${1}/${TARFILE}" if ! curl -f -L -o "${TARFILE}" "${TARURL}" ; then echo "Failed to download ${TARURL}." exit 1 diff --git a/scripts/genproto.sh b/scripts/genproto.sh index 028f2192d06..611cd0cebea 100755 --- a/scripts/genproto.sh +++ b/scripts/genproto.sh @@ -31,7 +31,7 @@ export GOPATH=${PWD}/gopath.proto export GOBIN=${PWD}/bin export PATH="${GOBIN}:${PATH}" -ETCD_IO_ROOT="${GOPATH}/src/github.com/coreos/etcd" +ETCD_IO_ROOT="${GOPATH}/src/github.com/ozonru/etcd" ETCD_ROOT="${ETCD_IO_ROOT}/etcd" GOGOPROTO_ROOT="${GOPATH}/src/github.com/gogo/protobuf" SCHWAG_ROOT="${GOPATH}/src/github.com/hexfusion/schwag" diff --git a/scripts/updatebom.sh b/scripts/updatebom.sh index 82c9cc11ddd..f189fb88e0f 100755 --- a/scripts/updatebom.sh +++ b/scripts/updatebom.sh @@ -13,6 +13,6 @@ go get -v -u github.com/coreos/license-bill-of-materials echo "generating bill-of-materials.json" license-bill-of-materials \ --override-file ./bill-of-materials.override.json \ - github.com/coreos/etcd github.com/coreos/etcd/etcdctl > bill-of-materials.json + github.com/ozonru/etcd github.com/ozonru/etcd/etcdctl > bill-of-materials.json echo "generated bill-of-materials.json" diff --git a/snap/db.go b/snap/db.go index dcbd3bd6710..acabf31aab0 100644 --- a/snap/db.go +++ b/snap/db.go @@ -23,7 +23,7 @@ import ( "path/filepath" "time" - "github.com/coreos/etcd/pkg/fileutil" + "github.com/ozonru/etcd/pkg/fileutil" ) var ErrNoDBSnapshot = errors.New("snap: snapshot file doesn't exist") diff --git a/snap/message.go b/snap/message.go index d73713ff169..d15a2cf4491 100644 --- a/snap/message.go +++ b/snap/message.go @@ -17,8 +17,8 @@ package snap import ( "io" - "github.com/coreos/etcd/pkg/ioutil" - "github.com/coreos/etcd/raft/raftpb" + "github.com/ozonru/etcd/pkg/ioutil" + "github.com/ozonru/etcd/raft/raftpb" ) // Message is a struct that contains a raft Message and a ReadCloser. The type diff --git a/snap/snapshotter.go b/snap/snapshotter.go index 5d79b175915..e638046baaf 100644 --- a/snap/snapshotter.go +++ b/snap/snapshotter.go @@ -26,11 +26,11 @@ import ( "strings" "time" - pioutil "github.com/coreos/etcd/pkg/ioutil" - "github.com/coreos/etcd/pkg/pbutil" - "github.com/coreos/etcd/raft" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/snap/snappb" + pioutil "github.com/ozonru/etcd/pkg/ioutil" + "github.com/ozonru/etcd/pkg/pbutil" + "github.com/ozonru/etcd/raft" + "github.com/ozonru/etcd/raft/raftpb" + "github.com/ozonru/etcd/snap/snappb" "github.com/coreos/pkg/capnslog" ) @@ -40,7 +40,7 @@ const ( ) var ( - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "snap") + plog = capnslog.NewPackageLogger("github.com/ozonru/etcd", "snap") ErrNoSnapshot = errors.New("snap: no available snapshot") ErrEmptySnapshot = errors.New("snap: empty snapshot") diff --git a/snap/snapshotter_test.go b/snap/snapshotter_test.go index 6af823f03bf..5d0dfc6f17a 100644 --- a/snap/snapshotter_test.go +++ b/snap/snapshotter_test.go @@ -23,7 +23,7 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/raft/raftpb" + "github.com/ozonru/etcd/raft/raftpb" ) var testSnap = &raftpb.Snapshot{ diff --git a/snapshot/v3_snapshot.go b/snapshot/v3_snapshot.go index 87da3fb863d..6aec930f1f8 100644 --- a/snapshot/v3_snapshot.go +++ b/snapshot/v3_snapshot.go @@ -27,21 +27,21 @@ import ( "reflect" "time" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver" - "github.com/coreos/etcd/etcdserver/etcdserverpb" - "github.com/coreos/etcd/etcdserver/membership" - "github.com/coreos/etcd/lease" - "github.com/coreos/etcd/mvcc" - "github.com/coreos/etcd/mvcc/backend" - "github.com/coreos/etcd/pkg/fileutil" - "github.com/coreos/etcd/pkg/types" - "github.com/coreos/etcd/raft" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/snap" - "github.com/coreos/etcd/store" - "github.com/coreos/etcd/wal" - "github.com/coreos/etcd/wal/walpb" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/etcdserver" + "github.com/ozonru/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/etcdserver/membership" + "github.com/ozonru/etcd/lease" + "github.com/ozonru/etcd/mvcc" + "github.com/ozonru/etcd/mvcc/backend" + "github.com/ozonru/etcd/pkg/fileutil" + "github.com/ozonru/etcd/pkg/types" + "github.com/ozonru/etcd/raft" + "github.com/ozonru/etcd/raft/raftpb" + "github.com/ozonru/etcd/snap" + "github.com/ozonru/etcd/store" + "github.com/ozonru/etcd/wal" + "github.com/ozonru/etcd/wal/walpb" bolt "github.com/coreos/bbolt" "go.uber.org/zap" diff --git a/store/event_history.go b/store/event_history.go index 235d87a2664..5b28d06aed8 100644 --- a/store/event_history.go +++ b/store/event_history.go @@ -20,7 +20,7 @@ import ( "strings" "sync" - etcdErr "github.com/coreos/etcd/error" + etcdErr "github.com/ozonru/etcd/error" ) type EventHistory struct { diff --git a/store/event_test.go b/store/event_test.go index ba3c06c664e..226130ab363 100644 --- a/store/event_test.go +++ b/store/event_test.go @@ -17,7 +17,7 @@ package store import ( "testing" - etcdErr "github.com/coreos/etcd/error" + etcdErr "github.com/ozonru/etcd/error" ) // TestEventQueue tests a queue with capacity = 100 diff --git a/store/node.go b/store/node.go index c3c87431cb8..811379ae754 100644 --- a/store/node.go +++ b/store/node.go @@ -19,7 +19,7 @@ import ( "sort" "time" - etcdErr "github.com/coreos/etcd/error" + etcdErr "github.com/ozonru/etcd/error" "github.com/jonboulle/clockwork" ) diff --git a/store/node_extern_test.go b/store/node_extern_test.go index 7875e47f9d7..e7bde1b44dc 100644 --- a/store/node_extern_test.go +++ b/store/node_extern_test.go @@ -20,7 +20,7 @@ import ( "time" "unsafe" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/pkg/testutil" ) func TestNodeExternClone(t *testing.T) { diff --git a/store/stats_test.go b/store/stats_test.go index ec105a586fa..043209d143e 100644 --- a/store/stats_test.go +++ b/store/stats_test.go @@ -18,7 +18,7 @@ import ( "testing" "time" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/pkg/testutil" ) // Ensure that a successful Get is recorded in the stats. diff --git a/store/store.go b/store/store.go index edf7f21942b..b7fa10de371 100644 --- a/store/store.go +++ b/store/store.go @@ -23,8 +23,8 @@ import ( "sync" "time" - etcdErr "github.com/coreos/etcd/error" - "github.com/coreos/etcd/pkg/types" + etcdErr "github.com/ozonru/etcd/error" + "github.com/ozonru/etcd/pkg/types" "github.com/jonboulle/clockwork" ) diff --git a/store/store_test.go b/store/store_test.go index 44f72efe4fd..a3e34cb513a 100644 --- a/store/store_test.go +++ b/store/store_test.go @@ -18,9 +18,9 @@ import ( "testing" "time" - etcdErr "github.com/coreos/etcd/error" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/store" + etcdErr "github.com/ozonru/etcd/error" + "github.com/ozonru/etcd/pkg/testutil" + "github.com/ozonru/etcd/store" ) type StoreCloser interface { diff --git a/store/store_ttl_test.go b/store/store_ttl_test.go index 89d76e71c97..ffc4bca4b6e 100644 --- a/store/store_ttl_test.go +++ b/store/store_ttl_test.go @@ -18,8 +18,8 @@ import ( "testing" "time" - etcdErr "github.com/coreos/etcd/error" - "github.com/coreos/etcd/pkg/testutil" + etcdErr "github.com/ozonru/etcd/error" + "github.com/ozonru/etcd/pkg/testutil" "github.com/jonboulle/clockwork" ) diff --git a/store/store_v2_test.go b/store/store_v2_test.go index 29569817731..2b6ff1f2750 100644 --- a/store/store_v2_test.go +++ b/store/store_v2_test.go @@ -19,8 +19,8 @@ package store_test import ( "testing" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/store" + "github.com/ozonru/etcd/pkg/testutil" + "github.com/ozonru/etcd/store" ) type v2TestStore struct { diff --git a/store/store_v2v3_test.go b/store/store_v2v3_test.go index 323c109d7b5..54a88aad450 100644 --- a/store/store_v2v3_test.go +++ b/store/store_v2v3_test.go @@ -20,10 +20,10 @@ import ( "io/ioutil" "testing" - "github.com/coreos/etcd/clientv3" - "github.com/coreos/etcd/etcdserver/api/v2v3" - "github.com/coreos/etcd/integration" - "github.com/coreos/etcd/store" + "github.com/ozonru/etcd/clientv3" + "github.com/ozonru/etcd/etcdserver/api/v2v3" + "github.com/ozonru/etcd/integration" + "github.com/ozonru/etcd/store" "github.com/coreos/pkg/capnslog" "google.golang.org/grpc/grpclog" diff --git a/store/watcher_hub.go b/store/watcher_hub.go index 13c23e391d9..1b4ea4896eb 100644 --- a/store/watcher_hub.go +++ b/store/watcher_hub.go @@ -21,7 +21,7 @@ import ( "sync" "sync/atomic" - etcdErr "github.com/coreos/etcd/error" + etcdErr "github.com/ozonru/etcd/error" ) // A watcherHub contains all subscribed watchers diff --git a/test b/test index 718380f19a2..37aec663d6f 100755 --- a/test +++ b/test @@ -638,7 +638,7 @@ function bom_pass { echo "Checking bill of materials..." license-bill-of-materials \ --override-file bill-of-materials.override.json \ - github.com/coreos/etcd github.com/coreos/etcd/etcdctl >bom-now.json || true + github.com/ozonru/etcd github.com/ozonru/etcd/etcdctl >bom-now.json || true if ! diff bill-of-materials.json bom-now.json; then echo "vendored licenses do not match given bill of materials" exit 255 diff --git a/tests/Dockerfile b/tests/Dockerfile index 070f6340503..1d18d16750d 100644 --- a/tests/Dockerfile +++ b/tests/Dockerfile @@ -39,5 +39,5 @@ RUN rm -rf ${GOROOT} \ && mkdir -p ${GOPATH}/src ${GOPATH}/bin \ && go version -RUN mkdir -p ${GOPATH}/src/github.com/coreos/etcd -WORKDIR ${GOPATH}/src/github.com/coreos/etcd +RUN mkdir -p ${GOPATH}/src/github.com/ozonru/etcd +WORKDIR ${GOPATH}/src/github.com/ozonru/etcd diff --git a/tests/e2e/ctl_v2_test.go b/tests/e2e/ctl_v2_test.go index cc73197936e..59ece0d742a 100644 --- a/tests/e2e/ctl_v2_test.go +++ b/tests/e2e/ctl_v2_test.go @@ -19,8 +19,8 @@ import ( "strings" "testing" - "github.com/coreos/etcd/pkg/fileutil" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/pkg/fileutil" + "github.com/ozonru/etcd/pkg/testutil" ) func testCtlV2Set(t *testing.T, cfg *etcdProcessClusterConfig, quorum bool) { diff --git a/tests/e2e/ctl_v3_member_test.go b/tests/e2e/ctl_v3_member_test.go index 0c22a3c5741..a37fa12940d 100644 --- a/tests/e2e/ctl_v3_member_test.go +++ b/tests/e2e/ctl_v3_member_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "github.com/coreos/etcd/etcdserver/etcdserverpb" + "github.com/ozonru/etcd/etcdserver/etcdserverpb" ) func TestCtlV3MemberList(t *testing.T) { testCtl(t, memberListTest) } diff --git a/tests/e2e/ctl_v3_test.go b/tests/e2e/ctl_v3_test.go index 82bcfdac0e9..f641df6cd69 100644 --- a/tests/e2e/ctl_v3_test.go +++ b/tests/e2e/ctl_v3_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/pkg/flags" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/version" + "github.com/ozonru/etcd/pkg/flags" + "github.com/ozonru/etcd/pkg/testutil" + "github.com/ozonru/etcd/version" ) func TestCtlV3Version(t *testing.T) { testCtl(t, versionTest) } diff --git a/tests/e2e/etcd_process.go b/tests/e2e/etcd_process.go index aa63f6e2d27..b4dd8790d8f 100644 --- a/tests/e2e/etcd_process.go +++ b/tests/e2e/etcd_process.go @@ -19,8 +19,8 @@ import ( "net/url" "os" - "github.com/coreos/etcd/pkg/expect" - "github.com/coreos/etcd/pkg/fileutil" + "github.com/ozonru/etcd/pkg/expect" + "github.com/ozonru/etcd/pkg/fileutil" ) var ( diff --git a/tests/e2e/etcd_release_upgrade_test.go b/tests/e2e/etcd_release_upgrade_test.go index a5665e10e0f..d36cb77a6e9 100644 --- a/tests/e2e/etcd_release_upgrade_test.go +++ b/tests/e2e/etcd_release_upgrade_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "github.com/coreos/etcd/pkg/fileutil" - "github.com/coreos/etcd/pkg/testutil" - "github.com/coreos/etcd/version" + "github.com/ozonru/etcd/pkg/fileutil" + "github.com/ozonru/etcd/pkg/testutil" + "github.com/ozonru/etcd/version" ) // TestReleaseUpgrade ensures that changes to master branch does not affect diff --git a/tests/e2e/etcd_spawn_nocov.go b/tests/e2e/etcd_spawn_nocov.go index 49d41822ef4..fe29ecaa6bb 100644 --- a/tests/e2e/etcd_spawn_nocov.go +++ b/tests/e2e/etcd_spawn_nocov.go @@ -19,7 +19,7 @@ package e2e import ( "os" - "github.com/coreos/etcd/pkg/expect" + "github.com/ozonru/etcd/pkg/expect" ) const noOutputLineCount = 0 // regular binaries emit no extra lines diff --git a/tests/e2e/main_test.go b/tests/e2e/main_test.go index 83bccf79996..f089d67fb77 100644 --- a/tests/e2e/main_test.go +++ b/tests/e2e/main_test.go @@ -10,7 +10,7 @@ import ( "runtime" "testing" - "github.com/coreos/etcd/pkg/testutil" + "github.com/ozonru/etcd/pkg/testutil" ) var ( diff --git a/tests/e2e/metrics_test.go b/tests/e2e/metrics_test.go index aade2718f15..95738d6d232 100644 --- a/tests/e2e/metrics_test.go +++ b/tests/e2e/metrics_test.go @@ -19,7 +19,7 @@ import ( "strings" "testing" - "github.com/coreos/etcd/version" + "github.com/ozonru/etcd/version" ) func TestV3MetricsSecure(t *testing.T) { diff --git a/tests/e2e/util.go b/tests/e2e/util.go index acbee8ae3d7..32be6db4c22 100644 --- a/tests/e2e/util.go +++ b/tests/e2e/util.go @@ -21,7 +21,7 @@ import ( "strings" "time" - "github.com/coreos/etcd/pkg/expect" + "github.com/ozonru/etcd/pkg/expect" ) func waitReadyExpectProc(exproc *expect.ExpectProcess, readyStrs []string) error { diff --git a/wal/decoder.go b/wal/decoder.go index 6a217f897b0..cd0d0e28573 100644 --- a/wal/decoder.go +++ b/wal/decoder.go @@ -21,10 +21,10 @@ import ( "io" "sync" - "github.com/coreos/etcd/pkg/crc" - "github.com/coreos/etcd/pkg/pbutil" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/wal/walpb" + "github.com/ozonru/etcd/pkg/crc" + "github.com/ozonru/etcd/pkg/pbutil" + "github.com/ozonru/etcd/raft/raftpb" + "github.com/ozonru/etcd/wal/walpb" ) const minSectorSize = 512 diff --git a/wal/encoder.go b/wal/encoder.go index e8890d88a9b..e544d201a22 100644 --- a/wal/encoder.go +++ b/wal/encoder.go @@ -21,9 +21,9 @@ import ( "os" "sync" - "github.com/coreos/etcd/pkg/crc" - "github.com/coreos/etcd/pkg/ioutil" - "github.com/coreos/etcd/wal/walpb" + "github.com/ozonru/etcd/pkg/crc" + "github.com/ozonru/etcd/pkg/ioutil" + "github.com/ozonru/etcd/wal/walpb" ) // walPageBytes is the alignment for flushing records to the backing Writer. diff --git a/wal/file_pipeline.go b/wal/file_pipeline.go index 3a1c57c1c96..b74c0160c10 100644 --- a/wal/file_pipeline.go +++ b/wal/file_pipeline.go @@ -19,7 +19,7 @@ import ( "os" "path/filepath" - "github.com/coreos/etcd/pkg/fileutil" + "github.com/ozonru/etcd/pkg/fileutil" ) // filePipeline pipelines allocating disk space diff --git a/wal/record_test.go b/wal/record_test.go index 2a6904a81fc..c16101bd224 100644 --- a/wal/record_test.go +++ b/wal/record_test.go @@ -22,7 +22,7 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/wal/walpb" + "github.com/ozonru/etcd/wal/walpb" ) var ( diff --git a/wal/repair.go b/wal/repair.go index f1e507683c3..97337225ab7 100644 --- a/wal/repair.go +++ b/wal/repair.go @@ -20,8 +20,8 @@ import ( "path/filepath" "time" - "github.com/coreos/etcd/pkg/fileutil" - "github.com/coreos/etcd/wal/walpb" + "github.com/ozonru/etcd/pkg/fileutil" + "github.com/ozonru/etcd/wal/walpb" ) // Repair tries to repair ErrUnexpectedEOF in the diff --git a/wal/repair_test.go b/wal/repair_test.go index be9c016cb4f..f70d8f99268 100644 --- a/wal/repair_test.go +++ b/wal/repair_test.go @@ -21,8 +21,8 @@ import ( "os" "testing" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/wal/walpb" + "github.com/ozonru/etcd/raft/raftpb" + "github.com/ozonru/etcd/wal/walpb" ) type corruptFunc func(string, int64) error diff --git a/wal/util.go b/wal/util.go index 5c56e228872..132d1402cd9 100644 --- a/wal/util.go +++ b/wal/util.go @@ -19,7 +19,7 @@ import ( "fmt" "strings" - "github.com/coreos/etcd/pkg/fileutil" + "github.com/ozonru/etcd/pkg/fileutil" ) var ( diff --git a/wal/wal.go b/wal/wal.go index 6909e3ac7af..507789302fe 100644 --- a/wal/wal.go +++ b/wal/wal.go @@ -25,11 +25,11 @@ import ( "sync" "time" - "github.com/coreos/etcd/pkg/fileutil" - "github.com/coreos/etcd/pkg/pbutil" - "github.com/coreos/etcd/raft" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/wal/walpb" + "github.com/ozonru/etcd/pkg/fileutil" + "github.com/ozonru/etcd/pkg/pbutil" + "github.com/ozonru/etcd/raft" + "github.com/ozonru/etcd/raft/raftpb" + "github.com/ozonru/etcd/wal/walpb" "github.com/coreos/pkg/capnslog" ) @@ -53,7 +53,7 @@ var ( // so that tests can set a different segment size. SegmentSizeBytes int64 = 64 * 1000 * 1000 // 64MB - plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "wal") + plog = capnslog.NewPackageLogger("github.com/ozonru/etcd", "wal") ErrMetadataConflict = errors.New("wal: conflicting metadata found") ErrFileNotFound = errors.New("wal: file not found") diff --git a/wal/wal_bench_test.go b/wal/wal_bench_test.go index 914e61c77d1..28e285bda4c 100644 --- a/wal/wal_bench_test.go +++ b/wal/wal_bench_test.go @@ -19,7 +19,7 @@ import ( "os" "testing" - "github.com/coreos/etcd/raft/raftpb" + "github.com/ozonru/etcd/raft/raftpb" ) func BenchmarkWrite100EntryWithoutBatch(b *testing.B) { benchmarkWriteEntry(b, 100, 0) } diff --git a/wal/wal_test.go b/wal/wal_test.go index b060da19128..f6ea227e937 100644 --- a/wal/wal_test.go +++ b/wal/wal_test.go @@ -24,10 +24,10 @@ import ( "reflect" "testing" - "github.com/coreos/etcd/pkg/fileutil" - "github.com/coreos/etcd/pkg/pbutil" - "github.com/coreos/etcd/raft/raftpb" - "github.com/coreos/etcd/wal/walpb" + "github.com/ozonru/etcd/pkg/fileutil" + "github.com/ozonru/etcd/pkg/pbutil" + "github.com/ozonru/etcd/raft/raftpb" + "github.com/ozonru/etcd/wal/walpb" ) func TestNew(t *testing.T) {