Merge pull request #7238 from mkumatag/support_ppc64le

ppc64le platform support
etcd-io · Jan 27, 2017 · d2716fc · d2716fc
2 parents f127f46 + 9767098
commit d2716fc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/Documentation/op-guide/supported-platform.md b/Documentation/op-guide/supported-platform.md
@@ -4,14 +4,15 @@
 
 The following table lists etcd support status for common architectures and operating systems,
 
-| Architecture | Operating System | Status       | Maintainers      |
-| ------------ | ---------------- | ------------ | ---------------- |
-| amd64        | Darwin           | Experimental | etcd maintainers | 
-| amd64        | Linux            | Stable       | etcd maintainers |
-| amd64        | Windows          | Experimental |                  |
-| arm64        | Linux            | Experimental | @glevand         |
-| arm          | Linux            | Unstable     |                  |
-| 386          | Linux            | Unstable     |                  |
+| Architecture | Operating System | Status       | Maintainers                 |
+| ------------ | ---------------- | ------------ | --------------------------- |
+| amd64        | Darwin           | Experimental | etcd maintainers            | 
+| amd64        | Linux            | Stable       | etcd maintainers            |
+| amd64        | Windows          | Experimental |                             |
+| arm64        | Linux            | Experimental | @glevand                    |
+| arm          | Linux            | Unstable     |                             |
+| 386          | Linux            | Unstable     |                             |
+| ppc64le      | Linux            | Stable       | etcd maintainers, @mkumatag |
 
 * etcd-maintainers are listed in https://github.com/coreos/etcd/blob/master/MAINTAINERS.
 
@@ -33,7 +34,7 @@ etcd has known issues on 32-bit systems due to a bug in the Go runtime. See the
 
 To avoid inadvertently running a possibly unstable etcd server, `etcd` on unstable or unsupported architectures will print a warning message and immediately exit if the environment variable `ETCD_UNSUPPORTED_ARCH` is not set to the target architecture.
 
-Currently only the amd64 architecture is officially supported by `etcd`.
+Currently amd64 and ppc64le architectures are officially supported by `etcd`.
 
 [go-issue]: https://github.com/golang/go/issues/599
 [go-atomic]: https://golang.org/pkg/sync/atomic/#pkg-note-BUG
diff --git a/etcdmain/etcd.go b/etcdmain/etcd.go
@@ -409,7 +409,7 @@ func setupLogging(cfg *config) {
 
 func checkSupportArch() {
 	// TODO qualify arm64
-	if runtime.GOARCH == "amd64" {
+	if runtime.GOARCH == "amd64" || runtime.GOARCH == "ppc64le" {
 		return
 	}
 	if env, ok := os.LookupEnv("ETCD_UNSUPPORTED_ARCH"); ok && env == runtime.GOARCH {