From b5399722547189f92232cc8ff2b58e07bd0faf9c Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Mon, 19 Aug 2013 10:16:01 -0700 Subject: [PATCH 1/5] feat(dev-db/etcd): set restart service policy --- .../coreos-overlay/dev-db/etcd/files/etcd.service | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service index 6a65b7eed1..52f96ef867 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service +++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd.service @@ -9,5 +9,10 @@ PermissionsStartOnly=true ExecStartPre=/usr/bin/etcd-pre-exec ExecStart=/usr/bin/etcd-bootstrap +Restart=always +# Set a longish timeout in case this machine isn't behaving +# nicely and bothering the rest of the cluster +RestartSec=10s + [Install] WantedBy=multi-user.target From 948c15c48d7c901954b1d0c2df1e774483767828 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Mon, 19 Aug 2013 10:27:00 -0700 Subject: [PATCH 2/5] fix(etcd-bootstrap): add -f to delete old etcd info We are changing stuff pretty rapidly in etcd just start blowing away any info files we find on disk on an upgrade or start. --- .../coreos-overlay/dev-db/etcd/files/etcd-bootstrap | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap index 0909b6ae5a..74a54d1559 100755 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap +++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/files/etcd-bootstrap @@ -2,10 +2,11 @@ VIRT=$(coreos-detect-virt) STATE=/var/lib/etcd +DEFAULT_ARGS="-v -d $STATE -f" if [ "${VIRT}" != "ec2" ]; then echo "Detected environment \"${VIRT}\", just starting solo master..." - exec /usr/bin/etcd -v -d $STATE + exec /usr/bin/etcd ${DEFAULT_ARGS} fi META_URL="http://169.254.169.254/latest" @@ -20,9 +21,9 @@ IPS=$(grep -v $MY_IP $BOOTSTRAP|grep -v '^\n$' |sed 's/$/:7001/'|tr '\n' ','|sed if [ -z "$IPS" ]; then echo "becoming master..." - exec /usr/bin/etcd -v -h $MY_IP -d $STATE + exec /usr/bin/etcd ${DEFAULT_ARGS} -h $MY_IP else echo "trying $IPS" set -x - exec /usr/bin/etcd -v -h $MY_IP -C "$IPS" -d $STATE + exec /usr/bin/etcd ${DEFAULT_ARGS} -h $MY_IP -C "$IPS" fi From 0f71c19ca9b5af012ebc168a517b83a38f9cb002 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Mon, 19 Aug 2013 10:31:29 -0700 Subject: [PATCH 3/5] bump(dev-db/etcd): etcd-0.1.1 --- .../third_party/coreos-overlay/dev-db/etcd/etcd-0.0.1-r7.ebuild | 1 - .../dev-db/etcd/{etcd-0.0.1.ebuild => etcd-0.1.1.ebuild} | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 120000 sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.0.1-r7.ebuild rename sdk_container/src/third_party/coreos-overlay/dev-db/etcd/{etcd-0.0.1.ebuild => etcd-0.1.1.ebuild} (93%) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.0.1-r7.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.0.1-r7.ebuild deleted file mode 120000 index a6e5e5dcc1..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.0.1-r7.ebuild +++ /dev/null @@ -1 +0,0 @@ -etcd-0.0.1.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.1.1.ebuild similarity index 93% rename from sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.0.1.ebuild rename to sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.1.1.ebuild index 5257f11848..c54013980e 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.1.1.ebuild @@ -9,7 +9,7 @@ EAPI=4 CROS_WORKON_PROJECT="coreos/etcd" CROS_WORKON_LOCALNAME="etcd" CROS_WORKON_REPO="git://github.com" -CROS_WORKON_COMMIT="fac8d662445b2c09e3f24c282c2b37754bc7357f" +CROS_WORKON_COMMIT="7b289043c7beced434be4334fb909ba0b16b57b1" inherit toolchain-funcs cros-workon systemd DESCRIPTION="etcd" From ebd02c0b19cd0c14c79636e3d000cc5957af4bf0 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Mon, 19 Aug 2013 11:21:51 -0700 Subject: [PATCH 4/5] chore(dev-db/etcd): add a command about the hash source --- .../third_party/coreos-overlay/dev-db/etcd/etcd-0.1.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.1.1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.1.1.ebuild index c54013980e..a5e764e3f5 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.1.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.1.1.ebuild @@ -9,7 +9,7 @@ EAPI=4 CROS_WORKON_PROJECT="coreos/etcd" CROS_WORKON_LOCALNAME="etcd" CROS_WORKON_REPO="git://github.com" -CROS_WORKON_COMMIT="7b289043c7beced434be4334fb909ba0b16b57b1" +CROS_WORKON_COMMIT="7b289043c7beced434be4334fb909ba0b16b57b1" # hash for tag v0.1.1 inherit toolchain-funcs cros-workon systemd DESCRIPTION="etcd" From 5eb5cb496a9ef7718711d6bb3b7ed4b973fb46b7 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Mon, 19 Aug 2013 11:28:17 -0700 Subject: [PATCH 5/5] chore(dev-db/etcd): remove unused env variable in ebuild --- .../third_party/coreos-overlay/dev-db/etcd/etcd-0.1.1.ebuild | 2 -- .../third_party/coreos-overlay/dev-db/etcd/etcd-99999.ebuild | 2 -- 2 files changed, 4 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.1.1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.1.1.ebuild index a5e764e3f5..dc00babd30 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.1.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-0.1.1.ebuild @@ -23,8 +23,6 @@ IUSE="" DEPEND=">=dev-lang/go-1.1" -ETCD_PACKAGE="github.com/coreos/etcd" - src_compile() { ./build } diff --git a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-99999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-99999.ebuild index a09910ca91..9d6f87b8f2 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-99999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-db/etcd/etcd-99999.ebuild @@ -22,8 +22,6 @@ IUSE="" DEPEND=">=dev-lang/go-1.1" -ETCD_PACKAGE="github.com/coreos/etcd" - src_compile() { ./build }