Skip to content

Update terminology "kill" to "terminate"#7941

Merged
lnhsingh merged 3 commits intomasterfrom
terminology
Aug 17, 2020
Merged

Update terminology "kill" to "terminate"#7941
lnhsingh merged 3 commits intomasterfrom
terminology

Conversation

@lnhsingh
Copy link
Copy Markdown
Contributor

@lnhsingh lnhsingh commented Aug 5, 2020

The term "kill" was recently replaced with "stop". After discussing, it was decided that some of these instances actually need to be "terminate". See #7767 for an explanation of the nuances.

Closes #7767.

The term "kill" was recently replaced with "stop". After discussing, it 
was decided that some of these instances actually need to be 
"terminate". See #7767 for an explanation of the nuances.

Closes #7767.
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@lnhsingh lnhsingh requested a review from jseldess August 5, 2020 22:19
@cockroach-teamcity
Copy link
Copy Markdown
Member

@lnhsingh lnhsingh requested a review from taroface August 11, 2020 22:38
Copy link
Copy Markdown
Contributor

@taroface taroface left a comment

Choose a reason for hiding this comment

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

Reviewed 50 of 50 files at r1.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @jseldess and @lnhsingh)


_includes/v1.1/orchestration/kubernetes-simulate-failure.md, line 5 at r1 (raw file):

To see this in action:

1. Terminate one of CockroachDB nodes:

missing "the" (not part of your update, I know)!


_includes/v19.1/orchestration/kubernetes-simulate-failure.md, line 5 at r1 (raw file):

To see this in action:

1. Terminate one of CockroachDB nodes:

Same as above.


_includes/v19.2/orchestration/kubernetes-simulate-failure.md, line 5 at r1 (raw file):

To see this in action:

1. Terminate one of CockroachDB nodes:

Same as above.


_includes/v2.0/orchestration/kubernetes-simulate-failure.md, line 5 at r1 (raw file):

To see this in action:

1. Terminate one of CockroachDB nodes:

Same as above.


_includes/v2.1/orchestration/kubernetes-simulate-failure.md, line 5 at r1 (raw file):

To see this in action:

1. Terminate one of CockroachDB nodes:

Same as above.


_includes/v20.1/orchestration/kubernetes-simulate-failure.md, line 5 at r1 (raw file):

To see this in action:

1. Terminate one of CockroachDB nodes:

Same as above.


_includes/v20.2/orchestration/kubernetes-simulate-failure.md, line 5 at r1 (raw file):

To see this in action:

1. Terminate one of CockroachDB nodes:

Same as above.


_includes/v20.2/prod-deployment/node-shutdown.md, line 1 at r1 (raw file):

- If the node was started with a process manager like [systemd](https://www.freedesktop.org/wiki/Software/systemd/), terminate the node using the process manager. The process manager should be configured to send `SIGTERM` and then, after about 1 minute, `SIGKILL`.

I think this is unfortunately now out of sync with my changes in #7542. That change draws a distinction between using SIGTERM to "gracefully stop" and SIGKILL to forcefully "terminate" a node. I'll leave the exact wording choice to your discretion based on the feedback in #7767.

Copy link
Copy Markdown
Contributor Author

@lnhsingh lnhsingh left a comment

Choose a reason for hiding this comment

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

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @jseldess and @taroface)


_includes/v1.1/orchestration/kubernetes-simulate-failure.md, line 5 at r1 (raw file):

Previously, taroface (Ryan Kuo) wrote…

missing "the" (not part of your update, I know)!

Done.


_includes/v19.1/orchestration/kubernetes-simulate-failure.md, line 5 at r1 (raw file):

Previously, taroface (Ryan Kuo) wrote…

Same as above.

Done.


_includes/v19.2/orchestration/kubernetes-simulate-failure.md, line 5 at r1 (raw file):

Previously, taroface (Ryan Kuo) wrote…

Same as above.

Done.


_includes/v2.0/orchestration/kubernetes-simulate-failure.md, line 5 at r1 (raw file):

Previously, taroface (Ryan Kuo) wrote…

Same as above.

Done.


_includes/v2.1/orchestration/kubernetes-simulate-failure.md, line 5 at r1 (raw file):

Previously, taroface (Ryan Kuo) wrote…

Same as above.

Done.


_includes/v20.1/orchestration/kubernetes-simulate-failure.md, line 5 at r1 (raw file):

Previously, taroface (Ryan Kuo) wrote…

Same as above.

Done.


_includes/v20.2/orchestration/kubernetes-simulate-failure.md, line 5 at r1 (raw file):

Previously, taroface (Ryan Kuo) wrote…

Same as above.

Done.


_includes/v20.2/prod-deployment/node-shutdown.md, line 1 at r1 (raw file):

Previously, taroface (Ryan Kuo) wrote…

I think this is unfortunately now out of sync with my changes in #7542. That change draws a distinction between using SIGTERM to "gracefully stop" and SIGKILL to forcefully "terminate" a node. I'll leave the exact wording choice to your discretion based on the feedback in #7767.

Thanks for pointing this out! I'll resolve merge conflicts -- your updates look to be in line w the terminology changes already!

@cockroach-teamcity
Copy link
Copy Markdown
Member

@cockroach-teamcity
Copy link
Copy Markdown
Member

Copy link
Copy Markdown
Contributor

@jseldess jseldess left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @jseldess and @taroface)

@lnhsingh lnhsingh merged commit 8431c7c into master Aug 17, 2020
@lnhsingh lnhsingh deleted the terminology branch August 17, 2020 14:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Terminology around "kill"

4 participants