Skip to content

Commit

Permalink
Merge pull request #8991 from gyuho/upgrade-guide
Browse files Browse the repository at this point in the history
Documentation/upgrades: highlight 3.2 breaking change, require gRPC v1.7.4
  • Loading branch information
gyuho committed Dec 9, 2017
2 parents e3da56a + 605dcb5 commit e5e1096
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Documentation/upgrades/upgrade_3_2.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ In the general case, upgrading from etcd 3.1 to 3.2 can be a zero-downtime, roll

Before [starting an upgrade](#upgrade-procedure), read through the rest of this guide to prepare.

### Server upgrade checklists
### Server upgrade checklists (breaking change)

3.2 now rejects domains names for `--listen-peer-urls` and `--listen-client-urls` (3.1 only prints out warnings), since domain name is invalid for network interface binding. Make sure that those URLs are properly formated as `scheme://IP:port`.

Expand Down Expand Up @@ -54,7 +54,7 @@ clientv3yaml.NewConfig

### Client upgrade checklists (>=3.2.10)

Note that >=3.2.10 requires `grpc/grpc-go` v1.7.3 (<=3.2.9 with v1.2.1), which introduces some breaking changes.
Note that >=3.2.10 requires `grpc/grpc-go` v1.7.4 (<=3.2.9 with v1.2.1), which introduces some breaking changes.

Previously, `grpc.ErrClientConnTimeout` error is returned on client dial time-outs. >=3.2.10 instead returns `context.DeadlineExceeded` (see [#8504](https://github.com/coreos/etcd/issues/8504)).

Expand Down
4 changes: 2 additions & 2 deletions Documentation/upgrades/upgrade_3_3.md
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,9 @@ import "context"
cli.Put(context.Background(), "f", "v")
```

#### Upgrade grpc/grpc-go to `v1.7.x`
#### Upgrade grpc/grpc-go to `v1.7.4`

3.3 now requires [grpc/grpc-go](https://github.com/grpc/grpc-go/releases) `v1.7.x`.
3.3 now requires [grpc/grpc-go](https://github.com/grpc/grpc-go/releases) `v1.7.4`.

##### Deprecate `grpclog.Logger`

Expand Down

0 comments on commit e5e1096

Please sign in to comment.