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.

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

Set timeout on splunk batch send #35496

Merged
merged 1 commit into from Nov 30, 2017

Conversation

Projects
None yet
7 participants
@cpuguy83
Contributor

cpuguy83 commented Nov 14, 2017

Set timeout on splunk batch send

Before this change, if the splunk endpoint is blocked it will cause a
deadlock on Close().
This sets a reasonable timeout for the http request to send a log batch.

Set timeout on splunk batch send
Before this change, if the splunk endpoint is blocked it will cause a
deadlock on `Close()`.
This sets a reasonable timeout for the http request to send a log batch.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
@vdemeester

LGTM 🐯

@@ -63,6 +64,8 @@ const (
envVarStreamChannelSize = "SPLUNK_LOGGING_DRIVER_CHANNEL_SIZE"
)
var batchSendTimeout = 30 * time.Second

This comment has been minimized.

@anusha-ragunathan

anusha-ragunathan Nov 15, 2017

Contributor

Why not const?

@anusha-ragunathan

anusha-ragunathan Nov 15, 2017

Contributor

Why not const?

This comment has been minimized.

@cpuguy83

cpuguy83 Nov 15, 2017

Contributor

I'm changing it to a shorter timeout for tests.

@cpuguy83

cpuguy83 Nov 15, 2017

Contributor

I'm changing it to a shorter timeout for tests.

This comment has been minimized.

@anusha-ragunathan

anusha-ragunathan Nov 15, 2017

Contributor

👍

@anusha-ragunathan
@yongtang

This comment has been minimized.

Show comment
Hide comment
@yongtang

yongtang Nov 29, 2017

Member

Ping @anusha-ragunathan please take a look and see if it is OK.

Member

yongtang commented Nov 29, 2017

Ping @anusha-ragunathan please take a look and see if it is OK.

@anusha-ragunathan

This comment has been minimized.

Show comment
Hide comment
@anusha-ragunathan

anusha-ragunathan Nov 30, 2017

Contributor

LGTM

Contributor

anusha-ragunathan commented Nov 30, 2017

LGTM

@yongtang yongtang merged commit 88e36dc into moby:master Nov 30, 2017

6 checks passed

dco-signed All commits are signed
experimental Jenkins build Docker-PRs-experimental 37838 has succeeded
Details
janky Jenkins build Docker-PRs 46549 has succeeded
Details
powerpc Jenkins build Docker-PRs-powerpc 6963 has succeeded
Details
windowsRS1 Jenkins build Docker-PRs-WoW-RS1 18106 has succeeded
Details
z Jenkins build Docker-PRs-s390x 6766 has succeeded
Details

@cpuguy83 cpuguy83 deleted the cpuguy83:add_timeouts_to_splunk_post branch Nov 30, 2017

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