diff --git a/.etcd.metadata b/.etcd.metadata index 102e67a..5b58044 100644 --- a/.etcd.metadata +++ b/.etcd.metadata @@ -1,2 +1,2 @@ -580053e2fa7e28926bf1b84e9e2e5ea94c240341 SOURCES/etcd-1674e68.tar.gz -0b21a0f31a459aa0bbe1edf1215b7ca2cb0ed385 SOURCES/man-3.2.22.tar.gz +a5266c968cacc4493cbdbc6244c08673798c3e16 SOURCES/etcd-2cf9e51.tar.gz +98b1fc74413b811b0574f53d28589d65a33acde4 SOURCES/man-3.3.11.tar.gz diff --git a/.gitignore b/.gitignore index 5fcef1f..c100f29 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/etcd-1674e68.tar.gz -SOURCES/man-3.2.22.tar.gz +SOURCES/etcd-2cf9e51.tar.gz +SOURCES/man-3.3.11.tar.gz diff --git a/SOURCES/bz1350875-disaster-recovery-with-copies.patch b/SOURCES/bz1350875-disaster-recovery-with-copies.patch index ca64473..a1e656f 100644 --- a/SOURCES/bz1350875-disaster-recovery-with-copies.patch +++ b/SOURCES/bz1350875-disaster-recovery-with-copies.patch @@ -1,42 +1,42 @@ -From 7ad700a716c2122c3b6db6677a6f717919b88926 Mon Sep 17 00:00:00 2001 +From 2109f199de8a5af1e33ebd79f90fff0969f72a50 Mon Sep 17 00:00:00 2001 From: Jan Chaloupka -Date: Tue, 2 May 2017 09:56:02 +0200 -Subject: [PATCH] bz1350875-disaster-recovery-with-copies: +Date: Tue, 8 Jan 2019 10:53:19 +0100 +Subject: [PATCH] bz1350875-disaster-recovery-with-copies --- 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 feda4b1..e77791f 100644 +index 82e61d8..d7aceed 100644 --- a/etcdctl/ctlv2/command/backup_command.go +++ b/etcdctl/ctlv2/command/backup_command.go -@@ -18,6 +18,7 @@ import ( - "fmt" - "log" +@@ -21,6 +21,7 @@ import ( + "path" "path/filepath" + "regexp" + "strconv" "time" "github.com/coreos/etcd/etcdserver/etcdserverpb" -@@ -40,6 +41,9 @@ func NewBackupCommand() cli.Command { - cli.StringFlag{Name: "wal-dir", Value: "", Usage: "Path to the etcd wal dir"}, +@@ -48,6 +49,8 @@ func NewBackupCommand() cli.Command { 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: "with-v3", Usage: "Backup v3 backend data"}, + 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 +103,19 @@ func handleBackup(c *cli.Context) error { - var metadata etcdserverpb.Metadata - pbutil.MustUnmarshal(&metadata, wmetadata) +@@ -83,8 +86,20 @@ func handleBackup(c *cli.Context) error { + saveDB(filepath.Join(destSnap, "db"), filepath.Join(srcSnap, "db"), state.Commit, withV3) + idgen := idutil.NewGenerator(0, time.Now()) - metadata.NodeID = idgen.Next() - metadata.ClusterID = idgen.Next() + explicitNodeId := c.String("node-id") + if explicitNodeId != "" { ++ var err error + metadata.NodeID, err = strconv.ParseUint(explicitNodeId, 16, 64) + if err != nil { + log.Fatal(err) @@ -52,5 +52,5 @@ index feda4b1..e77791f 100644 neww, err := wal.Create(destWAL, pbutil.MustMarshal(&metadata)) if err != nil { -- -2.7.4 +2.7.5 diff --git a/SOURCES/expand-etcd-arch-validation.patch b/SOURCES/expand-etcd-arch-validation.patch index d6c4fba..4940869 100644 --- a/SOURCES/expand-etcd-arch-validation.patch +++ b/SOURCES/expand-etcd-arch-validation.patch @@ -1,6 +1,6 @@ -From b3e78645c1ffa84bcde511c90df4e3dde652c3fa Mon Sep 17 00:00:00 2001 +From 9166e94205928cf30a09cc6b6703dd88d8a06ec5 Mon Sep 17 00:00:00 2001 From: Jan Chaloupka -Date: Tue, 8 Aug 2017 15:01:04 +0200 +Date: Tue, 8 Jan 2019 10:58:03 +0100 Subject: [PATCH] expand etcd arch validation --- @@ -8,10 +8,10 @@ Subject: [PATCH] expand etcd arch validation 1 file changed, 7 insertions(+) diff --git a/etcdmain/etcd.go b/etcdmain/etcd.go -index 2f7f00d..61553d4 100644 +index 87e9b25..9fcde77 100644 --- a/etcdmain/etcd.go +++ b/etcdmain/etcd.go -@@ -396,6 +396,13 @@ func checkSupportArch() { +@@ -387,6 +387,13 @@ func checkSupportArch() { if runtime.GOARCH == "amd64" || runtime.GOARCH == "ppc64le" { return } @@ -22,9 +22,9 @@ index 2f7f00d..61553d4 100644 + return + } + - if env, ok := os.LookupEnv("ETCD_UNSUPPORTED_ARCH"); ok && env == runtime.GOARCH { - plog.Warningf("running etcd on unsupported architecture %q since ETCD_UNSUPPORTED_ARCH is set", env) - return + // unsupported arch only configured via environment variable + // so unset here to not parse through flag + defer os.Unsetenv("ETCD_UNSUPPORTED_ARCH") -- 2.7.5 diff --git a/SPECS/etcd.spec b/SPECS/etcd.spec index fde07c0..fe5cf8e 100644 --- a/SPECS/etcd.spec +++ b/SPECS/etcd.spec @@ -12,20 +12,20 @@ %global provider github %global provider_tld com -%global project coreos +%global project etcd-io %global repo etcd # https://github.com/coreos/etcd %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} -%global commit 1674e682fe9fbecd66e9f20b77da852ad7f517a9 +%global import_path github.com/coreos/etcd +%global commit 2cf9e51d2a78003b164c2998886158e60ded1cbb %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global system_name etcd -%global man_version 3.2.22 +%global man_version 3.3.11 Name: etcd -Version: 3.2.22 -Release: 1%{?dist} +Version: 3.3.11 +Release: 2%{?dist} Summary: A highly-available key value store for shared configuration License: ASL 2.0 URL: https://%{provider_prefix} @@ -38,8 +38,9 @@ Patch4: expand-etcd-arch-validation.patch # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required 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} +ExcludeArch: %{ix86} +BuildRequires: go-toolset-1.10 +BuildRequires: go-toolset-1.10-golang-bin Obsoletes: etcd3 < 3.0.15 Provides: etcd3 = %{version}-%{release} @@ -56,6 +57,8 @@ Requires(postun): systemd %description A highly-available key value store for shared configuration. +%enable_gotoolset110 + %prep %setup -q -n man-%{man_version} -T -b 3 %setup -q -n %{repo}-%{commit} @@ -73,7 +76,7 @@ mv cmd/vendor/* Godeps/_workspace/src/. mkdir -p src/github.com/coreos ln -s ../../../ src/github.com/coreos/etcd -export GOPATH=$(pwd):$(pwd)/Godeps/_workspace:%{gopath} +export GOPATH=$(pwd):$(pwd)/Godeps/_workspace export LDFLAGS="-X %{import_path}/version.GitSHA=%{shortcommit} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')" @@ -123,6 +126,18 @@ getent passwd %{system_name} >/dev/null || useradd -r -g %{system_name} -d %{_sh %{_mandir}/man1/*.1* %changelog +* Mon Jan 14 2019 Jan Chaloupka - 3.3.11-2 +- Update to 3.3.11 + resolves: #1665810 + +* Tue Jan 08 2019 Jan Chaloupka - 3.3.10-1 +- Update to 3.3.10 + resolves: #1664290 + +* Mon Nov 05 2018 Jan Chaloupka - 3.2.25-1 +- Update to 3.2.25 + resolves: #1646193 + * Mon Jun 11 2018 Jan Chaloupka - 3.2.22-1 - Update to 3.2.22 resolves: #1541355