Skip to content

Conversation

@zizhong
Copy link
Member

@zizhong zizhong commented Dec 20, 2017

This PR includes

  1. Add maximum time limit for draining from @maskit,
  2. Add traffic_ctl server stop --drain from @maskit and
  3. Fixing #2906: improve draining from me.

For the Fixing #2906: improve draining,

  1. Adding traffic server drain subcommand
  2. Adding default option, --no-new-connection option and --undo option

TODO:

  1. implement is_server_idle_from_new_connection()
  2. update docs
  3. adding tests

@maskit @bryancall @zwoop @oknet @scw00 @masaori335 can you guys review it when you got time? Any ideas would be much appreciated!

@maskit
Copy link
Member

maskit commented Dec 20, 2017

Thanks for making progress on drain feature.

Some parts of the changes are written by me, but to be honest, I'm not familiar with this area. I just imitated code that is already there. I'd like traffic_manager / traffic_ctl experts to review this.

@jpeach This includes what we discussed on the list long time ago. Please review it if you have time.

@maskit
Copy link
Member

maskit commented Dec 20, 2017

[approve ci]

@zizhong
Copy link
Member Author

zizhong commented Jan 2, 2018

The autest failure is not reachable now. Can you help to trigger another one? @maskit @bryancall @zwoop @scw00 ? Thanks!

@maskit
Copy link
Member

maskit commented Jan 9, 2018

[approve ci]

@bryancall
Copy link
Contributor

[approve ci debian]

@zwoop
Copy link
Contributor

zwoop commented Mar 8, 2018

@zizhong This is getting close, can you squash the commits into one?

Add maximum time limit for draining
(cherry picked from commit a9fe3b0)

Add traffic_ctl server stop --drain
(cherry picked from commit 14ba9d6)

Conflicts:
	proxy/Main.cc
	proxy/ProxyClientSession.cc
	proxy/ProxyClientSession.h

1. Adding `traffic server drain` subcommand
2. Adding default option, --no-new-connection option and --undo option
(cherry picked from commit 139fe5f)
@zizhong zizhong force-pushed the drain_stop_and_improve branch from 2fa4343 to c398bde Compare March 8, 2018 19:36
@zizhong
Copy link
Member Author

zizhong commented Mar 8, 2018

@zwoop Thanks. Did the squash.

Copy link
Member

@maskit maskit left a comment

Choose a reason for hiding this comment

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

LGTM.

As I commented on the previous PR, "--undo" looks a bit strange because of its lack of asymmetry. "start and stop" vs "drain and drain --undo". But I don't have better ideas.

Since I wrote some of the code, I can't approve this because it would be a kind of self approval.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants