diff --git a/.etcd.metadata b/.etcd.metadata index f4b52eb..e2ac571 100644 --- a/.etcd.metadata +++ b/.etcd.metadata @@ -1 +1 @@ -9c4d7d46ee91d51347a55a64a5eafdfe623aa41b SOURCES/etcd-21fdcc6.tar.gz +d129d7eb2f0e24e3f5bb3b096dcdfc6e2cbc538b SOURCES/etcd-43b7507.tar.gz diff --git a/.gitignore b/.gitignore index 5113026..359ecd8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/etcd-21fdcc6.tar.gz +SOURCES/etcd-43b7507.tar.gz diff --git a/SOURCES/bz1350875-disaster-recovery-with-copies.patch b/SOURCES/bz1350875-disaster-recovery-with-copies.patch index 73b69ec..ca64473 100644 --- a/SOURCES/bz1350875-disaster-recovery-with-copies.patch +++ b/SOURCES/bz1350875-disaster-recovery-with-copies.patch @@ -1,34 +1,35 @@ -From e32942895643fbd2db0055b79816e060355d6ca1 Mon Sep 17 00:00:00 2001 +From 7ad700a716c2122c3b6db6677a6f717919b88926 Mon Sep 17 00:00:00 2001 From: Jan Chaloupka -Date: Tue, 21 Feb 2017 12:10:33 +0100 -Subject: [PATCH] bz1350875-disaster-recovery-with-copies +Date: Tue, 2 May 2017 09:56:02 +0200 +Subject: [PATCH] bz1350875-disaster-recovery-with-copies: --- - etcdctl/ctlv2/command/backup_command.go | 18 ++++++++++++++++-- - 1 file changed, 16 insertions(+), 2 deletions(-) + etcdctl/ctlv2/command/backup_command.go | 19 +++++++++++++++++-- + 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/etcdctl/ctlv2/command/backup_command.go b/etcdctl/ctlv2/command/backup_command.go -index 9c7e2ff..0ad6d7a 100644 +index feda4b1..e77791f 100644 --- a/etcdctl/ctlv2/command/backup_command.go +++ b/etcdctl/ctlv2/command/backup_command.go @@ -18,6 +18,7 @@ import ( "fmt" "log" - "path" + "path/filepath" + "strconv" "time" "github.com/coreos/etcd/etcdserver/etcdserverpb" -@@ -40,6 +41,8 @@ func NewBackupCommand() cli.Command { +@@ -40,6 +41,9 @@ func NewBackupCommand() cli.Command { cli.StringFlag{Name: "wal-dir", Value: "", Usage: "Path to the etcd wal dir"}, cli.StringFlag{Name: "backup-dir", Value: "", Usage: "Path to the backup dir"}, cli.StringFlag{Name: "backup-wal-dir", Value: "", Usage: "Path to the backup wal dir"}, + cli.BoolFlag{Name: "keep-cluster-id", Usage: "Do not rewrite the cluster id"}, + cli.StringFlag{Name: "node-id", Value: "", Usage: "Use custom node id instead of a random value"}, ++ }, Action: handleBackup, } -@@ -99,8 +102,19 @@ func handleBackup(c *cli.Context) error { +@@ -99,8 +103,19 @@ func handleBackup(c *cli.Context) error { var metadata etcdserverpb.Metadata pbutil.MustUnmarshal(&metadata, wmetadata) idgen := idutil.NewGenerator(0, time.Now()) diff --git a/SOURCES/expand-etcd-arch-validation.patch b/SOURCES/expand-etcd-arch-validation.patch new file mode 100644 index 0000000..f693a0f --- /dev/null +++ b/SOURCES/expand-etcd-arch-validation.patch @@ -0,0 +1,19 @@ +diff --git a/etcdmain/etcd.go b/etcdmain/etcd.go +index 58c74b5..ab0ab7f 100644 +--- a/etcdmain/etcd.go ++++ b/etcdmain/etcd.go +@@ -396,7 +396,12 @@ func setupLogging(cfg *config) { + + func checkSupportArch() { + // TODO qualify arm64 +- if runtime.GOARCH == "amd64" { ++ if runtime.GOARCH == "amd64" || runtime.GOARCH == "ppc64le" { ++ return ++ } ++ if runtime.GOARCH == "arm64" || runtime.GOARCH == "s390x" { ++ plog.Warningf("Running etcd on %s architecture is experimental.", runtime.GOARCH) ++ plog.Warningf("Please report any bugs you encounter: https://bugzilla.redhat.com/") + return + } + if env, ok := os.LookupEnv("ETCD_UNSUPPORTED_ARCH"); ok && env == runtime.GOARCH { + diff --git a/SPECS/etcd.spec b/SPECS/etcd.spec index d581221..51fff1a 100644 --- a/SPECS/etcd.spec +++ b/SPECS/etcd.spec @@ -21,13 +21,13 @@ # https://github.com/coreos/etcd %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit 21fdcc6443f3267111051240f0eca839acc96a39 +%global commit 43b75072bfaca5a7c35c718179defbcabd9a0886 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global system_name etcd Name: etcd -Version: 3.1.3 +Version: 3.1.7 Release: 1%{?dist} Summary: A highly-available key value store for shared configuration License: ASL 2.0 @@ -37,9 +37,10 @@ Source1: %{system_name}.service Source2: %{system_name}.conf Patch2: 0001-change-import-paths.patch Patch3: bz1350875-disaster-recovery-with-copies.patch +Patch4: expand-etcd-arch-validation.patch # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required -ExclusiveArch: x86_64 +ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:x86_64 aarch64 ppc64le s390x} # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} @@ -272,6 +273,7 @@ mv cmd/vendor/* Godeps/_workspace/src/. %endif %patch3 -p1 +%patch4 -p1 %build mkdir -p src/github.com/coreos @@ -433,20 +435,43 @@ getent passwd %{system_name} >/dev/null || useradd -r -g %{system_name} -d %{_sh %endif %changelog +* Tue May 02 2017 Jan Chaloupka - 3.1.7-1 +- Update to 3.1.7 + resolves: #1447235 + +* Tue Apr 04 2017 Yaakov Selkowitz - 3.1.3-2 +- Circumvent runtime check of officially supported architectures + resolves: #1434973 + * Tue Mar 21 2017 Jan Chaloupka - 3.1.3-1 - Update to 3.1.3 resolves: #1434364 +* Mon Feb 27 2017 Josh Boyer - 3.1.0-2.1 +- Rebuild rebase on all architectures + * Tue Feb 21 2017 Jan Chaloupka - 3.1.0-2 - Apply "add --keep-cluster-id and --node-id to 'etcdctl backup'" from extras-rhel-7.2 branch resolves: #1350875 +* Thu Feb 16 2017 Josh Boyer - 3.1.0-1.1 +- Rebuild rebase on all architectures + * Mon Feb 06 2017 Jan Chaloupka - 3.1.0-1 - Update to 3.1.0 etcdctl-top removed by upstream resolves: #1416440 +* Fri Jan 20 2017 d.marlin +- Build for all archs (adding ppc64le and s390x) + +* Tue Jan 10 2017 d.marlin +- Add aarch64 to ExclusiveArch list. + +* Mon Jan 09 2017 d.marlin +- Correct 'link' warning for -X flag. + * Thu Dec 01 2016 jchaloup - 3.0.15-1 - Update to 3.0.15 Obsolete etcd3 < 3.0.15