Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Expose etcd compaction time via environmental variable in GCE #59106

Merged
merged 1 commit into from
Feb 1, 2018
Merged

Expose etcd compaction time via environmental variable in GCE #59106

merged 1 commit into from
Feb 1, 2018

Conversation

wojtek-t
Copy link
Member

@wojtek-t wojtek-t commented Jan 31, 2018 •
edited
Loading 

Configurable etcd compaction frequency in GCE

@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jan 31, 2018
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jan 31, 2018
shyamjvs
shyamjvs reviewed Jan 31, 2018
View reviewed changes
cluster/common.sh
@@ -828,6 +828,11 @@ EOF
if [ -n "${KUBE_APISERVER_LIVENESS_PROBE_INITIAL_DELAY_SEC:-}" ]; then
cat >>$file <<EOF
KUBE_APISERVER_LIVENESS_PROBE_INITIAL_DELAY_SEC: $(yaml-quote ${KUBE_APISERVER_LIVENESS_PROBE_INITIAL_DELAY_SEC})
EOF
fi
if [ -n "${ETCD_COMPACTION_INTERVAL_SEC:-}" ]; then
Copy link
Member

@shyamjvs shyamjvs Jan 31, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You probably want to also expose this in config-(test}default).sh files?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not necessarily. This isn't needed to make it useful.
I mean, you can set it without doing anything to config-test/default.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I understand. I was asking because it gives more visibility for the option there.
I'm fine either way though.

@shyamjvs shyamjvs added release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Jan 31, 2018
@shyamjvs
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 31, 2018
@wojtek-t
Copy link
Member Author

/hold

[I need to verify if that works correctly.]

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 31, 2018
porridge
porridge reviewed Jan 31, 2018
View reviewed changes
cluster/gce/manifests/kube-apiserver.manifest
@@ -167,6 +167,11 @@
{% set enable_garbage_collector = "--enable-garbage-collector=" + pillar['enable_garbage_collector'] -%}
{% endif -%}

{% set etcd_compaction_interval = "" %}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd use the _sec suffix, since you're appending "s" to the value.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed partially (to make it compatible with there is for kube_apiserver_request_timeout_sec).
BTW - it seems that we no longer have proper support for those pillars, so we should probably get rid of them completely...

@wojtek-t wojtek-t force-pushed the expose_compaction_interval branch from 19a53da to 617321e Compare January 31, 2018 13:44
@wojtek-t
Copy link
Member Author

OK - I verified that it works in my test cluster.

/unhold

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 31, 2018
@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 31, 2018
@zhangxiaoyu-zidif
Copy link
Contributor

/test pull-kubernetes-e2e-gke

@wojtek-t
Copy link
Member Author

wojtek-t commented Feb 1, 2018

/retest

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Feb 1, 2018 •
edited
Loading

@wojtek-t: The following test failed, say /retest to rerun them all:

Test name Commit Details Rerun command
pull-kubernetes-e2e-gke 617321e link /test pull-kubernetes-e2e-gke

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@shyamjvs
Copy link
Member

shyamjvs commented Feb 1, 2018

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 1, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: shyamjvs, wojtek-t

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot
Copy link

/test all [submit-queue is verifying that this PR is safe to merge]

@k8s-github-robot
Copy link

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions here.

@k8s-github-robot k8s-github-robot merged commit ffde829 into kubernetes:master Feb 1, 2018
This was referenced Feb 1, 2018
Merged
Merged
k8s-github-robot pushed a commit that referenced this pull request Feb 2, 2018
Merge pull request #59202 from wojtek-t/automated-cherry-pick-of-#51765-
b7b212b 
#59106-upstream-release-1.8

Automatic merge from submit-queue.

Automated cherry pick of #51765 #59106 upstream release 1.8  

Cherry pick of #51765 #59106 on release-1.8.

#51765 : Add an option for turning on/off compaction from apiserver in etcd3 mode
#59106 : Expose etcd compaction time via environmental variable in GCE
@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Feb 2, 2018
k8s-github-robot pushed a commit that referenced this pull request Feb 3, 2018
Merge pull request #59201 from wojtek-t/automated-cherry-pick-of-#591…
8430884 
…06-upstream-release-1.9

Automatic merge from submit-queue.

Automated cherry pick of #59106 upstream release 1.9 

Cherry pick of #59106 on release-1.9.

#59106 : Expose etcd compaction time via environmental variable in GCE
@wojtek-t wojtek-t deleted the expose_compaction_interval branch February 9, 2018 11:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shyamjvs shyamjvs shyamjvs left review comments

@porridge porridge porridge left review comments

@jszczepkowski jszczepkowski Awaiting requested review from jszczepkowski

@mikedanese mikedanese Awaiting requested review from mikedanese

Assignees

@porridge porridge

@shyamjvs shyamjvs

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@wojtek-t @shyamjvs @zhangxiaoyu-zidif @k8s-ci-robot @k8s-github-robot @porridge